summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-05-16 10:04:27 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-05-16 10:04:27 +0200
commitffd2733b918a97a2bcb0b3fe1aa40c2633977207 (patch)
tree94c9e369a2d65bce9c24a32473b4ad2f2a99aca5
parent8e552962e9a2e069f3ceb144fdbe71345fee934b (diff)
Make jvm args in sparky-be configurable via environment variable
- replace hardcoded xms and xmx jvm args with optional JVM_ARGS environment variable - use newer java 11 base image - bump version from 2.0.3 to 2.0.4 Issue-ID: AAI-3849 Change-Id: I215cbe7344f0278fe32179834938961dc7ed6075 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
-rw-r--r--pom.xml2
-rw-r--r--sparkybe-onap-application/pom.xml6
-rw-r--r--sparkybe-onap-application/src/main/scripts/start.sh2
-rw-r--r--sparkybe-onap-service/pom.xml4
-rw-r--r--version.properties2
5 files changed, 8 insertions, 8 deletions
diff --git a/pom.xml b/pom.xml
index 0ffa314..4a1548a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aai-sparky-be</name>
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index c115d1c..83d6b1c 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-application</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -36,7 +36,7 @@
</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
<aai.base.image>alpine</aai.base.image>
- <aai.base.image.version>1.8.1</aai.base.image.version>
+ <aai.base.image.version>1.13.2</aai.base.image.version>
<!-- This will be used for the docker images as the default format of maven build has issues -->
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh
index b4e1083..808be7b 100644
--- a/sparkybe-onap-application/src/main/scripts/start.sh
+++ b/sparkybe-onap-application/src/main/scripts/start.sh
@@ -21,4 +21,4 @@ set -x
#
cd $APP_HOME
-${JAVA_CMD} -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar
+${JAVA_CMD} ${JVM_ARGS} $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar
diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml
index ef1961e..b62de3a 100644
--- a/sparkybe-onap-service/pom.xml
+++ b/sparkybe-onap-service/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-service</artifactId>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.4-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
diff --git a/version.properties b/version.properties
index 9bb11f5..dd10411 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=2
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}