From 21d1d65df010e4d383a416d7eb1ac0bd66a67513 Mon Sep 17 00:00:00 2001
From: "david.mcweeney" <david.mcweeney@est.tech>
Date: Thu, 20 Jul 2023 16:05:45 +0100
Subject: [PATCH] [DMAAP-DR] Upgrade DataRouter jjbs to java 17

Change-Id: If9e12e7c55845a02fffa33683d0a4147b5f9a7ee
Issue-ID: DMAAP-1895
Signed-off-by: david.mcweeney <david.mcweeney@est.tech>
---
 jjb/dmaap/dmaap-datarouter.yaml | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 5feae3ca2..b18b85257 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dmaap-datarouter-java
+    name: dmaap-datarouter-java-11
     project-name: "dmaap-datarouter"
     jobs:
       - "{project-name}-{stream}-verify-java"
@@ -16,8 +16,6 @@
           build-node: centos7-docker-2c-1g
     project: "dmaap/datarouter"
     stream:
-      - "master":
-          branch: "master"
       - "london":
           branch: "london"
     mvn-settings: "dmaap-datarouter-settings"
@@ -25,6 +23,30 @@
     archive-artifacts: ""
     java-version: openjdk11
 
+- project:
+    name: dmaap-datarouter-java-17
+    project-name: "dmaap-datarouter"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean package -P docker docker:build docker:push"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dmaap/datarouter"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-datarouter-settings"
+    files: "**"
+    archive-artifacts: ""
+    java-version: openjdk17
+
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
@@ -58,7 +80,7 @@
     mvn-settings: "dmaap-datarouter-settings"
     mvn-goals: "clean install"
     mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     name: dmaap-datarouter-clm
@@ -69,7 +91,7 @@
     project-name: "dmaap-datarouter"
     branch: "master"
     mvn-settings: "dmaap-datarouter-settings"
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     name: dmaap-datarouter-info
-- 
2.16.6