From: Dileep Ranganathan Date: Fri, 18 Aug 2017 18:58:52 +0000 (-0700) Subject: Update POM to inherit from oparent X-Git-Tag: v1.1.0~64 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dc5186ed8d5a9a280a36afb40b6b7f457a8c82f2;hp=61b392aa55b6560459367d927a24dc6126ae727e;p=aai%2Faai-common.git Update POM to inherit from oparent Removed some redundant and inheritable elements Fixed warnings related to building effective pom Removed duplicate dependencies Add version to maven-deploy-plugin Issue-Id: AAI-77 Change-Id: Ie634874299489fb2971b065c66ff9467839bb36f Signed-off-by: Dileep Ranganathan --- diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index ccfae3d4..8e107088 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -12,11 +12,7 @@ aai-annotations jar - UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - 1.8 - 1.8 @@ -28,111 +24,22 @@ - - - - - - - org.codehaus.mojo - license-maven-plugin - 1.12 - - false - apache_v2 - 2017 - AT&T Intellectual Property. All rights reserved. - org.openecomp.aai - true - true - true - true - ============LICENSE_START======================================================= - ============LICENSE_END========================================================= - ================================================================================ - - **/*.java - **/*.ksh - **/*.sh - **/*.ftl - **/*.xsd - **/*.xjb - **/aai*.xml - **/*logback*.xml - **/*aaiconfig*.properties - **/*titan*.properties - - - - - first - - update-file-header - - process-sources - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-release-plugin - 2.4.2 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.8.1 - - - - - - + org.apache.maven.plugins maven-deploy-plugin - - - default-deploy - none - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - + + + org.sonatype.plugins + nexus-staging-maven-plugin + - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} @@ -148,38 +55,5 @@ http://www.evosuite.org/m2 - - - - AJSC - AJSC repository - https://mvnrepository.com/artifact/com.att.ajsc - - - restlet - maven reslet - https://maven.restlet.com/ - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-staging - ECOMP Staging Repository - ${nexusproxy}/content/repositories/staging/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - + diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index e4e2b22b..cebca913 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -12,7 +12,6 @@ google_checks.xml - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} @@ -33,135 +32,61 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-release-plugin - 2.4.2 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.8.1 - - - - - - - - - com.mycila - license-maven-plugin - 3.0 - -
License.txt
- - src/main/java/** - - - - - - format - - process-sources - - - + + + + com.mycila + license-maven-plugin + 3.0 + +
License.txt
+ + src/main/java/** + + + + + + format + + process-sources + + + - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - - checkstyle - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - + + org.apache.maven.plugins + maven-site-plugin + 3.3 + + + org.sonatype.plugins + nexus-staging-maven-plugin + + - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} - - - - AJSC - AJSC repository - https://mvnrepository.com/artifact/com.att.ajsc - - - restlet - maven reslet - https://maven.restlet.com/ - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-staging - ECOMP Staging Repository - ${nexusproxy}/content/repositories/staging/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + + checkstyle + + + + + + diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 01156bf0..4ccc0f8e 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -12,9 +12,6 @@ aai-core jar - 1.8 - 1.8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} java jacoco @@ -446,24 +443,6 @@ camel-jms 2.15.5 - - org.mockito - mockito-all - 1.10.19 - test - - - org.powermock - powermock-module-junit4 - 1.6.2 - test - - - org.powermock - powermock-api-mockito - 1.6.2 - test - org.powermock powermock-module-javaagent @@ -500,95 +479,40 @@ - org.codehaus.mojo - license-maven-plugin - 1.12 - - false - apache_v2 - 2017 - AT&T Intellectual Property. All rights reserved. - org.openecomp.aai - true - true - true - true - ============LICENSE_START======================================================= - ============LICENSE_END========================================================= - ================================================================================ - - **/*.java - **/*.ksh - **/*.sh - **/*.ftl - **/*.xsd - **/*.xjb - **/aai*.xml - **/*logback*.xml - **/*aaiconfig*.properties - **/*titan*.properties - - - - - first - - update-file-header - - process-sources - - - + org.apache.maven.plugins + maven-site-plugin + + + org.codehaus.mojo + license-maven-plugin + - org.apache.maven.plugins + org.apache.maven.plugins maven-surefire-plugin 2.12.4 -noverify ${argLine} - + . bundleconfig-local - - org.apache.maven.plugins - maven-deploy-plugin - - - default-deploy - none - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - + + org.apache.maven.plugins + maven-deploy-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} @@ -605,37 +529,24 @@ - - - AJSC - AJSC repository - https://mvnrepository.com/artifact/com.att.ajsc - - - restlet - maven reslet - https://maven.restlet.com/ - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-staging - ECOMP Staging Repository - ${nexusproxy}/content/repositories/staging/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 4183cf5d..535e43d5 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -11,11 +11,7 @@ aai-schema aai-schema - UTF-8 - https://nexus.onap.org /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - 1.8 - 1.8 @@ -29,43 +25,7 @@ org.codehaus.mojo license-maven-plugin - 1.12 - - false - apache_v2 - 2017 - AT&T Intellectual Property. All rights reserved. - org.openecomp.aai - true - true - true - true - ============LICENSE_START======================================================= - ============LICENSE_END========================================================= - ================================================================================ - - **/*.java - **/*.ksh - **/*.sh - **/*.ftl - **/*.xsd - **/*.xjb - **/aai*.xml - **/*logback*.xml - **/*aaiconfig*.properties - **/*titan*.properties - - - - - first - - update-file-header - - process-sources - - - + org.codehaus.mojo jaxb2-maven-plugin @@ -113,53 +73,22 @@ org.apache.maven.plugins maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - + org.apache.maven.plugins maven-deploy-plugin - - - default-deploy - none - - - - + + org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - + - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} @@ -176,38 +105,4 @@ - - - AJSC - AJSC repository - https://mvnrepository.com/artifact/com.att.ajsc - - - restlet - maven reslet - https://maven.restlet.com/ - - - - central - Maven 2 repository 2 - http://repo2.maven.org/maven2/ - - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-staging - ECOMP Staging Repository - ${nexusproxy}/content/repositories/staging/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - - diff --git a/pom.xml b/pom.xml index 5eedf9b0..5ac0b306 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,17 @@ 4.0.0 + + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + + org.onap.aai.aai-common aai-common 1.1.0-SNAPSHOT pom aai-common - + aai-schema aai-annotations @@ -14,28 +20,24 @@ - 1.8 - 1.8 - UTF-8 - https://nexus.onap.org /content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version} 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT 1.1.0-SNAPSHOT - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + org.codehaus.mojo license-maven-plugin 1.12 @@ -70,7 +72,7 @@ - first + first update-file-header @@ -78,59 +80,50 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - - default-deploy - none - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + default-deploy + none + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ${onap.nexus.url} + 176c31dfe190a + ecomp-staging + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + - - ecomp-releases - ECOMP Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - ECOMP Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - ecomp-site - dav:${nexusproxy}${sitePath} + dav:${onap.nexus.url}${sitePath} @@ -148,10 +141,44 @@ 5.6 -views -Xdoclint:none - org.openecomp.aai.domain.yang.*:org.openecomp.aai.util.* + org.openecomp.aai.domain.yang.*:org.openecomp.aai.util.* true + + + + AJSC + AJSC repository + https://mvnrepository.com/artifact/com.att.ajsc + + + restlet + maven reslet + https://maven.restlet.com/ + + + + central + Maven 2 repository 2 + http://repo2.maven.org/maven2/ + + + ecomp-releases + ECOMP Release Repository + ${onap.nexus.url}/content/repositories/releases/ + + + ecomp-staging + ECOMP Staging Repository + ${onap.nexus.url}/content/repositories/staging/ + + + ecomp-snapshots + ECOMP Snapshot Repository + ${onap.nexus.url}/content/repositories/snapshots/ + +