summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aai-traversal/pom.xml8
-rw-r--r--aai-traversal/src/main/resources/docker/docker-entrypoint.sh4
-rw-r--r--pom.xml6
3 files changed, 8 insertions, 10 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 724b2db..d79e1e7 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -19,8 +19,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-core.version>1.1.0-SNAPSHOT</aai-core.version>
- <aai-schema.version>1.1.0-SNAPSHOT</aai-schema.version>
<hbase.version>1.0.2</hbase.version>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -33,12 +31,12 @@
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-schema</artifactId>
- <version>${aai-schema.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-core</artifactId>
- <version>${aai-core.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Scamper related dependencies -->
<dependency>
@@ -458,7 +456,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-traversal/src/main/resources/docker/docker-entrypoint.sh b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
index 64b7277..d1231f2 100644
--- a/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
+++ b/aai-traversal/src/main/resources/docker/docker-entrypoint.sh
@@ -51,6 +51,8 @@ gosu aaiadmin ./init-chef.sh || {
httpPort=8086;
httpsPort=8446;
+AAI_CORE_JAR=$(ls ${APP_HOME}/extJars/aai-core*.jar);
+
cd ${APP_HOME};
# If the variable DISABLE_UPDATE_QUERY is empty
@@ -84,7 +86,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 55559c1..41799e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
<module.ajsc.namespace.name>ActiveAndAvailableInventory-Traversal</module.ajsc.namespace.name>
<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
<ajscRuntimeVersion>2.1.0</ajscRuntimeVersion>
- <aai-schema.version>1.1.0-SNAPSHOT</aai-schema.version>
<aai.project.version>1.1.0</aai.project.version>
<aai.docker.version>1.1</aai.docker.version>
@@ -59,7 +58,6 @@
<cxf.version>3.0.4</cxf.version>
<swmpkgversion>0.0.1</swmpkgversion>
<snapshot.file>int1-data.graphson</snapshot.file>
- <aai-core.version>1.1.0-SNAPSHOT</aai-core.version>
</properties>
<repositories>
@@ -140,7 +138,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>
@@ -212,7 +210,7 @@
</systemProperty>
<systemProperty>
<key>aai-core.version</key>
- <value>${aai-core.version}</value>
+ <value>${project.version}</value>
</systemProperty>
</systemProperties>