Fix GC algorithm and set images to Java 17

Signed-off-by: Ricardo Zanini <[email protected]>
apache · Dec 22, 2023 · 00cf43e · 00cf43e
1 parent b66c846
commit 00cf43e
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 28 deletions.
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
@@ -37,7 +37,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.maven
       version: "3.9.3"

diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.community.ephemeral

diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.infinispan

diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.mongodb

diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.oracle

diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
@@ -39,7 +39,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.dataindex.postgresql

diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.explainability

diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jit-runner

diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
@@ -41,7 +41,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.allinone

diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.ephemeral

diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.infinispan

diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.mongodb

diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.jobs.service.postgresql

diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.management.console

diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
@@ -50,7 +50,7 @@ modules:
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.project.versions
     - name: org.kie.kogito.s2i.core

diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
@@ -10,7 +10,7 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
           version: "3.9.3"
@@ -58,7 +58,7 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
           version: "3.9.3"

diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
@@ -10,7 +10,7 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
           version: "3.9.3"
@@ -56,7 +56,7 @@
         - name: org.kie.kogito.logging
         - name: org.kie.kogito.launch.scripts
         - name: org.kie.kogito.openjdk
-          version: "11"
+          version: "17"
         - name: org.kie.kogito.dynamic.resources
         - name: org.kie.kogito.maven
           version: "3.9.3"

diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.task.console

diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
@@ -53,7 +53,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.infinispan

diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
@@ -35,7 +35,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.postgresql

diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.redis

diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
@@ -38,7 +38,7 @@ modules:
     - name: org.kie.kogito.system.user
     - name: org.kie.kogito.logging
     - name: org.kie.kogito.openjdk.headless
-      version: "11"
+      version: "17"
     - name: org.kie.kogito.dynamic.resources
     - name: org.kie.kogito.launch.scripts
     - name: org.kie.kogito.trusty.ui

diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options
@@ -139,7 +139,7 @@ gc_config() {
     local timeRatio=${GC_TIME_RATIO:-4}
     local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90}
     local maxMetaspaceSize
-    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelOldGC}"
+    local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelGC}"
     # for compat reasons we don't set a default value for metaspaceSize
     local metaspaceSize
 

diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml
@@ -55,5 +55,5 @@ envs:
     description: The maximum metaspace size.
     example: "100"
   - name: GC_CONTAINER_OPTIONS
-    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`.
+    description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelGC`.
     example: -XX:+UseG1GC
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats
@@ -22,7 +22,7 @@ teardown() {
     source ${KOGITO_HOME}/launch/jvm-settings.sh
 
     echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }
 
 @test "run jvm-settings with custom conf" {
@@ -34,5 +34,5 @@ teardown() {
     source ${KOGITO_HOME}/launch/jvm-settings.sh
 
     echo "MAVEN_OPTS is: ${MAVEN_OPTS}"
-    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
+    [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]]
 }