X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=1a65cab6e39062e4d0baf33bd2e3665198921dbc;hb=7e9491bb72105fa920e96e92458f45d3ec740a6f;hp=ed88f5101aafd1b5b8a7209e74fb44fe8f66d865;hpb=fee730e378c29833969b49e210a26ed5414279eb;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ed88f5101..1a65cab6e 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -21,6 +21,8 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -76,7 +78,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           goals: |
               {mvn-goals}
               {opendaylight-infra-mvn-opts}
@@ -108,7 +110,9 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
-    mvn-version: mvn33
+    cron: 'H H * * 0'
+    mvn-opts: ''
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################
@@ -149,11 +153,13 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     prebuilders:
       - jacoco-nojava-workaround
@@ -191,6 +197,3 @@
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS