Merge "Set docker build to use Java 11"

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 6236f65..68c84c9 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/aai-common'

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 62c32c9..65a1731 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -16,6 +16,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 020bd1b..aa56425 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 2b00eeb..45c454d 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 08b31bd..000e409 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/logging-service'

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 6693521..fd65679 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -16,6 +16,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 40477b1..8787173 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -18,6 +18,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 78442e2..8b80d6c 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index b3c6767..23db9c4 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -15,6 +15,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index cd5ad1f..a89af36 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -16,6 +16,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 036cb99..aa3aa8d 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -9,6 +9,7 @@
       - gerrit-maven-stage:
           build-node: ubuntu1804-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'aai/sparky-fe'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 0542f98..dce710e 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -18,6 +18,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 2044e81..29b5e12 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -19,6 +19,8 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
+
       - gerrit-maven-docker-stage:
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -37,7 +39,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -65,7 +67,7 @@
     project-name: 'ccsdk-apps'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -85,7 +87,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     build-node: ubuntu1804-builder-4c-4g
 
@@ -121,7 +123,7 @@
     jobs:
       - gerrit-whitesource-scan
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 88ccf2e..6b2b982 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -14,6 +14,7 @@
           mvn-params: '-Dmaven.test.skip=true'
           mvn-opts: '-Ddocker.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -32,7 +33,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     files: '**'
     archive-artifacts: ''
@@ -57,7 +58,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-opts: '-Ddocker.skip=true'
     build-node: centos7-builder-4c-4g
@@ -85,7 +86,7 @@
     project-name: 'ccsdk-oran'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index f0870f6..426eea6 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -13,6 +13,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -31,7 +32,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -70,7 +71,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     java-version: openjdk8
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -98,7 +99,7 @@
     project-name: 'ccsdk-cds'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -118,7 +119,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     build-node: centos7-builder-4c-4g
 
@@ -137,7 +138,7 @@
     jobs:
       - gerrit-whitesource-scan
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 265a696..fac1cbe 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -14,6 +14,7 @@
           mvn-params: '-Dmaven.test.skip=true'
           maven-versions-plugin: true
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -33,7 +34,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -76,7 +77,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     build-node: centos7-docker-8c-8g
 
@@ -98,7 +99,7 @@
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-distribution-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 27bddeb..1d3f6cc 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -13,6 +13,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -25,7 +26,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -54,7 +55,7 @@
     project-name: 'ccsdk-features'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
@@ -74,7 +75,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: centos7-builder-4c-4g
@@ -95,7 +96,7 @@
     jobs:
       - gerrit-whitesource-scan
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index fb69552..14aaa4f 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -13,6 +13,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -38,7 +39,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -65,7 +66,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     build-node: centos7-builder-4c-4g
 
@@ -84,7 +85,7 @@
     jobs:
       - gerrit-whitesource-scan
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index f0ac46b..36165e7 100644 (file)
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -13,6 +13,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -25,7 +26,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -53,7 +54,7 @@
     project-name: 'ccsdk-sli'
     branch: 'master'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -73,7 +74,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     build-node: centos7-builder-4c-4g
 
@@ -92,7 +93,7 @@
     jobs:
       - gerrit-whitesource-scan
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-sli-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index f604966..d242d46 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -43,6 +43,7 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index efa64ec..7327717 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,6 +22,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -41,7 +42,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -51,7 +52,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
+    maven-version: "mvn38"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -71,11 +72,11 @@
     project-name: 'sdnc-apps'
     branch: 'master'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
+    maven-version: "mvn38"
 
 #
 #- project:
@@ -111,7 +112,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
 - project:

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 0da9c8c..6c834a0 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -10,6 +10,7 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -22,7 +23,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: "mvn36"
+    mvn-version: "mvn38"
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -32,7 +33,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn38"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -54,7 +55,7 @@
     mvn-settings: 'sdnc-northbound-settings'
     mvn-goals: 'clean install'
     java-version: openjdk11
-    mvn-version: "mvn36"
+    mvn-version: "mvn38"
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
@@ -74,7 +75,7 @@
           branch: 'jakarta'
     mvn-settings: 'sdnc-northbound-settings'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
 
 - project:
     name: sdnc-northbound-info

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index f38b1de..e09e3ec 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -13,6 +13,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -31,7 +32,7 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
-    mvn-version: "mvn36"
+    mvn-version: "mvn38"
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -75,7 +76,7 @@
           branch: 'jakarta'
     mvn-settings: 'sdnc-oam-settings'
     java-version: openjdk11
-    mvn-version: 'mvn36'
+    mvn-version: 'mvn38'
 
 - project:
     name: sdnc-oam-info