Issue-ID: AAF-1081
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I5ca5779813b6120dfb6c13768abab4855ad26c35
35 files changed:
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<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>
</parent>
<artifactId>aaf-auth-client</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<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-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>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>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>
</includes>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
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
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"
break
else
echo "Waiting for Keyspaces to be loaded... Sleep 10"
function install_cql {
wait_start cassandra responsive
# Now, make sure data exists
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'
- 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 "
status install
echo "Initializing Cassandra DB"
echo "Docker Installed Basic Cassandra on aaf.cass. Executing the following "
echo " cd /opt/app/aaf/cass_init"
cd /opt/app/aaf/cass_init
echo " cqlsh -f keyspace.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"
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"
status data initialized
echo ""
echo "The following will give you a temporary identity with which to start working, or emergency"
-CQLSH="/usr/bin/cqlsh -k authz"
cd dats
if [ "$*" = "" ]; then
cd dats
if [ "$*" = "" ]; then
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>authparent</artifactId>
<relativePath>../pom.xml</relativePath>
<groupId>org.onap.aaf.authz</groupId>
<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>
</parent>
<artifactId>aaf-auth-deforg</artifactId>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
# Note: Override can happen on dbuild.sh Commandline, -r <registry>
DOCKER_PULL_REGISTRY=nexus3.onap.org:10001
DOCKER_REPOSITORY=nexus3.onap.org:10003
# Note: Override can happen on dbuild.sh Commandline, -r <registry>
DOCKER_PULL_REGISTRY=nexus3.onap.org:10001
DOCKER_REPOSITORY=nexus3.onap.org:10003
CONF_ROOT_DIR=/opt/app/osaaf
# For local builds, set PREFIX=
PREFIX="$DOCKER_REPOSITORY/"
CONF_ROOT_DIR=/opt/app/osaaf
# For local builds, set PREFIX=
PREFIX="$DOCKER_REPOSITORY/"
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>authparent</artifactId>
<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>
<relativePath>../pom.xml</relativePath>
</parent>
# repository: localhost:5000/
service:
# 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"
app_ns: "org.osaaf.aaf"
fqi: "aaf@aaf.osaaf.org"
fqdn: "aaf-hello"
description: AAF Helm Chart
name: aaf
## Use this to pull Released Version
description: AAF Helm Chart
name: aaf
## Use this to pull Released Version
-version: 2.1.18-SNAPSHOT
+version: 2.1.19-SNAPSHOT
# When using Docker Repo, add, and include trailing "/"
# For Released Versions (both Repo and remove "-SNAPSHOT" from version)
# repository: nexus3.onap.org:10001/
# When using Docker Repo, add, and include trailing "/"
# For Released Versions (both Repo and remove "-SNAPSHOT" from version)
# repository: nexus3.onap.org:10001/
### FOR SNAPSHOTS, DEVELOPMENT, ETC ###
# When using Locally built images, comment out "repository"
### FOR SNAPSHOTS, DEVELOPMENT, ETC ###
# When using Locally built images, comment out "repository"
# repository: localhost:5000/
# When using locally built Docker Container, set Repository to ""
repository: ""
# repository: localhost:5000/
# When using locally built Docker Container, set Repository to ""
repository: ""
- version: 2.1.18-SNAPSHOT
+ version: 2.1.19-SNAPSHOT
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<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>
</parent>
<artifactId>authparent</artifactId>
<name>AAF Auth Parent</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
<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>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<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>
</parent>
<artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
<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>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>CADI Servlet Sample (Test Only)</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<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>
</parent>
<artifactId>miscparent</artifactId>
<name>AAF Misc Parent</name>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>miscparent</artifactId>
<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>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
<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>
<name>aaf-authz</name>
<packaging>pom</packaging>
# 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
# 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:
base_version=${major}.${minor}.${patch}
base_version=${major}.${minor}.${patch}