From: John J. Franey Date: Sat, 25 Apr 2020 12:42:01 +0000 (-0400) Subject: Enable deploy plugin in all poms. X-Git-Tag: 2.1.21~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=e4220946ef3feb864ed45e4fc14682be2016dc1b Enable deploy plugin in all poms. maven will then push all the artifacts to nexus when the deploy goal is invoked. Issue-ID: AAF-1136 Signed-off-by: John J. Franey Change-Id: I1957cf2daf60507edae65e8cacf7730bf08a6adb --- diff --git a/auth-client/pom.xml b/auth-client/pom.xml index b011a586..47f7b2f9 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT aaf-auth-client @@ -87,13 +87,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.jvnet.jaxb2.maven2 maven-jaxb2-plugin @@ -110,14 +103,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - org.apache.maven.plugins maven-compiler-plugin diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index f3f0e5c3..494380d7 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index bd51b861..68840fad 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 0adce9cc..56efc8d9 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index de573f11..392acf5e 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 453b0deb..0361fd25 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 52b34ab0..4e9c7f25 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ authparent ../pom.xml org.onap.aaf.authz - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index df18b23a..a2772733 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 6eaced2e..36f4af1d 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index a93bd2f9..443613d4 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 0d801922..c96dcc08 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index ee08689a..ddd45dae 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 26fc7c74..dcc2161b 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index 4afd8e6b..afd52e29 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index 9553ba41..7e1b7828 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 60d9c658..ae40fca7 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index ea483e93..fd9ff68b 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index e79dba27..04691dea 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index e3abc56c..d589adaf 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. @@ -168,15 +168,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - diff --git a/cadi/pom.xml b/cadi/pom.xml index 40c04817..3272f041 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) @@ -172,16 +172,6 @@ 2.5.5 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index e4212944..cee65a94 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 962c22bc..6db6235f 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. @@ -137,16 +137,6 @@ 2.5.5 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index d734cf7e..8ae822e5 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. @@ -137,16 +137,6 @@ 2.5.5 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/misc/pom.xml b/misc/pom.xml index 1993a6cb..7779c30f 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT miscparent AAF Misc Parent @@ -139,16 +139,6 @@ 2.5.5 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 1a4ab7ba..491e0fe1 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. @@ -156,15 +156,6 @@ maven-assembly-plugin - - org.apache.maven.plugins - maven-deploy-plugin - - false - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 46face06..d364eb84 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT .. @@ -136,15 +136,6 @@ 2.5.5 - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.1 - - false - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/pom.xml b/pom.xml index f3ee5c18..fd711794 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.1.20-SNAPSHOT + 2.1.21-SNAPSHOT aaf-authz pom @@ -68,13 +68,6 @@ - - org.apache.maven.plugins - maven-deploy-plugin - - true - - org.sonarsource.scanner.maven sonar-maven-plugin diff --git a/version.properties b/version.properties index aecb8d34..02ce0893 100644 --- a/version.properties +++ b/version.properties @@ -24,10 +24,10 @@ # 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 -# This TAG 2.1.19-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG 2.1.21-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=1 -patch=20 +patch=21 base_version=${major}.${minor}.${patch}