Fix Cass, then to Version 2.1.19

Issue-ID: AAF-1081
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I5ca5779813b6120dfb6c13768abab4855ad26c35

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index 174cc47..8c7d0c2 100644 (file)
--- 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-client</artifactId>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index e21b632..78dfe2c 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-batch/src/assemble/auth-batch.xml b/auth/auth-batch/src/assemble/auth-batch.xml
index 25b37b7..eb0456e 100644 (file)
--- a/auth/auth-batch/src/assemble/auth-batch.xml
+++ b/auth/auth-batch/src/assemble/auth-batch.xml
@@ -45,13 +45,16 @@
         <include>org.onap.aaf.authz:aaf-auth-batch</include>
        <include>org.onap.aaf.authz:aaf-auth-core</include>
        <include>org.onap.aaf.authz:aaf-cadi-core</include>
+       <include>org.onap.aaf.authz:aaf-auth-cass</include>
        <include>org.onap.aaf.authz:aaf-misc-env</include>
        <include>org.onap.aaf.authz:aaf-misc-rosetta</include>
+       <include>com.datastax.cassandra:cassandra-driver-core</include>
        <include>javax.xml.bind:jaxb-api</include>
        <include>org.glassfish.jaxb:jaxb-runtime</include>
        <include>com.sun.istack:istack-commons-runtime</include>
        <include>javax.activation:javax.activation-api</include>
+       <include>log4j:log4j</include>
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>

diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh
index b665012..dc3e7f8 100644 (file)
--- a/auth/auth-cass/cass_init/cmd.sh
+++ b/auth/auth-cass/cass_init/cmd.sh
@@ -71,7 +71,7 @@ function wait_start {
 function wait_cql {
    status wait for keyspace to be initialized
    for CNT in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-     if [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)"  ]; then
+     if [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)"  ]; then
        break
      else
         echo "Waiting for Keyspaces to be loaded... Sleep 10"
@@ -96,11 +96,11 @@ function wait_ready {
 function install_cql {
     wait_start cassandra responsive   
     # Now, make sure data exists
-    if [ ! -e $INSTALLED_VERSION ] && [ -n "$(/usr/bin/cqlsh -e 'describe keyspaces' | grep authz)" ]; then
-      /usr/bin/cqlsh --request-timeout=60 -e 'DROP KEYSPACE authz' 
+    if [ ! -e $INSTALLED_VERSION ] && [ -n "$(cqlsh -e 'describe keyspaces' | grep authz)" ]; then
+      cqlsh --request-timeout=60 -e 'DROP KEYSPACE authz' 
     fi
 
-    if [ -z "`/usr/bin/cqlsh --request-timeout 60 -e 'describe keyspaces' | grep authz`" ]; then
+    if [ -z "`cqlsh --request-timeout 60 -e 'describe keyspaces' | grep authz`" ]; then
         status install 
         echo "Initializing Cassandra DB" 
         echo "Docker Installed Basic Cassandra on aaf.cass.  Executing the following "
@@ -109,10 +109,10 @@ function install_cql {
         echo " cd /opt/app/aaf/cass_init"
         cd /opt/app/aaf/cass_init
         echo " cqlsh -f keyspace.cql"
-        /usr/bin/cqlsh --request-timeout=100 -f keyspace.cql
+        cqlsh --request-timeout=100 -f keyspace.cql
        status keyspace installed
         echo " cqlsh -f init.cql"
-        /usr/bin/cqlsh --request-timeout=100 -f init.cql
+        cqlsh --request-timeout=100 -f init.cql
        status data initialized
         echo ""
         echo "The following will give you a temporary identity with which to start working, or emergency"

diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh
index a2c0292..528978a 100644 (file)
--- a/auth/auth-cass/cass_init/restore.sh
+++ b/auth/auth-cass/cass_init/restore.sh
@@ -4,7 +4,7 @@
 echo `date`
 ENV=DOCKER
 
-CQLSH="/usr/bin/cqlsh -k authz"
+CQLSH="cqlsh -k authz"
 
 cd dats
 if [ "$*" = "" ]; then

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 0e5e674..f346826 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 5d4b16e..d44840b 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 4f7c1e1..01fa56c 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index f153da4..5c4cd00 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 34ebf26..b2822b3 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-deforg</artifactId>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index 6e0ffe5..f0095d0 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 614c2a0..956cf66 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index d1e2ec6..1d95f29 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 833dd5f..9de3dfa 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index dd15cf7..90774da 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 36adaf0..31d4aa7 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 415aeb6..b65c5de 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.18-SNAPSHOT
+VERSION=2.1.19-SNAPSHOT
 CONF_ROOT_DIR=/opt/app/osaaf
 # For local builds, set PREFIX=   
 PREFIX="$DOCKER_REPOSITORY/"

diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
index df17fea..630a869 100644 (file)
--- 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml
index 18614f7..dd4735f 100644 (file)
--- a/auth/helm/aaf-hello/values.yaml
+++ b/auth/helm/aaf-hello/values.yaml
@@ -37,8 +37,8 @@ image:
   # repository: localhost:5000/
 
 service:
-  agentImage: onap/aaf/aaf_agent:2.1.18-SNAPSHOT
-  image: onap/aaf/aaf_hello:2.1.18-SNAPSHOT
+  agentImage: onap/aaf/aaf_agent:2.1.19-SNAPSHOT
+  image: onap/aaf/aaf_hello:2.1.19-SNAPSHOT
   app_ns: "org.osaaf.aaf"
   fqi: "aaf@aaf.osaaf.org"
   fqdn: "aaf-hello"

diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml
index b6ce0cd..727aa2b 100644 (file)
--- a/auth/helm/aaf/Chart.yaml
+++ b/auth/helm/aaf/Chart.yaml
@@ -23,6 +23,6 @@ appVersion: "1.0"
 description: AAF Helm Chart
 name: aaf
 ## Use this to pull Released Version
-# version: 2.1.18
+# version: 2.1.19
 
-version: 2.1.18-SNAPSHOT
+version: 2.1.19-SNAPSHOT

diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index 31ba1df..8b875be 100644 (file)
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -31,7 +31,7 @@ image:
   # When using Docker Repo, add, and include trailing "/"
   #  For Released Versions (both Repo and remove "-SNAPSHOT" from version)
   # repository: nexus3.onap.org:10001/
-  # version: 2.1.18
+  # version: 2.1.19
 
   ###  FOR SNAPSHOTS, DEVELOPMENT, ETC ###
   # When using Locally built images, comment out "repository"
@@ -40,7 +40,7 @@ image:
   # repository: localhost:5000/
   # When using locally built Docker Container, set Repository to ""
   repository: ""
-  version: 2.1.18-SNAPSHOT
+  version: 2.1.19-SNAPSHOT
 
 services:
   aaf_env: "DEV"

diff --git a/auth/pom.xml b/auth/pom.xml
index 967ae35..b197627 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
     </parent>
     <artifactId>authparent</artifactId>
     <name>AAF Auth Parent</name>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 7d3c177..991d4d8 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index 21bde62..688c22b 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index d291bef..f78d434 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index b31b3e5..2f966d5 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 70158ec..abf5023 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.18-SNAPSHOT</version>
+        <version>2.1.19-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 b46ffb7..c1df9bf 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.18-SNAPSHOT</version>
+        <version>2.1.19-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 1dc715b..420e4b7 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index c9f9690..9d1827f 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index 1b76eb1..44d3af9 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.18-SNAPSHOT</version>
+       <version>2.1.19-SNAPSHOT</version>
     </parent>
     <artifactId>miscparent</artifactId>
     <name>AAF Misc Parent</name>

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index ad57fce..0b14ac1 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 656cb56..48b1b87 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.18-SNAPSHOT</version>
+        <version>2.1.19-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index afc8fc9..9e47ff0 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.18-SNAPSHOT</version>
+    <version>2.1.19-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 48397ff..bb43fd2 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.18-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.19-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=18
+patch=19
 
 base_version=${major}.${minor}.${patch}