X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=3ee731f1886ea494194ef70077e7b919779a1765;hb=9560033e9f4fb7edb782d040c906b5d4163a62f1;hp=832db0cc39a7ba0bca9e3c64e5bcb649532576c5;hpb=df2294ec116337450d476d84d11cb2cdbbc79613;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 832db0cc3..3ee731f18 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -19,43 +19,29 @@
           cron: ""
 
     java-version: openjdk11
-    mvn-version: mvn35
+    mvn-version: mvn38
 
 - job-group:
-    name: odl-maven-jobs
+    name: odl-maven-jobs-jdk17
 
     jobs:
       - gerrit-maven-clm:
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
 
-      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
-      # - gerrit-maven-merge:
-      #     post_build_trigger:
-      #       - project:
-      #           - 'distribution-merge-{stream}'
-      #         condition: SUCCESS
-      #         trigger-with-no-params: true
-      - "{project-name}-merge-{stream}":
+      - gerrit-maven-merge:
           build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
-          disable-job: "{disable-job}"
 
       - gerrit-maven-stage:
           sign-artifacts: true
-          mvn-central: false
-          ossrh-profile-id: 6386ebbbf3a563
           cron: ""
 
       - gerrit-maven-mri-stage:
           sign-artifacts: true
-          mvn-central: false
-          ossrh-profile-id: 6386ebbbf3a563
           cron: ""
 
-    java-version: openjdk8
-    mvn-version: mvn35
-    disable-job: "{disable-job}"
+    java-version: openjdk17
+    mvn-version: mvn38
 
 - job-group:
     name: odl-maven-verify-jobs
@@ -65,7 +51,18 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
-    mvn-version: mvn35
+    mvn-version: mvn38
+
+- job-group:
+    name: odl-maven-verify-jobs-jdk17
+
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
+
+    mvn-version: mvn38
+    java-version: openjdk17
 
 - job-template:
     name: "{project-name}-integration-{stream}"