Prepare for release 2.1.17

Issue-ID: AAF-1196
Signed-off-by: Sean Hassan <sean.hassan@att.com>
Change-Id: Ic10219cc0ed2186780aec7845a97f588a653c03f

diff --git a/pom.xml b/pom.xml
index b20804f..b896c4e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.aaf.cadi</groupId>
        <artifactId>parent</artifactId>
-       <version>2.1.16-SNAPSHOT</version>
+       <version>2.1.17-SNAPSHOT</version>
        <name>CADI Plugins Parent</name>
        <packaging>pom</packaging>
 
@@ -34,7 +34,7 @@
 
        <properties>
                <!-- This version needs to be RELEASED version. Fails on SNAPSHOT -->
-               <cadi.version>2.1.13</cadi.version>
+               <cadi.version>2.7.1</cadi.version>
                <!-- <sonar.skip>true</sonar.skip> -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <!-- project.jettyVersion>9.4.12.v20180830</project.jettyVersion -->

diff --git a/shiro-osgi-bundle/pom.xml b/shiro-osgi-bundle/pom.xml
index c7e0a16..8ed387c 100644 (file)
--- a/shiro-osgi-bundle/pom.xml
+++ b/shiro-osgi-bundle/pom.xml
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi</groupId>
                <artifactId>parent</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 
@@ -40,7 +40,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.5.4</version>
+                               <version>4.2.1</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>

diff --git a/shiro/pom.xml b/shiro/pom.xml
index 5084632..4810acb 100644 (file)
--- a/shiro/pom.xml
+++ b/shiro/pom.xml
@@ -22,7 +22,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi</groupId>
                <artifactId>parent</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/sidecar/fproxy/pom.xml b/sidecar/fproxy/pom.xml
index 8cd4880..94d6a41 100644 (file)
--- a/sidecar/fproxy/pom.xml
+++ b/sidecar/fproxy/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi.sidecar</groupId>
                <artifactId>sidecar</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/sidecar/pom.xml b/sidecar/pom.xml
index 3dca6f1..ed01273 100644 (file)
--- a/sidecar/pom.xml
+++ b/sidecar/pom.xml
@@ -20,7 +20,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi</groupId>
                <artifactId>parent</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <modelVersion>4.0.0</modelVersion>

diff --git a/sidecar/rproxy/pom.xml b/sidecar/rproxy/pom.xml
index ebf8fbd..6e1789e 100644 (file)
--- a/sidecar/rproxy/pom.xml
+++ b/sidecar/rproxy/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi.sidecar</groupId>
                <artifactId>sidecar</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
        </parent>
 
        <properties>

diff --git a/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
index 6c9665f..068976d 100644 (file)
--- a/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
+++ b/sidecar/rproxy/src/main/java/org/onap/aaf/cadi/sidecar/rproxy/mocks/ReverseProxyMockCadiFilter.java
@@ -175,6 +175,11 @@ public class ReverseProxyMockCadiFilter implements Filter {
                                return null;
                        }
 
+                       @Override
+                       public String getTarget() {
+                               return null;
+                       }
+
                        @Override
                        public RESP authenticate() throws IOException {
                                return null;

diff --git a/sidecar/tproxy-config/pom.xml b/sidecar/tproxy-config/pom.xml
index af1d38f..744ff1a 100644 (file)
--- a/sidecar/tproxy-config/pom.xml
+++ b/sidecar/tproxy-config/pom.xml
@@ -24,7 +24,7 @@
        <parent>
                <groupId>org.onap.aaf.cadi.sidecar</groupId>
                <artifactId>sidecar</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1.17-SNAPSHOT</version>
        </parent>
 
        <artifactId>tproxy-config</artifactId>

diff --git a/version.properties b/version.properties
index 5e52b35..3be336d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -28,7 +28,7 @@
 # This TAG <version>2.1.13</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=16
+patch=17
 
 base_version=${major}.${minor}.${patch}