diff options
| -rw-r--r-- | aai-resources/pom.xml | 7 | ||||
| -rw-r--r-- | aai-resources/src/main/resources/docker/docker-entrypoint.sh | 4 | ||||
| -rw-r--r-- | docs/index.rst | 8 | ||||
| -rw-r--r-- | pom.xml | 5 |
4 files changed, 8 insertions, 16 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/docs/index.rst b/docs/index.rst deleted file mode 100644 index 833e1aa..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. - -TODO Add files to toctree and delete this header ------------------------------------------------- -.. toctree:: - :maxdepth: 1 - - @@ -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> |