diff options
author | sg481n <sg481n@att.com> | 2017-09-23 14:26:06 +0000 |
---|---|---|
committer | sg481n <sg481n@att.com> | 2017-09-23 14:26:23 +0000 |
commit | a9d2108ed04172d2a54a8a317350946c83b0bbde (patch) | |
tree | 555f82145d01effd802bb4991302eb6274d7ed6c /authz-batch | |
parent | faf7f2d997712433695d3324f91aa1b328e8ec93 (diff) |
Update License & modify properties in aaf/authz
Updated license file & sitepath modified and O-parent latest added to
parent pom of aaf/authz,Javadocs plugin version added & duplicate staging plugin
removed.
Issue-id: AAF-59
Change-Id: I13a843d1b1868a12b0f0387ff2ba99e516c7601f
Signed-off-by: sg481n <sg481n@att.com>
Diffstat (limited to 'authz-batch')
-rw-r--r-- | authz-batch/pom.xml | 134 |
1 files changed, 79 insertions, 55 deletions
diff --git a/authz-batch/pom.xml b/authz-batch/pom.xml index 8b81eb63..af456a33 100644 --- a/authz-batch/pom.xml +++ b/authz-batch/pom.xml @@ -39,6 +39,21 @@ <project.interfaceVersion>1.0.0-SNAPSHOT</project.interfaceVersion> <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion> <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <skipTests>false</skipTests> + <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> + <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> + <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath> </properties> <dependencies> @@ -67,31 +82,6 @@ <version>${project.cadiVersion}</version> </dependency> - - - <!-- <dependency> - <groupId>com.att.authz</groupId> - <artifactId>authz-att</artifactId> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.onap.aaf.cadi</groupId> - <artifactId>cadi-aaf</artifactId> - </exclusion> - <exclusion> - <groupId>org.onap.aaf.cadi</groupId> - <artifactId>cadi-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.onap.aaf.cadi</groupId> - <artifactId>cadi-client</artifactId> - </exclusion> - </exclusions> - - </dependency> --> <dependency> <groupId>prg.onap.aaf.authz</groupId> @@ -128,20 +118,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - - <!-- Data Migration - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc6</artifactId> - <version>11.2.0</version> - </dependency> - - <dependency> - <groupId>com.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>3.3</version> - </dependency> - --> + </dependencies> <build> @@ -226,22 +203,69 @@ </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> + </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> </build> |