diff options
Diffstat (limited to 'aai-resources')
| -rw-r--r-- | aai-resources/pom.xml | 7 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/docker/docker-entrypoint.sh | 4 |
2 files changed, 6 insertions, 5 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 |