Change Beijing Release to 2.1.1

Issue-ID: AAF-305
Change-Id: I2421a6926a3b324cf0d1fe2a0cd64871de552b8b
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index 789e24e..7366421 100644 (file)
--- a/auth-client/pom.xml
+++ b/auth-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
        
        <artifactId>aaf-auth-client</artifactId>
@@ -34,7 +34,7 @@
        <packaging>jar</packaging>
 
        <properties>
-       <project.interfaceVersion>2.1.0-SNAPSHOT</project.interfaceVersion>
+       <project.interfaceVersion>2.1.1-SNAPSHOT</project.interfaceVersion>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <maven.test.failure.ignore>true</maven.test.failure.ignore>
                <!--  SONAR  -->

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 00638a7..0e54d31 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -97,31 +97,26 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-env</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-rosetta</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -152,7 +147,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -163,7 +157,6 @@
                        <plugin>
                                        <groupId>org.jacoco</groupId>
                                        <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>${jacoco.version}</version>
                                        <configuration>
                                                <excludes>
                                                        <exclude>**/gen/**</exclude>

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index cc61f19..b5a1426 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 10a3bb0..7da6464 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -17,7 +17,7 @@
        <parent>
                <groupId>org.onap.aaf.authz</groupId>
                <artifactId>authparent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 3f7c74a..55c709f 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 426a306..5470481 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 034c0b9..7aa6ecb 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
        </parent>
 
        <artifactId>aaf-auth-deforg</artifactId>
@@ -95,13 +95,11 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index c2fb4fb..f4bbbc1 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -86,13 +86,11 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 
@@ -124,7 +122,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -135,7 +132,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 4e3a0bf..4c4a3c9 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -50,19 +50,16 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-client</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cmd</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <!-- Add the Organizations you wish to support. You can delete ONAP if 
@@ -71,25 +68,21 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-deforg</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-client</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-xgen</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
 
@@ -143,7 +136,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -154,7 +146,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index c465f81..38cdba8 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 1699da2..28e85e1 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -49,19 +49,16 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 
@@ -110,7 +107,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -121,7 +117,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index daed471..16a3715 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -49,19 +49,16 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 
@@ -105,7 +102,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -116,7 +112,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 7d8f453..f54d7c4 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
@@ -50,13 +50,11 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-client</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <!-- Add the Organizations you wish to support. You can delete ONAP if 
@@ -65,31 +63,26 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-deforg</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-cass</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-oauth</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-rosetta</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -137,7 +130,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -148,7 +140,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/auth/pom.xml b/auth/pom.xml
index c3726b5..f543c79 100644 (file)
--- 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.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
        <artifactId>authparent</artifactId>
        <name>AAF Auth Parent</name>
@@ -35,7 +35,7 @@
        
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.interfaceVersion>2.1.0-SNAPSHOT</project.interfaceVersion>
+               <project.interfaceVersion>2.1.1-SNAPSHOT</project.interfaceVersion>
                <!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
                <project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 9c57e3c..d1583d2 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index b9ba4a1..2f2a7ce 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 
@@ -90,13 +90,10 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-misc-rosetta</artifactId>
-                       <version>${project.version}</version>
-
                </dependency>
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -116,7 +113,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -127,7 +123,6 @@
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index 5951311..e57adb8 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 83ea803..e3d025b 100644 (file)
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -25,13 +25,11 @@
        <parent>
                <groupId>org.onap.aaf.authz</groupId>
                <artifactId>cadiparent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        
        <name>AAF CADI Sample OAuth EndUser</name>
-       <groupId>org.onap.aaf.authz</groupId>
-       <version>2.1.0-SNAPSHOT</version>
        <artifactId>aaf-cadi-oauth-enduser</artifactId>
        <packaging>jar</packaging>
 
@@ -85,12 +83,10 @@
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
-                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-aaf</artifactId>
-                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 5dfdf9e..4393f08 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -22,14 +22,12 @@
 <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/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-    <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+           <groupId>org.onap.aaf.authz</groupId>
+           <artifactId>parent</artifactId>
+           <version>2.1.1-SNAPSHOT</version>
     </parent>
-       <groupId>org.onap.aaf.authz</groupId>
        <artifactId>cadiparent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-       <version>2.1.0-SNAPSHOT</version>
        <inceptionYear>2015-07-20</inceptionYear>
        <organization>
                <name>ONAP</name>

diff --git a/cadi/shiro-osgi-bundle/pom.xml b/cadi/shiro-osgi-bundle/pom.xml
index 578a1b6..83846bc 100644 (file)
--- a/cadi/shiro-osgi-bundle/pom.xml
+++ b/cadi/shiro-osgi-bundle/pom.xml
@@ -25,11 +25,12 @@
        <parent>\r
                <groupId>org.onap.aaf.authz</groupId>\r
                <artifactId>cadiparent</artifactId>\r
-               <version>2.1.0-SNAPSHOT</version>\r
+               <version>2.1.1-SNAPSHOT</version>\r
                <relativePath>..</relativePath>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
 \r
+       <name>AAF Shiro CADI Plugin</name>\r
        <artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>\r
        <packaging>bundle</packaging>\r
 \r

diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 4e7790c..01c89dd 100644 (file)
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.aaf.authz</groupId>
                <artifactId>cadiparent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index d1e3ad9..9a725b9 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index 31d8f9f..ed277b2 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index d35dd72..a4945a6 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -25,12 +25,12 @@
        <parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.1-SNAPSHOT</version>
     </parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>miscparent</artifactId>
        <name>AAF Misc Parent</name>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index efd1c2f..78ee5c9 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 
@@ -110,7 +110,6 @@
                                        <inherited>true</inherited>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>2.3.2</version>
                                        <configuration>
                                                <source>1.7</source>
                                                <target>1.7</target>
@@ -135,7 +134,6 @@
                        
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
-                                       <version>2.4</version>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <configuration>
                                                <outputDirectory>target</outputDirectory>
@@ -151,7 +149,6 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10</version>
                                        <configuration>
                                                <excludePackageNames>org.opendaylight.*</excludePackageNames>
                                        </configuration>
@@ -159,7 +156,6 @@
 
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
-                                       <version>2.5.2</version>
                                        <configuration>
                                                <goals>-s ${mvn.settings} deploy</goals>
                                        </configuration>
@@ -167,13 +163,11 @@
 
                                <plugin>
                                        <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>2.5.5</version>
                                </plugin>
 
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-deploy-plugin</artifactId>
-                                       <version>2.8.1</version>
                                        <configuration>
                                                <skip>false</skip>
                                        </configuration>
@@ -183,13 +177,11 @@
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>2.10</version>
                                </plugin>
 
                                <!-- Maven surefire plugin for testing -->
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>2.17</version>
                                        <configuration>
                                        <skipTests>false</skipTests>
                                        <includes>
@@ -205,7 +197,6 @@
                                <plugin>
                                        <groupId>org.eclipse.m2e</groupId>
                                        <artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
                                        <configuration>
                                                <lifecycleMappingMetadata>
                                                        <pluginExecutions>
@@ -235,7 +226,6 @@
                                <plugin>
                                        <groupId>org.sonatype.plugins</groupId>
                                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                                       <version>1.6.7</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <nexusUrl>${nexusproxy}</nexusUrl>
@@ -246,7 +236,6 @@
                                <plugin>
                                        <groupId>org.jacoco</groupId>
                                        <artifactId>jacoco-maven-plugin</artifactId>
-                                       <version>${jacoco.version}</version>
                                        <configuration>
                                                <excludes>
                                                        <exclude>**/gen/**</exclude>

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 8aa12fa..083c0dc 100644 (file)
--- 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.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/pom.xml b/pom.xml
index 58871f8..ee90353 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
-       <version>2.1.0-SNAPSHOT</version>
+       <version>2.1.1-SNAPSHOT</version>
        <name>AAF Overall Parent</name>
        <packaging>pom</packaging>
 
@@ -64,7 +64,6 @@
                        <plugin>
                                <groupId>org.sonatype.plugins</groupId>
                                <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <nexusUrl>${nexusproxy}</nexusUrl>
@@ -75,12 +74,10 @@
                        <plugin>
                                <groupId>org.sonarsource.scanner.maven</groupId>
                                <artifactId>sonar-maven-plugin</artifactId>
-                               <version>3.2</version>
                        </plugin>
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>${jacoco.version}</version>
                                <configuration>
                                        <excludes>
                                                <exclude>**/gen/**</exclude>

diff --git a/version.properties b/version.properties
index 26d89e3..8e1fcaf 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,10 +27,10 @@
 
 major=2
 minor=1
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
 release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file
+snapshot_version=${base_version}-SNAPSHOT