X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=037b830f30bfb85e93c5da8da7a6dfc13c539813;hb=732e3230561000688d8e569fa2a54bba74324ca1;hp=ac491283a2878dd5448bb408636276f5100fcf60;hpb=b094d327723da8b0c7d08f1698ef9fa086b7a3f9;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ac491283a..037b830f3 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -14,38 +14,12 @@
           sign-artifacts: true
           cron: ""
 
-    java-version: openjdk11
-    mvn-version: mvn35
-
-- job-group:
-    name: odl-maven-jobs
-
-    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}":
-          build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
-          disable-job: "{disable-job}"
-
-      - gerrit-maven-stage:
+      - 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: openjdk11
+    mvn-version: mvn38
 
 - job-group:
     name: odl-maven-verify-jobs
@@ -55,7 +29,7 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
-    mvn-version: mvn35
+    mvn-version: mvn38
 
 - job-template:
     name: "{project-name}-integration-{stream}"