move to next dev streams
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index f667860..e6ed0a4 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -174,7 +174,7 @@
<project
forceOnly="true"
requireModification="false"
- name="wtpbuildTools-R3.0-T">
+ name="wtpbuildTools-R3.2-T">
<modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
<alwaysbuild/>
@@ -186,8 +186,11 @@
name="buildType"
value="T"/>
<property
+ name="buildId"
+ value="3.2T"/>
+ <property
name="buildBranch"
- value="R3.0"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -274,7 +277,7 @@
<project
forceOnly="true"
requireModification="true"
- name="servadapt-R3.1-I">
+ name="servadapt-R3.2-I">
<modificationset
quietperiod="120">
<cvs
@@ -288,8 +291,11 @@
name="buildType"
value="I"/>
<property
+ name="buildId"
+ value="3.2I"/>
+ <property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="david_williams_tempBranch11"/>
@@ -303,7 +309,7 @@
<project
forceOnly="true"
requireModification="true"
- name="wstfproj-R3.1-I">
+ name="wstfproj-R3.2-I">
<modificationset
quietperiod="120">
<cvs
@@ -317,8 +323,11 @@
name="buildType"
value="I"/>
<property
+ name="buildId"
+ value="3.2I"/>
+ <property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -331,7 +340,7 @@
<project
forceOnly="true"
requireModification="true"
- name="wtpcap-R3.1-S">
+ name="wtpcap-R3.2-I">
<modificationset
quietperiod="120">
<cvs
@@ -343,10 +352,13 @@
<ant>
<property
name="buildType"
- value="S"/>
+ value="I"/>
+ <property
+ name="buildId"
+ value="3.2I"/>
<property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -359,7 +371,7 @@
<project
forceOnly="true"
requireModification="true"
- name="wtpjee-R3.1-S">
+ name="wtpjee-R3.2-I">
<modificationset
quietperiod="120">
<cvs
@@ -370,11 +382,14 @@
interval="${time.oneHour}">
<ant>
<property
+ name="buildId"
+ value="3.2I"/>
+ <property
name="buildType"
- value="S"/>
+ value="I"/>
<property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -581,7 +596,73 @@
<project
forceOnly="false"
requireModification="true"
- name="wtp-R3.1-S">
+ name="wtp-R3.1-M">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGCOMMON}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGEJBTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGJEETOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGSERVERTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGSOURCEEDITING}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGWEBSERVICES}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_1_maintenance"
+ module="${env.RELENGJSF}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R2_2_maintenance"
+ module="${env.RELENGDALI}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ </modificationset>
+ <schedule
+ interval="${time.oneHour}">
+ <ant>
+ <property
+ name="buildType"
+ value="M"/>
+ <property
+ name="buildBranch"
+ value="R3.1"/>
+ <property
+ name="buildId"
+ value="3.1M"/>
+ <property
+ name="mapVersionTag"
+ value="R3_1_maintenance"/>
+ <property
+ name="releng.dali-mapVersionTag"
+ value="R2_2_maintenance"/>
+ <property
+ name="releng.jsf-mapVersionTag"
+ value="R3_1_maintenance"/>
+ <property
+ name="build.distribution"
+ value="wtp"/>
+ </ant>
+ </schedule>
+ </project>
+ <project
+ forceOnly="false"
+ requireModification="true"
+ name="wtp-R3.2-S">
<modificationset
quietperiod="120">
<cvs
@@ -618,10 +699,10 @@
value="S"/>
<property
name="buildId"
- value="3.1RC3"/>
+ value="3.2"/>
<property
name="buildBranch"
- value="R3.1"/>
+ value="R3.1M1"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -640,7 +721,7 @@
<project
forceOnly="false"
requireModification="true"
- name="wtp-R3.1-I">
+ name="wtp-R3.2-I">
<modificationset
quietperiod="120">
<cvs
@@ -677,10 +758,10 @@
value="I"/>
<property
name="buildId"
- value="3.1"/>
+ value="3.2I"/>
<property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
<property
name="mapVersionTag"
value="HEAD"/>
@@ -705,7 +786,7 @@
<project
forceOnly="true"
requireModification="true"
- name="wtp-R3.1-N">
+ name="wtp-R3.2-N">
<modificationset>
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
<alwaysbuild/>
@@ -720,7 +801,10 @@
<!-- in this context, buildBranch is simply a label -->
<property
name="buildBranch"
- value="R3.1"/>
+ value="R3.2"/>
+ <property
+ name="buildId"
+ value="3.2N"/>
<property
name="mapVersionTag"
value="HEAD"/>