move Dali 2.1 to pure "R" builds
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 5882dd4..f3b6726 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -137,6 +137,10 @@
forceOnly="false"
requireModification="false"
name="cleanup-artifacts-B">
+ <modificationset>
+ <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
+ <alwaysbuild />
+ </modificationset>
<schedule
interval="${time.twentyFourHours}">
<exec
@@ -144,10 +148,6 @@
command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh">
</exec>
</schedule>
- <modificationset>
- <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <alwaysbuild />
- </modificationset>
<!--
need to prevent, or override, default publishers, especially
since the ant default antpublisher will result in error, if
@@ -156,6 +156,7 @@
<publishers>
</publishers>
</project>
+
<project
forceOnly="true"
requireModification="false"
@@ -164,7 +165,6 @@
<!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
<alwaysbuild />
</modificationset>
-
<schedule
interval="${time.veryLongTime}">
<ant>
@@ -220,7 +220,7 @@
value="true" />
<property
name="normalizeJarFiles"
- value="false" />
+ value="false" />
</ant>
</schedule>
@@ -256,8 +256,7 @@
value="true" />
<property
name="normalizeJarFiles"
- value="false" />
-
+ value="false" />
</ant>
</schedule>
</project>
@@ -281,7 +280,7 @@
value="R2.1" />
<property
name="buildId"
- value="2.1RC2" />
+ value="2.1" />
<property
name="mapVersionTag"
value="HEAD" />
@@ -608,8 +607,6 @@
<property
name="normalizeJarFiles"
value="false" />
-
-
</ant>
</schedule>
</project>