From 7f0618966623e4a5a5580caf8c6bfbb42f4e15e0 Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Tue, 6 Mar 2018 14:31:19 -0500 Subject: Add the spring boot maven plugin Issue-ID: AAI-96 Change-Id: If55d3de6b4bced78b8fc029111e1ad47d077f9a6 Signed-off-by: Venkata Harish K Kajur --- aai-resources/pom.xml | 4 ++++ aai-resources/src/main/docker/docker-entrypoint.sh | 2 +- aai-resources/src/main/scripts/common_functions.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 48ae636..5c0ac25 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -873,6 +873,10 @@ + + org.springframework.boot + spring-boot-maven-plugin + org.apache.maven.plugins maven-gpg-plugin diff --git a/aai-resources/src/main/docker/docker-entrypoint.sh b/aai-resources/src/main/docker/docker-entrypoint.sh index 05abc71..2f57a2a 100644 --- a/aai-resources/src/main/docker/docker-entrypoint.sh +++ b/aai-resources/src/main/docker/docker-entrypoint.sh @@ -105,6 +105,6 @@ JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom"; JAVA_OPTS="${JAVA_OPTS} -Dloader.path=$APP_HOME/resources"; JAVA_OPTS="${JAVA_OPTS} ${POST_JAVA_OPTS}"; -JAVA_MAIN_JAR=$(ls lib/aai-resources*.jar); +JAVA_MAIN_JAR=$(ls lib/aai-resources-*SNAPSHOT.jar); ${JAVA_CMD} ${JVM_OPTS} ${JAVA_OPTS} -jar ${JAVA_MAIN_JAR}; diff --git a/aai-resources/src/main/scripts/common_functions.sh b/aai-resources/src/main/scripts/common_functions.sh index 853941c..2a908e2 100644 --- a/aai-resources/src/main/scripts/common_functions.sh +++ b/aai-resources/src/main/scripts/common_functions.sh @@ -29,7 +29,7 @@ execute_spring_jar(){ shift 2; - EXECUTABLE_JAR=$(ls ${PROJECT_HOME}/lib/*.jar); + EXECUTABLE_JAR=$(ls ${PROJECT_HOME}/lib/aai-resources-*SNAPSHOT.jar); JAVA_OPTS="${JAVA_PRE_OPTS}"; JAVA_OPTS="-DAJSC_HOME=$PROJECT_HOME"; -- cgit 1.2.3-korg