commit dc680de42dd485b07b38aeb0a26ee2d3dd3d5828
author Dan Timoney <dtimoney@att.com> Wed Feb 08 12:17:30 2023 -0500
committer Dan Timoney <dtimoney@att.com> Fri Feb 24 21:46:44 2023 +0000
tree df98b0e2c503505f27b0a174fba56a1d9b050491
parent c990b253d5d437ff97cc1440c7ce82f57a1b174e

Fix Java compile config for ccsdk and sdnc

Update to continue to use Java 11 in Kohn release builds for CCSDK, SDNC.
Remove builds for Jakarta branches.
Update java 17 builds to remove obsolete command line option MaxPermSize

Issue-ID: CCSDK-3813
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I1d917a0ff9dd5baef0710384f198b55bd475f4bd

jjb/sdnc/sdnc-apps.yaml

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 9e9eb53..0293a9e 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -37,11 +37,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
@@ -74,7 +73,7 @@
     mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     maven-version: "mvn38"
 
 #

jjb/sdnc/sdnc-csit.yaml

diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index c427e82..582fee0 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
           branch: 'kohn'
     mvn-settings: 'sdnc-oam-settings'

jjb/sdnc/sdnc-northbound.yaml

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index af39912..f9b715e 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -18,11 +18,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-northbound-settings'
 
@@ -55,7 +54,7 @@
     mvn-goals: 'clean install'
     java-version: openjdk17
     mvn-version: "mvn38"
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: sdnc-northbound-clm

jjb/sdnc/sdnc-oam.yaml

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 9961802..c61b7ac 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -27,11 +27,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: 'sdnc-oam-settings'
     files: '**'