Updating version.properties file in aaf authz.
Issue-id: AAF-21
Change-Id: I8a14b765663533064ad8f403640f4d580c65ec90
Signed-off-by: sg481n <sg481n@att.com>
</descriptorRefs>
<archive>
<manifest>
- <mainClass>com.att.authz.Batch</mainClass>
+ <mainClass>org.onap.aaf.authz.Batch</mainClass>
</manifest>
</archive>
</configuration>
</executions>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>ossrhdme</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
- </configuration>
- </plugin>
+
</plugins>
</build>
</project>
<properties>\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
</plugins>\r
</build>\r
<project.swmVersion>45</project.swmVersion>\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
\r
</plugins>\r
+++ /dev/null
-/*******************************************************************************\r
- * ============LICENSE_START====================================================\r
- * * org.onap.aaf\r
- * * ===========================================================================\r
- * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
- * * ===========================================================================\r
- * * Licensed under the Apache License, Version 2.0 (the "License");\r
- * * you may not use this file except in compliance with the License.\r
- * * You may obtain a copy of the License at\r
- * * \r
- * * http://www.apache.org/licenses/LICENSE-2.0\r
- * * \r
- * * Unless required by applicable law or agreed to in writing, software\r
- * * distributed under the License is distributed on an "AS IS" BASIS,\r
- * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * * See the License for the specific language governing permissions and\r
- * * limitations under the License.\r
- * * ============LICENSE_END====================================================\r
- * *\r
- * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
- * *\r
- ******************************************************************************/\r
-package org.onap.aaf.authz.cm.validation;\r
-\r
-import static org.junit.Assert.*;\r
-\r
-import java.util.ArrayList;\r
-\r
-import org.junit.BeforeClass;\r
-import org.junit.Test;\r
-import org.junit.runner.RunWith;\r
-import org.mockito.runners.MockitoJUnitRunner;\r
-import org.onap.aaf.authz.cm.validation.Validator;\r
-import org.onap.aaf.dao.aaf.cass.ArtiDAO;\r
-\r
-@RunWith(MockitoJUnitRunner.class)\r
-public class JU_Validator {\r
- \r
- private static Validator validator;\r
- \r
- @BeforeClass\r
- public static void setUp() {\r
- validator = new Validator();\r
- }\r
- \r
- @Test\r
- public void nullCheck() {\r
- assertNotNull(validator.nullOrBlank("TestName", null).errs());\r
- }\r
- \r
- @Test\r
- public void blankCheck() {\r
- assertNotNull(validator.nullOrBlank("TestName", "").err());\r
- }\r
- \r
- @Test\r
- public void notOK_null() {\r
- assertNotNull(validator.notOK(null));\r
- }\r
- \r
- @Test\r
- public void isNullCheck() {\r
- assertNotNull(validator.isNull("TestName", null).errs());\r
- }\r
- \r
- @Test\r
- public void nullBlankMin() {\r
- assertNotNull(validator.nullBlankMin("TestName", null, 0));\r
- }\r
- \r
- @Test\r
- public void artistsRequired() {\r
- assertNotNull(validator.artisRequired(null, 0));\r
- }\r
- \r
- @Test\r
- public void artistRequired() {\r
- assertNotNull(validator.artisRequired(new ArrayList<ArtiDAO.Data>(), -1));\r
- }\r
- \r
- @Test\r
- public void artistRequired_Null() {\r
- assertNotNull(validator.artisRequired(null, -1));\r
- }\r
- \r
- @Test\r
- public void artistkeys() {\r
- assertNotNull(validator.artisKeys(new ArrayList<ArtiDAO.Data>(), -1));\r
- }\r
- \r
- @Test\r
- public void artistKeys_Null() {\r
- assertNotNull(validator.artisKeys(null, -1));\r
- }\r
- \r
- @Test\r
- public void keys() {\r
- assertNotNull(validator.keys(new ArtiDAO.Data()));\r
- }\r
-}\r
<swm-distFiles-path>/opt/app/aft/${project.artifactId}/${project.version}</swm-distFiles-path>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin> \r
</plugins>\r
</build>\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<project.swmVersion>21</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
- </plugin> \r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
</plugins>\r
<pluginManagement>\r
</developers>\r
<properties>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
\r
</plugins>\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<project.swmVersion>0</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
</plugins>\r
</pluginManagement>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>9</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
</plugin>\r
</plugins>\r
\r
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+<plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.7.201606060606</version>
+ <configuration>
+ <dumpOnExit>true</dumpOnExit>
+ <includes>
+ <include>org.onap.aaf.*</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <fileSets>
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+ <directory>${project.build.directory}/coverage-reports</directory>
+ <includes>
+ <include>*.exec</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>ossrhdme</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>true</autoReleaseAfterClose>
- </configuration>
- </plugin>
-
+
</plugins>
<pluginManagement>
</pluginManagement>
</build>
- <distributionManagement>
- <snapshotRepository>
- <id>ossrhdme</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>ossrhdme</id>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- </distributionManagement>
-
- <scm>
- <connection>https://github.com/att/AAF.git</connection>
- <developerConnection>${project.scm.connection}</developerConnection>
- <url>http://github.com/att/AAF/tree/master</url>
- </scm>
</project>
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>30</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
- </plugin> \r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
</plugins>\r
</build>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>1</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
- </plugin> \r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
</plugins>\r
\r
<maven.test.failure.ignore>false</maven.test.failure.ignore>\r
<project.swmVersion>0</project.swmVersion>\r
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <sonar.language>java</sonar.language>\r
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
</execution>\r
</executions>\r
</plugin>\r
- <plugin>\r
+<plugin>\r
<groupId>org.sonatype.plugins</groupId>\r
<artifactId>nexus-staging-maven-plugin</artifactId>\r
<version>1.6.7</version>\r
<nexusUrl>${nexusproxy}</nexusUrl>\r
<stagingProfileId>176c31dfe190a</stagingProfileId>\r
<serverId>ecomp-staging</serverId>\r
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>\r
</configuration>\r
- </plugin> \r
- \r
+ </plugin> \r
+ <plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>0.7.7.201606060606</version>\r
+ <configuration>\r
+ <dumpOnExit>true</dumpOnExit>\r
+ <includes>\r
+ <include>org.onap.aaf.*</include>\r
+ </includes>\r
+ </configuration>\r
+ <executions>\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+ <!-- <append>true</append> -->\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <goals>\r
+ <goal>merge</goal>\r
+ </goals>\r
+ <phase>post-integration-test</phase>\r
+ <configuration>\r
+ <fileSets>\r
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+ <directory>${project.build.directory}/coverage-reports</directory>\r
+ <includes>\r
+ <include>*.exec</include>\r
+ </includes>\r
+ </fileSet>\r
+ </fileSets>\r
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
\r
</plugins>\r
</pluginManagement>\r
<project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>
<project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>
<project.dme2Version>3.1.200</project.dme2Version>
+ <sonar.language>java</sonar.language>
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<nexusUrl>${nexusproxy}</nexusUrl>
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
+ <skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
</configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.7.7.201606060606</version>
+ <configuration>
+ <dumpOnExit>true</dumpOnExit>
+ <includes>
+ <include>org.onap.aaf.*</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
+ <!-- <append>true</append> -->
+ </configuration>
+ </execution>
+ <execution>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <fileSets>
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+ <directory>${project.build.directory}/coverage-reports</directory>
+ <includes>
+ <include>*.exec</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
-###########################################################
-# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-release_name=1
-sprint_number=1
-feature_revision=0
-
-base_version=${release_name}.${sprint_number}.${feature_revision}
-
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
+###\r
+# ============LICENSE_START=======================================================\r
+# ONAP AAF\r
+# ================================================================================\r
+# Copyright (C) 2017 AT&T Intellectual Property. All rights\r
+# reserved.\r
+# ================================================================================\r
+# Licensed under the Apache License, Version 2.0 (the "License"); \r
+# you may not use this file except in compliance with the License. \r
+# You may obtain a copy of the License at\r
+# \r
+# http://www.apache.org/licenses/LICENSE-2.0\r
+# \r
+# Unless required by applicable law or agreed to in writing, software \r
+# distributed under the License is distributed on an "AS IS" BASIS, \r
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. \r
+# See the License for the specific language governing permissions and \r
+# limitations under the License.\r
+# ============LICENSE_END============================================\r
+# ===================================================================\r
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+###\r
+\r
+# Versioning variables\r
+# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )\r
+# because they are used in Jenkins, whose plug-in doesn't support\r
+\r
+major=1\r
+minor=0\r
+patch=0\r
+\r
+base_version=${major}.${minor}.${patch}\r
+\r
+# Release must be completed with git revision # in Jenkins\r
+release_version=${base_version}\r
+snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file