diff options
| author |   Dileep Ranganathan <dileep.ranganathan@intel.com> | 2017-08-18 18:59:45 -0700 |
|---|---|---|
| committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2017-08-18 19:03:34 -0700 |
| commit | b6a5948a4d4cafe6f3b2ae271b7cfb3255c18c3e (patch) | |
| tree | afe037e6920cd10ee86bad76984a582c35ee8aa9 | |
| parent | 9314715013b024f8194b0a72e56809afe18a746d (diff) | |
Update POM to inherit from oparent
Change-Id: Iaa71026e0fed4e6a7b2c86aaaaed55de172523b7
Issue-Id: AAI-77
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
| -rw-r--r-- | pom.xml | 56 |
1 files changed, 26 insertions, 30 deletions
@@ -1,6 +1,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> <groupId>org.openecomp.aai.logging-service</groupId> <artifactId>logging-service</artifactId> @@ -10,7 +15,6 @@ <properties> <checkstyle.config.location>google_checks.xml</checkstyle.config.location> - <nexusproxy>https://nexus.onap.org</nexusproxy> <!-- Sonar Properties --> <sonar.language>java</sonar.language> <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> @@ -18,6 +22,7 @@ <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath> <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero> <sonar.projectVersion>${project.version}</sonar.projectVersion> + <sitePath>/content/sites/site/org/onap/aai/${project.artifactId}/${project.version}</sitePath> </properties> @@ -55,23 +60,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> - <configuration> - <reportPlugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> - <reportSets> - <reportSet> - <reports> - <report>checkstyle</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </reportPlugins> - </configuration> + <version>3.6</version> </plugin> </plugins> </pluginManagement> @@ -104,7 +93,7 @@ <version>1.6.7</version> <extensions>true</extensions> <configuration> - <nexusUrl>${nexusproxy}</nexusUrl> + <nexusUrl>${onap.nexus.url}</nexusUrl> <stagingProfileId>176c31dfe190a</stagingProfileId> <serverId>ecomp-staging</serverId> </configuration> @@ -137,20 +126,27 @@ </plugins> </build> <distributionManagement> - <repository> - <id>ecomp-releases</id> - <name>ECOMP Release Repository</name> - <url>${nexusproxy}/content/repositories/releases/</url> - </repository> - <snapshotRepository> - <id>ecomp-snapshots</id> - <name>ECOMP Snapshot Repository</name> - <url>${nexusproxy}/content/repositories/snapshots/</url> - </snapshotRepository> <site> <id>ecomp-javadoc</id> - <url>dav:https://ecomp-nexus:8443/repository/aai/logging-service-javadoc/${project.version}</url> + <url>dav:${onap.nexus.url}${sitePath}</url> </site> </distributionManagement> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.17</version> + <reportSets> + <reportSet> + <reports> + <report>checkstyle</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + </project> |