Merge "Fix Java related issues"

[releng/builder.git] / jjb / netconf / netconf.cfg

diff --git a/jjb/netconf/netconf.cfg b/jjb/netconf/netconf.cfg
index 39d998ae286330870da4f9840f2ffc1c2ade64b2..68cb909719735ad55e61a4bddd4465b85fce67ec 100644 (file)
--- a/jjb/netconf/netconf.cfg
+++ b/jjb/netconf/netconf.cfg
@@ -1,9 +1,10 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
-- beryllium:
+- boron:
     branch: master
+    jdks: openjdk8
+    autorelease: true
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
     autorelease: true
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests