From d8e386bac38e19fbd71a2167e70af08dbe9ebef6 Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Thu, 2 Nov 2017 13:19:53 -0400
Subject: Update the dependency from snapshot

to using the release version and remove
the dependency in the docker file that is
tied to the 1.1.0 since we are upgrading it
will not always be the same and always depend
on the project version as it will be updatable
from the versions:set command

Issue-ID: AAI-448
Change-Id: I639e56da3584bccbfcecc511f77999ba73548080
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 aai-resources/pom.xml                                        | 7 +++----
 aai-resources/src/main/resources/docker/docker-entrypoint.sh | 4 +++-
 pom.xml                                                      | 5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 900acaa..e483034 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -20,7 +20,6 @@
         <dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
         <docker.image.version>1.0.0</docker.image.version>
-        <aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
         <sonar.language>java</sonar.language>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -33,7 +32,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
-            <version>${aai-core.version}</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>ajsc-runner</artifactId>
@@ -44,7 +43,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-schema</artifactId>
-            <version>${aai.schema.version}</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>ajsc-runner</artifactId>
@@ -491,7 +490,7 @@
                             <artifactItem>
                                 <groupId>org.onap.aai.aai-common</groupId>
                                 <artifactId>aai-schema</artifactId>
-                                <version>${aai.schema.version}</version>
+                                <version>${project.version}</version>
                                 <outputDirectory>bundleconfig-local/etc</outputDirectory>
                                 <includes>oxm/*.xml</includes>
                             </artifactItem>
diff --git a/aai-resources/src/main/resources/docker/docker-entrypoint.sh b/aai-resources/src/main/resources/docker/docker-entrypoint.sh
index 6621745..a132b9b 100644
--- a/aai-resources/src/main/resources/docker/docker-entrypoint.sh
+++ b/aai-resources/src/main/resources/docker/docker-entrypoint.sh
@@ -48,6 +48,8 @@ gosu aaiadmin ./init-chef.sh || {
 httpPort=8087;
 httpsPort=8447;
 
+AAI_CORE_JAR=$(ls ${APP_HOME}/extJars/aai-core*.jar);
+
 cd ${APP_HOME};
 
 CP=${COMMONLIBS_HOME}/*;
@@ -55,7 +57,7 @@ CP="$CP":${APP_HOME}/etc;
 CP="$CP":${APP_HOME}/lib/*;
 CP="$CP":${APP_HOME}/extJars/logback-access-1.1.7.jar;
 CP="$CP":${APP_HOME}/extJars/logback-core-1.1.7.jar;
-CP="$CP":${APP_HOME}/extJars/aai-core-${AAI_CORE_VERSION}.jar;
+CP="$CP":${AAI_CORE_JAR};
 
 # You can add additional jvm options by adding environment variable JVM_PRE_OPTS
 # If you need to add more jvm options at the end then you can use JVM_POST_OPTS
diff --git a/pom.xml b/pom.xml
index a04cb4e..8e4cdbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,6 @@
         <!-- For using CXF with Maven -->
         <cxf.version>3.0.4</cxf.version>
         <snapshot.file>int1-data.graphson</snapshot.file>
-        <aai-core.version>1.1.0-SNAPSHOT</aai-core.version>
     </properties>
     <pluginRepositories>
         <pluginRepository>
@@ -183,7 +182,7 @@
                                         <additionalClasspathElement>${runAjscHome}/extJars/logback-core-1.1.7.jar
                                         </additionalClasspathElement>
                                         <additionalClasspathElement>
-                                            ${runAjscHome}/extJars/aai-core-${aai-core.version}.jar
+                                            ${runAjscHome}/extJars/aai-core-${project.version}.jar
                                         </additionalClasspathElement>
                                     </additionalClasspathElements>
 
@@ -255,7 +254,7 @@
                                         </systemProperty>
                                         <systemProperty>
                                             <key>aai-core.version</key>
-                                            <value>${aai-core.version}</value>
+                                            <value>${project.version}</value>
                                         </systemProperty>
                                     </systemProperties>
 
-- 
cgit 1.2.3-korg