From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Thu, 26 Oct 2023 10:56:50 +0000 (+0000)
Subject: Merge "Switch DMI Plugin CSIT to Java 17"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bbb9d12ace55d2777e79c602d538f576086aa0ff;hp=5088c150cbfe7c3d57e974e932e9ac70ff333da0;p=ci-management.git

Merge "Switch DMI Plugin CSIT to Java 17"
---

diff --git a/global-jjb b/global-jjb
index 83db02b56..76aaece53 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 83db02b5609d9347b216ae1e9419ec0bfcb86397
+Subproject commit 76aaece53118efec0bdcd003efb31f03d6286c92
diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index a86c7493e..0e0995623 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -7,7 +7,7 @@
 
 - project:
     name: cps-tbdmt-clm
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -21,7 +21,7 @@
 
 - project:
     name: cps-tbdmt
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     project-name: cps-cps-tbdmt
@@ -54,7 +54,7 @@
 
 - project:
     name: cps-tbdmt-sonar
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -70,11 +70,10 @@
     branch: "master"
     mvn-settings: "cps-cps-tbdmt-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: cps-tbdmt-sonar-verify
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -90,4 +89,3 @@
     branch: "master"
     mvn-settings: "cps-cps-tbdmt-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"