El Alto start with 2.1.14

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

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index cecd825..c6ed4be 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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
        
        <artifactId>aaf-auth-client</artifactId>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index 0466535..442f6b6 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-cass/JU_ConfigDAOTest.java b/auth/auth-cass/JU_ConfigDAOTest.java
new file mode 100644 (file)
index 0000000..c355c4d
Binary files /dev/null and b/auth/auth-cass/JU_ConfigDAOTest.java differ

diff --git a/auth/auth-cass/JU_LocateDAOTest.java b/auth/auth-cass/JU_LocateDAOTest.java
new file mode 100644 (file)
index 0000000..ad7b3a2
Binary files /dev/null and b/auth/auth-cass/JU_LocateDAOTest.java differ

diff --git a/auth/auth-cass/JU_NsDAOTest.java b/auth/auth-cass/JU_NsDAOTest.java
new file mode 100644 (file)
index 0000000..021329a
Binary files /dev/null and b/auth/auth-cass/JU_NsDAOTest.java differ

diff --git a/auth/auth-cass/JU_OAuthTokenDAOTest.java b/auth/auth-cass/JU_OAuthTokenDAOTest.java
new file mode 100644 (file)
index 0000000..4ab86cd
Binary files /dev/null and b/auth/auth-cass/JU_OAuthTokenDAOTest.java differ

diff --git a/auth/auth-cass/JU_PermDAOTest.java b/auth/auth-cass/JU_PermDAOTest.java
new file mode 100644 (file)
index 0000000..74b7a02
Binary files /dev/null and b/auth/auth-cass/JU_PermDAOTest.java differ

diff --git a/auth/auth-cass/JU_RoleDAOTest.java b/auth/auth-cass/JU_RoleDAOTest.java
new file mode 100644 (file)
index 0000000..06a8e6c
Binary files /dev/null and b/auth/auth-cass/JU_RoleDAOTest.java differ

diff --git a/auth/auth-cass/JU_UserRoleDAOTest.java b/auth/auth-cass/JU_UserRoleDAOTest.java
new file mode 100644 (file)
index 0000000..56d5b8a
Binary files /dev/null and b/auth/auth-cass/JU_UserRoleDAOTest.java differ

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 2cedf0d..ee00039 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java b/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java
index ce32615..fbd1b81 100644 (file)
--- a/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java
+++ b/auth/auth-cass/src/test/java/org/onap/aaf/auth/dao/cass/JU_CacheInfoDAO.java
@@ -269,13 +269,12 @@ public class JU_CacheInfoDAO {
                CacheInfoDAOImpl daoObj=null;
                try {
                        daoObj = new CacheInfoDAOImpl(trans, cluster, "test",data, createPS);
+                       Date retVal = daoObj.get(trans, "test", 1011);
+//                     assertTrue(retVal.status == 0);
+                       retVal = daoObj.get(trans, "test1", 1011);
                } catch (APIException | IOException e) {
-                       // TODO Auto-generated catch block
                        e.printStackTrace();
                }
-               Date retVal = daoObj.get(trans, "test", 1011);
-//             assertTrue(retVal.status == 0);
-               retVal = daoObj.get(trans, "test1", 1011);
        }
        
        @Test

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index e0ab3a2..133a88d 100644 (file)
--- 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index dfb4937..900bc42 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 5df349a..2b9297d 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 0aff96e..92e08fd 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
        </parent>
 
        <artifactId>aaf-auth-deforg</artifactId>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index 602b8e4..7a56126 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 00465d1..dc8f763 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 6bb5690..25a02bf 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index f351a71..baf69ba 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index b4de86d..ec5e915 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 1e89114..3b34b69 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index feb1930..0538b70 100644 (file)
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -28,7 +28,7 @@ fi
 . ./aaf.props
 
 DOCKER=${DOCKER:=docker}
-CADI_VERSION=${CADI_VERSION:=2.1.13-SNAPSHOT}
+CADI_VERSION=${CADI_VERSION:=2.1.14-SNAPSHOT}
 
 for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
    if [ "$(grep $V ./aaf.props)" = "" ]; then

diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 66663bf..d129387 100644 (file)
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -23,7 +23,7 @@ PROJECT=aaf
 # Note: Override can happen on dbuild.sh Commandline, -r <registry>
 DOCKER_PULL_REGISTRY=nexus3.onap.org:10001
 DOCKER_REPOSITORY=nexus3.onap.org:10003
-VERSION=2.1.13-SNAPSHOT
+VERSION=2.1.14-SNAPSHOT
 CONF_ROOT_DIR=/opt/app/osaaf
 # For local builds, set PREFIX=   
 PREFIX="$DOCKER_REPOSITORY/"

diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 61665a2..4ae0777 100644 (file)
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -114,7 +114,7 @@ image:
   # When using Docker Repo, add, and include trailing "/"
   # repository: nexus3.onap.org:10003/
   # repository: localhost:5000/
-  version: 2.1.13-SNAPSHOT
+  version: 2.1.14
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

diff --git a/auth/pom.xml b/auth/pom.xml
index c3e7c2b..36fe603 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.13-SNAPSHOT</version>
+        <version>2.1.14-SNAPSHOT</version>
     </parent>
        <artifactId>authparent</artifactId>
        <name>AAF Auth Parent</name>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index cc3569c..684d25a 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index c4ae110..fc56bb7 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index 473071e..c838ca2 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index edf632b..d9dae40 100644 (file)
--- 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 4cc7daf..0fffb74 100644 (file)
--- 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.13-SNAPSHOT</version>
+           <version>2.1.14-SNAPSHOT</version>
     </parent>
        <artifactId>cadiparent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>

diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml
index 09fe5b2..f46d197 100644 (file)
--- 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.13-SNAPSHOT</version>
+               <version>2.1.14-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 f5bbeb7..cc29ab1 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index 63e3f22..dcb6be3 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index ed7c898..38c40f5 100644 (file)
--- 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.13-SNAPSHOT</version>
+       <version>2.1.14-SNAPSHOT</version>
     </parent>
        <artifactId>miscparent</artifactId>
        <name>AAF Misc Parent</name>

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index e9bdd96..03d1576 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 0e7fbf9..13f2bae 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.13-SNAPSHOT</version>
+               <version>2.1.14-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
 

diff --git a/pom.xml b/pom.xml
index 1d482c2..e3f196c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
-    <version>2.1.13-SNAPSHOT</version>
+    <version>2.1.14-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index c5fe1e4..d632abe 100644 (file)
--- 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.13-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.14-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=13
+patch=14
 
 base_version=${major}.${minor}.${patch}