Merge "List dependency graph in validate-autorelease"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 2b4c0c381a9e0ebad1d11dd6a3cc167d60891bcb..5da35e7d01438e2bbc9e2c17b9a8668f8f0b70f9 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,19 +1,19 @@
 ---
 - project:
-    name: mdsal-carbon
+    name: mdsal-oxygen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-maven-verify-dependencies
 
-    stream: carbon
+    stream: oxygen
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,20 +27,18 @@
     archive-artifacts: ''
 
 - project:
-    name: mdsal-boron
+    name: mdsal-nitrogen
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,22 +52,20 @@
     archive-artifacts: ''
 
 - project:
-    name: mdsal-beryllium
+    name: mdsal-carbon
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: