This commit was manufactured by cvs2svn to create tag 'R_3_3_2_e_3_5'.
Sprout from master 2010-01-26 16:02:46 UTC spingel 'NEW - bug 221939: [releng] manage branches'
Cherrypick from e_3_6_m_3_3_x 2010-02-23 00:39:54 UTC spingel 'bug 303565: specify stricter version constraints for JIRA plug-ins':
org.eclipse.mylyn.releng/bin/sign-update-site.sh
org.eclipse.mylyn.releng/config/extras-site.xml
org.eclipse.mylyn.releng/config/incubator-site.xml
org.eclipse.mylyn.releng/config/orbitHelper.xml
org.eclipse.mylyn.releng/maps/mylyn_all.map
org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
org.eclipse.mylyn.releng/scripts/defaults-all.properties
org.eclipse.mylyn.releng/scripts/functions.xml
org.eclipse.mylyn.releng/scripts/test-fixture.xsl
org.eclipse.mylyn.releng/scripts/test-suite.xsl
org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllConnectorTests.java
org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java
org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.javadiff --git a/org.eclipse.mylyn.releng/bin/sign-update-site.sh b/org.eclipse.mylyn.releng/bin/sign-update-site.sh
index f93a8cc..57e185c 100644
--- a/org.eclipse.mylyn.releng/bin/sign-update-site.sh
+++ b/org.eclipse.mylyn.releng/bin/sign-update-site.sh
@@ -91,7 +91,7 @@
unzip extras
unzip incubator
- echo Creating archive for singing, output is logged to $DST/sign.log
+ echo Creating archive for signing, output is logged to $DST/sign.log
/bin/rm $DST/mylyn.zip || true
cd $TMP
/usr/bin/find -name "org.eclipse*mylyn*.jar" | zip $DST/mylyn.zip -@ > $DST/sign.log
@@ -121,14 +121,15 @@
echo Unzipping signed files, output is logged to $DST/sign.log
/usr/bin/unzip -o -d $TMP $OUT/mylyn.zip >> $DST/sign.log
-rezip e3.4
-rezip extras
-rezip incubator
pack e3.4 "Mylyn for Eclipse 3.4, 3.5 and 3.6"
pack extras "Mylyn Extras"
pack incubator "Mylyn Incubator"
+rezip e3.4
+rezip extras
+rezip incubator
+
# republish
/bin/mv $SRC $SRC-DELETE
diff --git a/org.eclipse.mylyn.releng/config/extras-site.xml b/org.eclipse.mylyn.releng/config/extras-site.xml
index 98ccd84..91815a0 100644
--- a/org.eclipse.mylyn.releng/config/extras-site.xml
+++ b/org.eclipse.mylyn.releng/config/extras-site.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description url="http://download.eclipse.org/tools/mylyn/update/weekly/extras">
- Mylyn Extras for Eclipse 3.3 and 3.4
+ Mylyn Extras
</description>
- <feature url="features/org.eclipse.mylyn.jira_feature_@core@.jar" id="org.eclipse.mylyn.jira_feature" version="@core@">
+ <feature url="features/org.eclipse.mylyn.jira_feature_3.3.2.v20100222-0100-e3x.jar" id="org.eclipse.mylyn.jira_feature" version="3.3.2.v20100222-0100-e3x">
<category name="IntegrationExtras"/>
</feature>
<feature url="features/org.eclipse.mylyn.trac_feature_@core@.jar" id="org.eclipse.mylyn.trac_feature" version="@core@">
diff --git a/org.eclipse.mylyn.releng/config/incubator-site.xml b/org.eclipse.mylyn.releng/config/incubator-site.xml
index 046470d..eb4c0f0 100644
--- a/org.eclipse.mylyn.releng/config/incubator-site.xml
+++ b/org.eclipse.mylyn.releng/config/incubator-site.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description url="http://download.eclipse.org/tools/mylyn/update/weekly/incubator">
- Mylyn Incubator Features
+ Mylyn Incubator
</description>
<feature url="features/org.eclipse.mylyn.sandbox.ui_feature_@core@.jar" id="org.eclipse.mylyn.sandbox.ui_feature" version="@core@">
<category name="Incubator"/>
diff --git a/org.eclipse.mylyn.releng/config/orbitHelper.xml b/org.eclipse.mylyn.releng/config/orbitHelper.xml
index 7854671..e26b2ba 100644
--- a/org.eclipse.mylyn.releng/config/orbitHelper.xml
+++ b/org.eclipse.mylyn.releng/config/orbitHelper.xml
@@ -59,7 +59,6 @@
<fileset dir="${buildDirectory}/plugins" id="org.apache.axis">
<include name="javax.activation*.jar"/>
<include name="javax.mail*.jar"/>
- <include name="javax.servlet*.jar"/>
<include name="javax.wsdl*.jar"/>
<include name="javax.xml.rpc*.jar"/>
<include name="javax.xml.soap*.jar"/>
@@ -67,6 +66,10 @@
<include name="org.apache.commons.discovery*.jar"/>
<include name="org.apache.commons.logging*.jar"/>
</fileset>
+ <!-- bug 297912: copy target specific version of javax.servlet -->
+ <fileset dir="${baseLocation}/plugins" id="javax.servlet">
+ <include name="javax.servlet_*.jar"/>
+ </fileset>
<!-- xml-rpc -->
<fileset dir="${buildDirectory}/plugins" id="org.apache.xmlrpc">
@@ -87,26 +90,29 @@
</fileset>
<mkdir dir="${buildDirectory}/standardUpdateSite/plugins"/>
- <copy todir="${buildDirectory}/standardUpdateSite/plugins">
+ <copy todir="${buildDirectory}/standardUpdateSite/plugins" verbose="true">
<fileset refid="org.apache.commons.httpclient" />
<fileset refid="org.jdom" />
</copy>
<mkdir dir="${buildDirectory}/extrasUpdateSite/plugins"/>
- <copy todir="${buildDirectory}/extrasUpdateSite/plugins">
+ <copy todir="${buildDirectory}/extrasUpdateSite/plugins" verbose="true">
<fileset refid="org.apache.axis" />
+ <fileset refid="javax.servlet" />
<fileset refid="org.apache.xmlrpc" />
</copy>
<mkdir dir="${buildDirectory}/incubatorUpdateSite/plugins"/>
- <copy todir="${buildDirectory}/incubatorUpdateSite/plugins">
+ <copy todir="${buildDirectory}/incubatorUpdateSite/plugins" verbose="true">
<fileset refid="org.apache.axis" />
+ <fileset refid="javax.servlet" />
<fileset refid="com.sun.syndication" />
</copy>
<mkdir dir="${buildDirectory}/allUpdateSite/plugins"/>
- <copy todir="${buildDirectory}/allUpdateSite/plugins">
+ <copy todir="${buildDirectory}/allUpdateSite/plugins" verbose="true">
<fileset refid="org.apache.axis" />
+ <fileset refid="javax.servlet" />
<fileset refid="org.apache.commons.httpclient" />
<fileset refid="org.apache.xmlrpc" />
<fileset refid="com.sun.syndication" />
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_all.map b/org.eclipse.mylyn.releng/maps/mylyn_all.map
index 486108b..d6818dc 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_all.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_all.map
@@ -1,113 +1,110 @@
!******* FEATURES ********
-feature@org.eclipse.mylyn_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
-feature@org.eclipse.mylyn.context_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
-feature@org.eclipse.mylyn.bugzilla_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
-feature@org.eclipse.mylyn.java_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
-feature@org.eclipse.mylyn.team_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
-feature@org.eclipse.mylyn.ide_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
-feature@org.eclipse.mylyn.pde_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
-feature@org.eclipse.mylyn.sdk_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
-feature@org.eclipse.mylyn.wikitext_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
-feature@org.eclipse.mylyn.wikitext.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
-feature@org.eclipse.cdt.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt-feature
+feature@org.eclipse.mylyn_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn-feature
+feature@org.eclipse.mylyn.context_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context-feature
+feature@org.eclipse.mylyn.bugzilla_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature
+feature@org.eclipse.mylyn.java_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java-feature
+feature@org.eclipse.mylyn.team_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team-feature
+feature@org.eclipse.mylyn.ide_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide-feature
+feature@org.eclipse.mylyn.pde_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde-feature
+feature@org.eclipse.mylyn.sdk_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.sdk-feature
+feature@org.eclipse.mylyn.wikitext_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext-feature
+feature@org.eclipse.mylyn.wikitext.sdk=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.sdk-feature
+feature@org.eclipse.cdt.mylyn=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt-feature
!******* EXTRAS ***********
-feature@org.eclipse.mylyn.trac_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
-feature@org.eclipse.mylyn.jira_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
-feature@org.eclipse.mylyn.web.tasks_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
-feature@org.eclipse.mylyn.extras_sdk_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
+feature@org.eclipse.mylyn.trac_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac-feature
+feature@org.eclipse.mylyn.jira_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira-feature
+feature@org.eclipse.mylyn.web.tasks_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks-feature
+feature@org.eclipse.mylyn.extras_sdk_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.extras-sdk-feature
!******* INCUBATOR *******
-feature@org.eclipse.mylyn.monitor_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
-feature@org.eclipse.mylyn.xplanner_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
-feature@org.eclipse.mylyn.sandbox.ui_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
-feature@org.eclipse.mylyn.sandbox.dev_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
-feature@org.eclipse.mylyn.trac.wiki_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
-feature@org.eclipse.mylyn.experimental_sdk_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
+feature@org.eclipse.mylyn.monitor_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor-feature
+feature@org.eclipse.mylyn.xplanner_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner-feature
+feature@org.eclipse.mylyn.sandbox.ui_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui-feature
+feature@org.eclipse.mylyn.sandbox.dev_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev-feature
+feature@org.eclipse.mylyn.trac.wiki_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki-feature
+feature@org.eclipse.mylyn.experimental_sdk_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.experimental-sdk-feature
!******* OTHER *******
-feature@org.eclipse.mylyn.test_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
-feature@org.eclipse.mylyn.tests.performance_feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.tests.performance-feature
+feature@org.eclipse.mylyn.test_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.test-feature
+feature@org.eclipse.mylyn.tests.performance_feature=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.tests.performance-feature
!******* PLUGINS **********
-plugin@org.eclipse.mylyn=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
-plugin@org.eclipse.mylyn.bugzilla.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
-plugin@org.eclipse.mylyn.bugzilla.ide=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
-plugin@org.eclipse.mylyn.bugzilla.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
-plugin@org.eclipse.cdt.mylyn.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt.ui
-plugin@org.eclipse.mylyn.commons.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
-plugin@org.eclipse.mylyn.commons.net=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
-plugin@org.eclipse.mylyn.commons.soap=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
-plugin@org.eclipse.mylyn.commons.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
-plugin@org.eclipse.mylyn.compatibility=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
-plugin@org.eclipse.mylyn.context.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
-plugin@org.eclipse.mylyn.context.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
-!plugin@org.eclipse.mylyn.discovery.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-!plugin@org.eclipse.mylyn.discovery.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.help.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
-plugin@org.eclipse.mylyn.ide.ant=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
-plugin@org.eclipse.mylyn.ide.capabilities=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
-plugin@org.eclipse.mylyn.ide.dev=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.ide.dev
-plugin@org.eclipse.mylyn.ide.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
-plugin@org.eclipse.mylyn.java.tasks=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
-plugin@org.eclipse.mylyn.java.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
-plugin@org.eclipse.mylyn.jira.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
-plugin@org.eclipse.mylyn.jira.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
-plugin@org.eclipse.mylyn.monitor.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
-plugin@org.eclipse.mylyn.monitor.reports=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
-plugin@org.eclipse.mylyn.monitor.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
-plugin@org.eclipse.mylyn.monitor.usage=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
-plugin@org.eclipse.mylyn.oslc.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.oslc.core
-plugin@org.eclipse.mylyn.oslc.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.oslc.ui
-plugin@org.eclipse.mylyn.pde.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
-plugin@org.eclipse.mylyn.resources.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
-plugin@org.eclipse.mylyn.sandbox.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
-plugin@org.eclipse.mylyn.sandbox.dev=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
-plugin@org.eclipse.mylyn.tasks.bugs=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
-plugin@org.eclipse.mylyn.tasks.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
-plugin@org.eclipse.mylyn.tasks.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
-plugin@org.eclipse.mylyn.team.cvs=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
-plugin@org.eclipse.mylyn.team.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
-plugin@org.eclipse.mylyn.trac.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
-plugin@org.eclipse.mylyn.trac.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
-plugin@org.eclipse.mylyn.trac.wiki=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
-plugin@org.eclipse.mylyn.web.tasks=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
-plugin@org.eclipse.mylyn.wikitext.confluence.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
-plugin@org.eclipse.mylyn.wikitext.confluence.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
-plugin@org.eclipse.mylyn.wikitext.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
-plugin@org.eclipse.mylyn.wikitext.help.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
-plugin@org.eclipse.mylyn.wikitext.help.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
-plugin@org.eclipse.mylyn.wikitext.mediawiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
-plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
-plugin@org.eclipse.mylyn.wikitext.tasks.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
-plugin@org.eclipse.mylyn.wikitext.textile.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
-plugin@org.eclipse.mylyn.wikitext.textile.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
-plugin@org.eclipse.mylyn.wikitext.tracwiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
-plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
-plugin@org.eclipse.mylyn.wikitext.twiki.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
-plugin@org.eclipse.mylyn.wikitext.twiki.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
-plugin@org.eclipse.mylyn.wikitext.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
-plugin@org.eclipse.mylyn.xplanner.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
-plugin@org.eclipse.mylyn.xplanner.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
+plugin@org.eclipse.mylyn=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn
+plugin@org.eclipse.mylyn.bugzilla.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core
+plugin@org.eclipse.mylyn.bugzilla.ide=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ide
+plugin@org.eclipse.mylyn.bugzilla.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui
+plugin@org.eclipse.cdt.mylyn.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.cdt.ui
+plugin@org.eclipse.mylyn.commons.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.core
+plugin@org.eclipse.mylyn.commons.net=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.net
+plugin@org.eclipse.mylyn.commons.soap=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.soap
+plugin@org.eclipse.mylyn.commons.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.ui
+plugin@org.eclipse.mylyn.compatibility=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.compatibility
+plugin@org.eclipse.mylyn.context.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
+plugin@org.eclipse.mylyn.context.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+!plugin@org.eclipse.mylyn.discovery.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+!plugin@org.eclipse.mylyn.discovery.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.help.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.help.ui
+plugin@org.eclipse.mylyn.ide.ant=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ant
+plugin@org.eclipse.mylyn.ide.capabilities=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.capabilities
+plugin@org.eclipse.mylyn.ide.dev=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.ide.dev
+plugin@org.eclipse.mylyn.ide.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.ui
+plugin@org.eclipse.mylyn.java.tasks=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tasks
+plugin@org.eclipse.mylyn.java.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.ui
+plugin@org.eclipse.mylyn.jira.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.core
+plugin@org.eclipse.mylyn.jira.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.ui
+plugin@org.eclipse.mylyn.monitor.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+plugin@org.eclipse.mylyn.monitor.reports=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.monitor.reports
+plugin@org.eclipse.mylyn.monitor.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+plugin@org.eclipse.mylyn.monitor.usage=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.usage
+plugin@org.eclipse.mylyn.pde.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.pde.ui
+plugin@org.eclipse.mylyn.resources.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+plugin@org.eclipse.mylyn.sandbox.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui
+plugin@org.eclipse.mylyn.sandbox.dev=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev
+plugin@org.eclipse.mylyn.tasks.bugs=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.bugs
+plugin@org.eclipse.mylyn.tasks.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+plugin@org.eclipse.mylyn.tasks.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+plugin@org.eclipse.mylyn.team.cvs=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.cvs
+plugin@org.eclipse.mylyn.team.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.ui
+plugin@org.eclipse.mylyn.trac.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.core
+plugin@org.eclipse.mylyn.trac.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.ui
+plugin@org.eclipse.mylyn.trac.wiki=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.trac.wiki
+plugin@org.eclipse.mylyn.web.tasks=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.web.tasks
+plugin@org.eclipse.mylyn.wikitext.confluence.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.core
+plugin@org.eclipse.mylyn.wikitext.confluence.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.confluence.ui
+plugin@org.eclipse.mylyn.wikitext.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.core
+plugin@org.eclipse.mylyn.wikitext.help.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.ui
+plugin@org.eclipse.mylyn.wikitext.help.sdk=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.help.sdk
+plugin@org.eclipse.mylyn.wikitext.mediawiki.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.core
+plugin@org.eclipse.mylyn.wikitext.mediawiki.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.mediawiki.ui
+plugin@org.eclipse.mylyn.wikitext.tasks.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tasks.ui
+plugin@org.eclipse.mylyn.wikitext.textile.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.core
+plugin@org.eclipse.mylyn.wikitext.textile.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.textile.ui
+plugin@org.eclipse.mylyn.wikitext.tracwiki.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.core
+plugin@org.eclipse.mylyn.wikitext.tracwiki.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tracwiki.ui
+plugin@org.eclipse.mylyn.wikitext.twiki.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.core
+plugin@org.eclipse.mylyn.wikitext.twiki.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.twiki.ui
+plugin@org.eclipse.mylyn.wikitext.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.ui
+plugin@org.eclipse.mylyn.xplanner.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.core
+plugin@org.eclipse.mylyn.xplanner.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.ui
-plugin@org.eclipse.mylyn.bugzilla.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
-plugin@org.eclipse.mylyn.commons.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
-plugin@org.eclipse.mylyn.context.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
-!plugin@org.eclipse.mylyn.discovery.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
-plugin@org.eclipse.mylyn.ide.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
-plugin@org.eclipse.mylyn.java.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
-plugin@org.eclipse.mylyn.jira.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
-plugin@org.eclipse.mylyn.monitor.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
-plugin@org.eclipse.mylyn.oslc.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.oslc.tests
-plugin@org.eclipse.mylyn.resources.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
-plugin@org.eclipse.mylyn.sandbox.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
-plugin@org.eclipse.mylyn.tasks.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
-plugin@org.eclipse.mylyn.team.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
-plugin@org.eclipse.mylyn.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
-plugin@org.eclipse.mylyn.tests.performance=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.performance
-plugin@org.eclipse.mylyn.tests.util=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.util
-plugin@org.eclipse.mylyn.tests.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.ui
-plugin@org.eclipse.mylyn.trac.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
-plugin@org.eclipse.mylyn.wikitext.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
-plugin@org.eclipse.mylyn.xplanner.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
+plugin@org.eclipse.mylyn.bugzilla.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.tests
+plugin@org.eclipse.mylyn.commons.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.commons.tests
+plugin@org.eclipse.mylyn.context.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.tests
+!plugin@org.eclipse.mylyn.discovery.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.ide.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.ide.tests
+plugin@org.eclipse.mylyn.java.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.java.tests
+plugin@org.eclipse.mylyn.jira.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.jira.tests
+plugin@org.eclipse.mylyn.monitor.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.tests
+plugin@org.eclipse.mylyn.resources.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.tests
+plugin@org.eclipse.mylyn.sandbox.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.tests
+plugin@org.eclipse.mylyn.tasks.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests
+plugin@org.eclipse.mylyn.team.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.team.tests
+plugin@org.eclipse.mylyn.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests
+plugin@org.eclipse.mylyn.tests.performance=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.performance
+plugin@org.eclipse.mylyn.tests.util=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.util
+plugin@org.eclipse.mylyn.tests.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tests.ui
+plugin@org.eclipse.mylyn.trac.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.trac.tests
+plugin@org.eclipse.mylyn.wikitext.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.wikitext.tests
+plugin@org.eclipse.mylyn.xplanner.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/sandbox/org.eclipse.mylyn.xplanner.tests
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
index 14d85f9..2be1c98 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.4.map
@@ -1,4 +1,4 @@
!******* Eclipse 3.4 ********
-plugin@org.eclipse.mylyn.discovery.core=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-plugin@org.eclipse.mylyn.discovery.ui=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.discovery.tests=e_3_4_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.discovery.core=e_3_4_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=e_3_4_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.discovery.tests=e_3_4_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
index 3ad006a..7e7856f 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.5.map
@@ -1,4 +1,4 @@
!******* Eclipse 3.5 ********
-plugin@org.eclipse.mylyn.discovery.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-plugin@org.eclipse.mylyn.discovery.ui=e_3_5_m_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.discovery.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.discovery.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=e_3_5_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.discovery.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
diff --git a/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map b/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
index 4a8e25b..0f37281 100644
--- a/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
+++ b/org.eclipse.mylyn.releng/maps/mylyn_e3.6.map
@@ -1,4 +1,4 @@
!******* Eclipse 3.6 ********
-plugin@org.eclipse.mylyn.discovery.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
-plugin@org.eclipse.mylyn.discovery.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
-plugin@org.eclipse.mylyn.discovery.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
+plugin@org.eclipse.mylyn.discovery.core=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.core
+plugin@org.eclipse.mylyn.discovery.ui=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.ui
+plugin@org.eclipse.mylyn.discovery.tests=e_3_6_m_3_3_x,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.discovery.tests
diff --git a/org.eclipse.mylyn.releng/scripts/defaults-all.properties b/org.eclipse.mylyn.releng/scripts/defaults-all.properties
index 6ec0941..9bf0bdd 100644
--- a/org.eclipse.mylyn.releng/scripts/defaults-all.properties
+++ b/org.eclipse.mylyn.releng/scripts/defaults-all.properties
@@ -60,8 +60,9 @@
build.test.standalone.plugin=${build.test.plugin}
build.test.standalone.suite=${build.test.plugin}.AllStandaloneTests
#build.test.standalone.properties.*
+#test.annotateReport=true
-basebuilder.version=36_M3
+basebuilder.version=36_M1
download.eclipse.org=eclipse.unixheads.org
@@ -76,22 +77,22 @@
swtbot.site.3.6=http://${download.eclipse.org}/technology/swtbot/galileo/dev-build/update-site
swtbot.rev=467
-test.url.swtbot.3.4=http://${download.eclipse.org}/technology/swtbot/ganymede/dev-build/org.eclipse.swtbot.eclipse.test-2.0.0.${swtbot.rev}-dev-e34.zip
-test.url.swtbot.3.5=http://${download.eclipse.org}/technology/swtbot/galileo/dev-build/org.eclipse.swtbot.eclipse.test-2.0.0.${swtbot.rev}-dev-e35.zip
+test.url.swtbot.3.4=http://${download.eclipse.org}/technology/swtbot/archives/2.0.0.${swtbot.rev}-dev/ganymede/dev-build/org.eclipse.swtbot.eclipse.test-2.0.0.${swtbot.rev}-dev-e34.zip
+test.url.swtbot.3.5=http://${download.eclipse.org}/technology/swtbot/archives/2.0.0.${swtbot.rev}-dev/galileo/dev-build/org.eclipse.swtbot.eclipse.test-2.0.0.${swtbot.rev}-dev-e35.zip
test.url.swtbot.3.6=${test.url.swtbot.3.5}
# build tools parameter
#build.version.3.3=3.3.2
build.version.3.4=3.4.2
-build.version.3.5=3.5.1
-#build.version.3.6=3.6M4
-build.version.3.6=I20100119-0800
+build.version.3.5=3.5.2RC4
+build.version.3.6=3.6M5
+#build.version.3.6=I20100126-0800
#build.url.3.3=${eclipse.url.archive}/R-${build.version.3.3}-200802211800/eclipse-SDK-${build.version.3.3}-${build.archive}
build.url.3.4=${eclipse.url.download}/R-${build.version.3.4}-200902111700/eclipse-SDK-${build.version.3.4}-${build.archive}
-build.url.3.5=${eclipse.url.download}/R-${build.version.3.5}-200909170800/eclipse-SDK-${build.version.3.5}-${build.archive}
-#build.url.3.6=${eclipse.url.download}/S-${build.version.3.6}-200912101301/eclipse-SDK-${build.version.3.6}-${build.archive}
-build.url.3.6=http://download.eclipse.org/eclipse/downloads/drops/${build.version.3.6}/eclipse-SDK-${build.version.3.6}-${build.archive}
+build.url.3.5=${eclipse.url.download}/S-${build.version.3.5}-201002111343/eclipse-SDK-${build.version.3.5}-${build.archive}
+build.url.3.6=${eclipse.url.download}/S-${build.version.3.6}-201001291300/eclipse-SDK-${build.version.3.6}-${build.archive}
+#build.url.3.6=http://download.eclipse.org/eclipse/downloads/drops/${build.version.3.6}/eclipse-SDK-${build.version.3.6}-${build.archive}
build.sites.3.4=${swtbot.site.3.4},http://${download.eclipse.org}/tools/cdt/releases/ganymede
build.sites.3.5=${swtbot.site.3.5},http://${download.eclipse.org}/tools/cdt/releases/ganymede
diff --git a/org.eclipse.mylyn.releng/scripts/functions.xml b/org.eclipse.mylyn.releng/scripts/functions.xml
index b273a2d..9b87a66 100644
--- a/org.eclipse.mylyn.releng/scripts/functions.xml
+++ b/org.eclipse.mylyn.releng/scripts/functions.xml
@@ -93,6 +93,7 @@
<param name="test.target" value="swtbot"/>
<param name="test.plugin" value="${build.test.swtbot.plugin}"/>
<param name="test.classname" value="${build.test.swtbot.suite}"/>
+ <param name="skip3.4" value="true"/>
</antcall>
</target>
@@ -511,6 +512,7 @@
<delete includeemptydirs="true">
<fileset dir="${base.home}/eclipse">
<include name="plugins/org.eclipse.swtbot*junit3*/**"/>
+ <include name="plugins/org.junit_3.8.2*/**"/>
<include name="plugins/org.junit4_4.3.1*/**"/>
<include name="plugins/org.junit4_4.5.0*/**"/>
</fileset>
@@ -702,12 +704,26 @@
<target name="report-helper" depends="report-helper-init,pre-report">
<!-- transform Eclipse unit tests with custom style sheets -->
<xslt style="${basedir}/scripts/junit.xsl" basedir="${results.home}" excludes="TEST-*" includes="*Tests.xml" destdir="${results.home}" />
- <!-- annotate test output with test suite names -->
- <xslt style="${basedir}/scripts/test-suite.xsl" basedir="${results.home}" includes="*Tests.xml" destdir="${build.results}/test-results" extension="-${base.target}.xml" />
-
+ <!-- annotate test output with test fixture names -->
+ <xslt force="true" style="${basedir}/scripts/test-fixture.xsl" basedir="${results.home}" includes="*Tests.xml" destdir="${build.results}/test-results" extension="-${base.target}.xml" />
+ <!-- annotate test output with base version -->
+ <antcall target="report-helper-annotate-suite"/>
<antcall target="post-report"/>
</target>
+ <target name="report-helper-annotate-suite" if="test.annotateReport">
+ <!-- move existing files to temp directories for processing -->
+ <delete dir="${build.results}/test-results/temp"/>
+ <mkdir dir="${build.results}/test-results/temp"/>
+ <move todir="${build.results}/test-results/temp">
+ <fileset dir="${build.results}/test-results" includes="*-${base.target}.xml"/>
+ </move>
+ <xslt style="${basedir}/scripts/test-suite.xsl" basedir="${build.results}/test-results/temp" includes="*-${base.target}.xml" destdir="${build.results}/test-results" extension=".xml">
+ <param name="append" expression="@e${base.target}"/>
+ </xslt>
+ <delete dir="${build.results}/test-results/temp"/>
+ </target>
+
<target name="performance-report" depends="init">
<condition property="build.perf.qualifier" value="${build.baseline}" else="${qualifier}"><isset property="build.perf.baseline"/></condition>
diff --git a/org.eclipse.mylyn.releng/scripts/test-fixture.xsl b/org.eclipse.mylyn.releng/scripts/test-fixture.xsl
new file mode 100644
index 0000000..8e7baa3
--- /dev/null
+++ b/org.eclipse.mylyn.releng/scripts/test-fixture.xsl
@@ -0,0 +1,32 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="xml" indent="yes"/>
+
+ <!-- filter suite activations -->
+ <xsl:template match="testcase[@classname='org.eclipse.mylyn.tests.util.TestFixture$Activation']">
+ </xsl:template>
+
+ <!-- annotate test cases with last preceeding suite activation -->
+ <xsl:template match="testcase">
+ <!-- extract text between brackets -->
+ <xsl:variable name="fixture">
+ <xsl:value-of select="substring-before(substring-after((preceding-sibling::testcase[@classname='org.eclipse.mylyn.tests.util.TestFixture$Activation'])[position() = last()]/@name,'['),']')"/>
+ </xsl:variable>
+
+ <!-- append text to test name -->
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:attribute name="name">
+ <xsl:value-of select="@name" /><xsl:value-of select="$fixture" />
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+
+ <!-- copy everything else -->
+ <xsl:template match="* | @*">
+ <xsl:copy><xsl:copy-of select="@*"/><xsl:apply-templates/></xsl:copy>
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/org.eclipse.mylyn.releng/scripts/test-suite.xsl b/org.eclipse.mylyn.releng/scripts/test-suite.xsl
index b3d4410..613ad82 100644
--- a/org.eclipse.mylyn.releng/scripts/test-suite.xsl
+++ b/org.eclipse.mylyn.releng/scripts/test-suite.xsl
@@ -1,23 +1,15 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="xml" indent="yes"/>
-
- <!-- filter suite activations -->
- <xsl:template match="testcase[@classname='org.eclipse.mylyn.tests.util.TestFixture$Activation']">
- </xsl:template>
+ <xsl:param name="append"/>
<!-- annotate test cases with last preceeding suite activation -->
<xsl:template match="testcase">
- <!-- extract text between brackets -->
- <xsl:variable name="fixture">
- <xsl:value-of select="substring-before(substring-after((preceding-sibling::testcase[@classname='org.eclipse.mylyn.tests.util.TestFixture$Activation'])[position() = last()]/@name,'['),']')"/>
- </xsl:variable>
-
<!-- append text to test name -->
<xsl:copy>
<xsl:copy-of select="@*"/>
<xsl:attribute name="name">
- <xsl:value-of select="@name" /><xsl:value-of select="$fixture" />
+ <xsl:value-of select="@name" /><xsl:value-of select="$append" />
</xsl:attribute>
<xsl:apply-templates/>
</xsl:copy>
diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllConnectorTests.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllConnectorTests.java
index 1fb8ccd..10ea91c 100644
--- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllConnectorTests.java
+++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllConnectorTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2010 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java
index ac4f68c..81cbb02 100644
--- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java
+++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/AllTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2010 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
index 59f590a..2781166 100644
--- a/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
+++ b/org.eclipse.mylyn.tests/src/org/eclipse/mylyn/tests/integration/ChangeDataDirTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 Tasktop Technologies and others.
+ * Copyright (c) 2004, 2010 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
