summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2021-02-16 18:08:28 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-16 18:08:28 +0000
commit7063f388315ff347f3abb93f0f9afd885123a20b (patch)
tree4221ab51e320dded4471002c5247fa952c201581
parent7ee64b51034dce0d073a649a10c3d4e1cefbe2dc (diff)
parent3ee92bacb6310392aebc9ad86eb0cddefc4130a8 (diff)
Merge "[AAI] Update babel model loader schema service to java 11"
-rw-r--r--jjb/aai/aai-babel.yaml6
-rw-r--r--jjb/aai/aai-model-loader.yaml8
-rw-r--r--jjb/aai/aai-schema-service.yaml3
3 files changed, 16 insertions, 1 deletions
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index c886251b8..62e7c9378 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -32,6 +32,8 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-builder-4c-4g
+ java-version: openjdk11
+ mvn-version: 'mvn36'
- project:
name: aai-babel-sonar
@@ -50,6 +52,8 @@
mvn-settings: 'aai-babel-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
+ mvn-version: 'mvn36'
- project:
name: aai-babel-clm
@@ -63,6 +67,8 @@
branch: 'master'
mvn-settings: 'aai-babel-settings'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
+ mvn-version: 'mvn36'
- project:
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index d89a19cd5..52361e5b0 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -32,6 +32,8 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1804-builder-4c-4g
+ mvn-version: 'mvn36'
+ java-version: openjdk11
- project:
name: aai-model-loader-sonar
@@ -50,6 +52,8 @@
mvn-settings: 'aai-model-loader-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-version: 'mvn36'
+ java-version: openjdk11
- project:
name: aai-model-loader-clm
@@ -62,6 +66,8 @@
- 'master':
branch: 'master'
mvn-settings: 'aai-model-loader-settings'
+ mvn-version: 'mvn36'
+ java-version: openjdk11
- project:
name: aai-model-loader-info
@@ -83,3 +89,5 @@
mvn-clean-install: true
project: 'aai/model-loader'
branch: master
+ java-version: openjdk11
+ mvn-version: 'mvn36'
diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 49ec802c3..bce2867d0 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -62,11 +62,12 @@
nexus-iq-namespace: 'onap-'
project: 'aai/schema-service'
project-name: 'aai-schema-service'
+ java-version: openjdk11
stream:
- 'master':
branch: 'master'
mvn-settings: 'aai-schema-service-settings'
- mvn-version: 'mvn35'
+ mvn-version: 'mvn36'
- project:
name: aai-schema-service-info