From 09c75679f5e0aaba91b247ae7b98477d5c17c805 Mon Sep 17 00:00:00 2001
From: "david.mcweeney" <david.mcweeney@est.tech>
Date: Thu, 1 Apr 2021 13:29:33 +0100
Subject: [PATCH] [DMAAP-MR] - Uplift jjb to Java 11 for Dmaap msgrtr and
 messageService

Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
Change-Id: I42352f6775f151a69c210848a6f708eadeb6f5b3
Issue-ID: DMAAP-1563
---
 jjb/dmaap/dmaap-messagerouter-messageservice.yaml | 34 ++++++++++++++++++++---
 jjb/dmaap/dmaap-messagerouter-msgrtr.yaml         | 26 ++++++++++++++---
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 64e940591..a6a2d8313 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -15,12 +15,8 @@
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
     project: 'dmaap/messagerouter/messageservice'
     stream:
-      - 'master':
-          branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
       - 'guilin':
@@ -30,6 +26,36 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
+    crom: ''
+
+- project:
+    name: dmaap-messagerouter-messageservice-java-11
+    project-name: 'dmaap-messagerouter-messageservice-java-11'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'dmaap/messagerouter/messageservice'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
 
 - project:
     name: dmaap-messagerouter-messageservice-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 1772783ec..9ff9e9b86 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -9,13 +9,9 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
 
     project: 'dmaap/messagerouter/msgrtr'
     stream:
-      - 'master':
-          branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
       - 'guilin':
@@ -23,6 +19,28 @@
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
     archive-artifacts: ''
+    cron: ''
+
+- project:
+    name: dmaap-messagerouter-msgrtr-java-11
+    project-name: 'dmaap-messagerouter-msgrtr-java-11'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
+    project: 'dmaap/messagerouter/msgrtr'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    java-version: openjdk11
+    files: '**'
+    archive-artifacts: ''
 
 - project:
     name: dmaap-messagerouter-msgrtr-sonar
-- 
2.16.6