Merge "Revert "Remove unused maven merge job""

[releng/builder.git] / jjb / atrium / atrium.yaml

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 7a9dad82bd555df5753aaff8492340c7e464c295..24207d711819c04c03d664b5f503d205567e4444 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -10,13 +10,7 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
@@ -36,13 +30,7 @@
     project: 'atrium'
     project-name: 'atrium'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
@@ -63,13 +51,7 @@
     project-name: 'atrium'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
@@ -86,5 +68,4 @@
     project-name: 'atrium'
     branch: 'master'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'