diff options
-rw-r--r-- | auth-client/pom.xml | 17 | ||||
-rw-r--r-- | auth/auth-batch/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-cass/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-certman/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-cmd/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-core/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-deforg/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-fs/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-gui/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-hello/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-locate/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-oauth/pom.xml | 2 | ||||
-rw-r--r-- | auth/auth-service/pom.xml | 2 | ||||
-rw-r--r-- | auth/docker/pom.xml | 2 | ||||
-rw-r--r-- | auth/pom.xml | 2 | ||||
-rw-r--r-- | cadi/aaf/pom.xml | 2 | ||||
-rw-r--r-- | cadi/client/pom.xml | 2 | ||||
-rw-r--r-- | cadi/core/pom.xml | 2 | ||||
-rw-r--r-- | cadi/oauth-enduser/pom.xml | 11 | ||||
-rw-r--r-- | cadi/pom.xml | 12 | ||||
-rw-r--r-- | cadi/servlet-sample/pom.xml | 2 | ||||
-rw-r--r-- | misc/env/pom.xml | 12 | ||||
-rw-r--r-- | misc/log4j/pom.xml | 12 | ||||
-rw-r--r-- | misc/pom.xml | 12 | ||||
-rw-r--r-- | misc/rosetta/pom.xml | 11 | ||||
-rw-r--r-- | misc/xgen/pom.xml | 11 | ||||
-rw-r--r-- | pom.xml | 9 | ||||
-rw-r--r-- | version.properties | 4 |
28 files changed, 29 insertions, 118 deletions
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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <artifactId>aaf-auth-client</artifactId> @@ -88,13 +88,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> <version>0.8.2</version> @@ -112,14 +105,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <artifactId>authparent</artifactId> <relativePath>../pom.xml</relativePath> <groupId>org.onap.aaf.authz</groupId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <artifactId>aaf-auth-deforg</artifactId> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>authparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <artifactId>authparent</artifactId> <name>AAF Auth Parent</name> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> 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 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -168,15 +168,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> </plugins> </pluginManagement> </build> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <artifactId>cadiparent</artifactId> <name>AAF CADI Parent (Code, Access, Data, Identity)</name> @@ -174,16 +174,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> </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 @@ <groupId>org.onap.aaf.authz</groupId> <artifactId>cadiparent</artifactId> <relativePath>..</relativePath> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <name>CADI Servlet Sample (Test Only)</name> 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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -139,16 +139,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> </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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -139,16 +139,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> </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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> </parent> <artifactId>miscparent</artifactId> <name>AAF Misc Parent</name> @@ -141,16 +141,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> </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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -158,15 +158,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> </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 @@ <parent> <groupId>org.onap.aaf.authz</groupId> <artifactId>miscparent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -138,15 +138,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.1</version> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.10</version> </plugin> @@ -22,7 +22,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.aaf.authz</groupId> <artifactId>parent</artifactId> - <version>2.1.20-SNAPSHOT</version> + <version>2.1.21-SNAPSHOT</version> <name>aaf-authz</name> <packaging>pom</packaging> @@ -69,13 +69,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> <groupId>org.sonarsource.scanner.maven</groupId> <artifactId>sonar-maven-plugin</artifactId> </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 <version>2.1.19-SNAPSHOT</version> is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG <version>2.1.21-SNAPSHOT</version> 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} |