From: Gary Wu Date: Thu, 1 Sep 2016 23:33:32 +0000 (-0700) Subject: Change artifact groupId to allow Nexus deployment X-Git-Tag: release/sun~41 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f8c8cebc21ea8afce63472d66b57a2c83f21d9f7;p=msb%2Fapigateway.git Change artifact groupId to allow Nexus deployment Change-Id: I78af2ba519302a02057fa2ad34cdbd76e7ea0f77 Issue-id: INT-40 Signed-off-by: Gary Wu --- diff --git a/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml b/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml index 5f5c609..de1fbab 100644 --- a/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml +++ b/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml @@ -2,11 +2,10 @@ apiroute-parent - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus 1.0.0-SNAPSHOT 4.0.0 - org.openo.msb.msb-core.apiroute apiroute-service openo/msb/msb-core/apiroute/apiroute-service 1.0.0-SNAPSHOT diff --git a/msb-core/apiroute/apiroute-service/pom.xml b/msb-core/apiroute/apiroute-service/pom.xml index 0bddd98..54f8daf 100644 --- a/msb-core/apiroute/apiroute-service/pom.xml +++ b/msb-core/apiroute/apiroute-service/pom.xml @@ -1,33 +1,32 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-parent - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - org.openo.msb.msb-core.apiroute apiroute-service openo/msb/msb-core/apiroute/apiroute-service jar 1.0.0-SNAPSHOT - + @@ -41,7 +40,7 @@ io.dropwizard dropwizard-client - + io.swagger swagger-jersey2-jaxrs @@ -66,7 +65,7 @@ junit junit test - + @@ -125,7 +124,7 @@ package copy-dependencies - + @@ -133,10 +132,10 @@ dropwizard-core ${dropwizard.version} true - + - + diff --git a/msb-core/apiroute/apiroute-standalone/pom.xml b/msb-core/apiroute/apiroute-standalone/pom.xml index 46e59ae..eaf892d 100644 --- a/msb-core/apiroute/apiroute-standalone/pom.xml +++ b/msb-core/apiroute/apiroute-standalone/pom.xml @@ -1,28 +1,27 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-parent - 1.0.0-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 - org.openo.msb.msb-core.apiroute apiroute-standalone openo/msb/msb-core/apiroute/apiroute-standalone pom @@ -35,20 +34,20 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-service ${project.version} true - + - - + + maven-resources-plugin - copy-resources + copy-resources process-resources copy-resources @@ -56,14 +55,14 @@ ${outputdir} true - + src/assembly/resource/ false **/* - + true @@ -74,7 +73,7 @@ org.apache.maven.plugins maven-dependency-plugin 2.8 - + copy-jar @@ -84,19 +83,19 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-service jar true ${outputdir}/apiroute/ apiroute-service.jar - + - + org.apache.maven.plugins maven-antrun-plugin diff --git a/msb-core/apiroute/pom.xml b/msb-core/apiroute/pom.xml index 055b6bd..dfc9b1f 100644 --- a/msb-core/apiroute/pom.xml +++ b/msb-core/apiroute/pom.xml @@ -1,36 +1,35 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core.apiroute apiroute-parent openo/msb/msb-core/apiroute pom 1.0.0-SNAPSHOT - + apiroute-service apiroute-standalone - + diff --git a/msb-core/distributions/pom.xml b/msb-core/distributions/pom.xml index c899f71..e732e6d 100644 --- a/msb-core/distributions/pom.xml +++ b/msb-core/distributions/pom.xml @@ -1,33 +1,32 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core distributions-parent openo/msb/msb-core/distributions-parent pom 1.0.0-SNAPSHOT - + standalone @@ -36,5 +35,5 @@ target/version src/main/docker - + diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml index 3d2de6b..a2b9a5c 100644 --- a/msb-core/distributions/standalone/pom.xml +++ b/msb-core/distributions/standalone/pom.xml @@ -1,28 +1,27 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus distributions-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core.distributions msb-core-standalone openo/msb/msb-core/distributions/standalone pom @@ -38,15 +37,15 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-standalone ${project.version} zip true - + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis zip win64 @@ -54,7 +53,7 @@ true - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis tar.gz linux64 @@ -62,7 +61,7 @@ true - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis-ext zip ${project.version} @@ -70,7 +69,7 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty zip win64 @@ -78,7 +77,7 @@ true - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty tar.gz linux64 @@ -87,7 +86,7 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty-ext zip ${project.version} @@ -95,36 +94,36 @@ - + - - + + maven-resources-plugin - copy-resources-dockerfile + copy-resources-dockerfile prepare-package copy-resources - + ${version.output} true - + ${dockerFileDir} false **/* - + true - + - copy-msb-resources-${linux64id} + copy-msb-resources-${linux64id} prepare-package copy-resources @@ -132,7 +131,7 @@ ${linux64outputdir} true - + src/assembly/resource/ false @@ -142,14 +141,14 @@ **/*.bat - + true - + - copy-msb-resources-${win64id} + copy-msb-resources-${win64id} prepare-package copy-resources @@ -157,7 +156,7 @@ ${win64outputdir} true - + src/assembly/resource/ false @@ -167,14 +166,14 @@ **/*.sh - + true - + org.apache.maven.plugins maven-dependency-plugin @@ -188,32 +187,32 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-standalone zip - + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis tar.gz - linux64 - + linux64 + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis-ext - zip - + zip + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty tar.gz - linux64 - + linux64 + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty-ext - zip - + zip + **/*.bat,*.cmd ${linux64outputdir} @@ -231,32 +230,32 @@ - org.openo.msb.msb-core.apiroute + org.openo.common-services.microservice-bus apiroute-standalone zip - + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis zip - win64 - + win64 + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus redis-ext - zip - + zip + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty zip - win64 - + win64 + - org.openo.msb.msb-core + org.openo.common-services.microservice-bus openresty-ext - zip - + zip + *.sh,*/*.sh,*/*/*.sh ${win64outputdir} @@ -267,7 +266,7 @@ - + org.apache.maven.plugins maven-antrun-plugin diff --git a/msb-core/openresty-ext/pom.xml b/msb-core/openresty-ext/pom.xml index b5aee8c..1db2516 100644 --- a/msb-core/openresty-ext/pom.xml +++ b/msb-core/openresty-ext/pom.xml @@ -1,32 +1,31 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core openresty-ext 1.0.0-SNAPSHOT openo/msb/msb-core/openresty-ext @@ -38,7 +37,7 @@ - + maven-resources-plugin @@ -46,25 +45,25 @@ - copy-resources + copy-resources process-resources copy-resources ${outputdir} - + src/assembly/resources/ false **/* - + true - + @@ -92,6 +91,6 @@ - - \ No newline at end of file + + diff --git a/msb-core/openresty/pom.xml b/msb-core/openresty/pom.xml index 69765f0..550ee33 100644 --- a/msb-core/openresty/pom.xml +++ b/msb-core/openresty/pom.xml @@ -1,32 +1,31 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core openresty 1.0.0-SNAPSHOT openo/msb/msb-core/openresty @@ -79,4 +78,4 @@ - \ No newline at end of file + diff --git a/msb-core/pom.xml b/msb-core/pom.xml index ef170cb..7bf0168 100644 --- a/msb-core/pom.xml +++ b/msb-core/pom.xml @@ -1,30 +1,29 @@ - org.openo.msb + org.openo.common-services.microservice-bus msb-core-root 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core msb-core-parent 1.0.0-SNAPSHOT openo/msb/msb-core-parent @@ -38,4 +37,4 @@ distributions - \ No newline at end of file + diff --git a/msb-core/redis-ext/pom.xml b/msb-core/redis-ext/pom.xml index 907b690..96bf309 100644 --- a/msb-core/redis-ext/pom.xml +++ b/msb-core/redis-ext/pom.xml @@ -1,32 +1,31 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core redis-ext 1.0.0-SNAPSHOT openo/msb/msb-core/redis-ext @@ -38,7 +37,7 @@ - + maven-resources-plugin @@ -46,25 +45,25 @@ - copy-resources + copy-resources process-resources copy-resources ${outputdir} - + src/assembly/resources/ false **/* - + true - + @@ -92,6 +91,6 @@ - - \ No newline at end of file + + diff --git a/msb-core/redis/pom.xml b/msb-core/redis/pom.xml index 5c3930e..d6d3959 100644 --- a/msb-core/redis/pom.xml +++ b/msb-core/redis/pom.xml @@ -1,32 +1,31 @@ - org.openo.msb.msb-core + org.openo.common-services.microservice-bus msb-core-parent 1.0.0-SNAPSHOT - + 4.0.0 - org.openo.msb.msb-core redis 1.0.0-SNAPSHOT openo/msb/msb-core/redis @@ -79,4 +78,4 @@ - \ No newline at end of file + diff --git a/msb-parent/msbparent-lite/pom.xml b/msb-parent/msbparent-lite/pom.xml index 341de3d..7d16422 100644 --- a/msb-parent/msbparent-lite/pom.xml +++ b/msb-parent/msbparent-lite/pom.xml @@ -1,19 +1,19 @@ 4.0.0 @@ -26,17 +26,13 @@ - org.openo.msb + org.openo.common-services.microservice-bus msbparent-lite - 1.0.0 + 1.0.0-SNAPSHOT pom - msbparent-lite + msbparent-lite - - dav:http://nexus.open-o.com/repos/content/repositories/releases - dav:http://nexus.open-o.com/repos/content/repositories/snapshots - latest UTF-8 @@ -47,7 +43,7 @@ 1.7 1.7 ${maven.compiler.source} - ${maven.compiler.target} + ${maven.compiler.target} @@ -65,23 +61,8 @@ 2.16 ${maven.compile.plugin.version} 1.4 - - - - - - releases - ${nexus.repository.release} - - - snapshots - ${nexus.repository.snapshot} - - - - @@ -152,7 +133,7 @@ maven-antrun-plugin ${maven.antrun.plugin.version} - + maven-clean-plugin ${maven.clean.plugin.version} @@ -209,7 +190,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + 2.10 @@ -245,11 +226,11 @@ true - + - - + + diff --git a/msb-parent/msbparent/pom.xml b/msb-parent/msbparent/pom.xml index 4f03c5e..61e0079 100644 --- a/msb-parent/msbparent/pom.xml +++ b/msb-parent/msbparent/pom.xml @@ -1,34 +1,33 @@ 4.0.0 - org.openo.msb + org.openo.common-services.microservice-bus msbparent-lite - 1.0.0 + 1.0.0-SNAPSHOT ../msbparent-lite - org.openo.msb msbparent pom - msbparent + msbparent @@ -42,7 +41,7 @@ 0.8.0 - 1.5.3 + 1.5.3 2.7.3 1.16.4 2.4 @@ -77,7 +76,7 @@ io.dropwizard dropwizard-client ${dropwizard.version} - + io.swagger @@ -90,17 +89,17 @@ redis.clients jedis ${jedis.version} - + org.projectlombok lombok ${lombok.version} - - net.sf.json-lib - json-lib - ${json-lib.version} - + + net.sf.json-lib + json-lib + ${json-lib.version} + @@ -172,5 +171,5 @@ - + diff --git a/msb-parent/pom.xml b/msb-parent/pom.xml index d4bedff..e07c915 100644 --- a/msb-parent/pom.xml +++ b/msb-parent/pom.xml @@ -1,34 +1,33 @@ 4.0.0 - org.openo.msb + org.openo.common-services.microservice-bus msbparent-lite - 1.0.0 + 1.0.0-SNAPSHOT msbparent-lite -org.openo.msb msbparent-aggregator 1.0.0 -msbparent-aggregator +msbparent-aggregator pom diff --git a/pom.xml b/pom.xml index 34ec0d3..1a804b2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,19 +1,19 @@ @@ -21,14 +21,13 @@ 4.0.0 - org.openo.msb + org.openo.common-services.microservice-bus msbparent - 1.0.0 + 1.0.0-SNAPSHOT msb-parent/msbparent - + - org.openo.msb msb-core-root 1.0.0-SNAPSHOT openo/msb/msb-core-root @@ -39,4 +38,4 @@ msb-core - \ No newline at end of file +