summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-08-31 13:25:17 -0400
committerDan Timoney <dtimoney@att.com>2020-08-31 13:25:17 -0400
commitaac26769210c0d2e8e02a759c915a373a35a6c52 (patch)
tree295aaa5736f3677e2d0adc1d1099cc3270e1b9bc
parent324431ef0b0b96040cc8df3539b68a4d01bd0b32 (diff)
Update CCSDK and SDNC to use mvn 3.6 and openjdk 11
Update CCSDK and SDNC jobs to use Java 11 compiler with maven version 3.6 Change-Id: I5698d52e8c9d731003188ded9dacc267a02e2054 Issue-ID: SDNC-1242 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rw-r--r--jjb/ccsdk/apps.yaml4
-rw-r--r--jjb/ccsdk/distribution.yaml3
-rw-r--r--jjb/ccsdk/features.yaml4
-rw-r--r--jjb/ccsdk/parent.yaml3
-rw-r--r--jjb/ccsdk/sli-adaptors.yaml4
-rw-r--r--jjb/ccsdk/sli-core.yaml4
-rw-r--r--jjb/ccsdk/sli-northbound.yaml4
-rw-r--r--jjb/ccsdk/sli-plugins.yaml4
-rw-r--r--jjb/ccsdk/utils.yaml3
-rw-r--r--jjb/sdnc/sdnc-apps.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml2
-rw-r--r--jjb/sdnc/sdnc-oam.yaml2
12 files changed, 39 insertions, 0 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index eaa95f42e..cd7cb95f0 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -31,6 +31,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -58,6 +59,7 @@
project: 'ccsdk/apps'
project-name: 'ccsdk-apps'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
mvn-goals: 'clean install'
@@ -75,6 +77,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
build-node: ubuntu1804-builder-4c-4g
@@ -110,6 +113,7 @@
project-name: ccsdk-apps
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-apps-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index ae461591f..5e7fe59fd 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -28,6 +28,7 @@
branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
files: '**'
@@ -68,6 +69,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
build-node: ubuntu1804-docker-8c-8g
@@ -89,6 +91,7 @@
jobs:
- gerrit-whitesource-scan:
java-opts: '-Xmx2048m'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-distribution-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index f6606ab1a..97e0f6b27 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -19,6 +19,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -47,6 +48,7 @@
project: 'ccsdk/features'
project-name: 'ccsdk-features'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
mvn-goals: 'clean install'
@@ -64,6 +66,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
@@ -84,6 +87,7 @@
project-name: ccsdk-features
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-features-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 06166e014..3fed58c9f 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -21,6 +21,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -43,6 +44,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
build-node: ubuntu1804-builder-4c-4g
@@ -61,6 +63,7 @@
project-name: ccsdk-parent
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-parent-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 5d03a380c..5b4d036d1 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -22,6 +22,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
project: 'ccsdk/sli/adaptors'
project-name: 'ccsdk-sli-adaptors'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
build-node: ubuntu1804-builder-4c-4g
@@ -85,6 +88,7 @@
project-name: ccsdk-sli-adaptors
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-adaptors-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index ffe9ca15f..45c20a22e 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -22,6 +22,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
project: 'ccsdk/sli/core'
project-name: 'ccsdk-sli-core'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
build-node: ubuntu1804-builder-4c-4g
@@ -84,6 +87,7 @@
project-name: ccsdk-sli-core
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-core-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index bcc011d15..1ffb3c938 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -22,6 +22,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
project: 'ccsdk/sli/northbound'
project-name: 'ccsdk-sli-northbound'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
build-node: ubuntu1804-builder-4c-4g
@@ -84,6 +87,7 @@
project-name: ccsdk-sli-northbound
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-northbound-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index 4e028f310..b1d55832d 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -22,6 +22,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -49,6 +50,7 @@
project: 'ccsdk/sli/plugins'
project-name: 'ccsdk-sli-plugins'
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
mvn-goals: 'clean install'
@@ -66,6 +68,7 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
@@ -83,6 +86,7 @@
project-name: ccsdk-sli-plugins
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-sli-plugins-settings'
wss-product-name: ccsdk
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index e2f8a7f2f..52ab57ddc 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -17,6 +17,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-utils-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -39,6 +40,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-utils-settings'
@@ -56,6 +58,7 @@
project-name: ccsdk-utils
jobs:
- gerrit-whitesource-scan
+ java-version: openjdk11
mvn-version: 'mvn36'
mvn-settings: 'ccsdk-utils-settings'
wss-product-name: ccsdk
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 0b04a27f7..0ef436303 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -32,6 +32,8 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
+ mvn-version : "mvn36"
mvn-settings: 'sdnc-apps-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index ee7c79dd1..a35908a8a 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,6 +19,8 @@
branch: 'master'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
+ mvn-version: "mvn36"
mvn-settings: 'sdnc-northbound-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 428251ac8..fb8b054d5 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -30,6 +30,8 @@
branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
+ java-version: openjdk11
+ mvn-version: "mvn36"
mvn-settings: 'sdnc-oam-settings'
maven-version: "mvn35"
files: '**'