Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2011-06-16 10:02:57 -0400
committerspingel2011-06-16 10:02:57 -0400
commit07c8a2e6c9906d9728c8a25312e2e618277d4d9d (patch)
tree37b56a5281cc0bf43a4b1f978f13bdecebf83bc2
parentf19e25c1afa4d0845d3437e7f3f74d66f352b9f7 (diff)
downloadorg.eclipse.mylyn-07c8a2e6c9906d9728c8a25312e2e618277d4d9d.tar.gz
org.eclipse.mylyn-07c8a2e6c9906d9728c8a25312e2e618277d4d9d.tar.xz
org.eclipse.mylyn-07c8a2e6c9906d9728c8a25312e2e618277d4d9d.zip
bug 343617: updated versoins for Mylyn 3.7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=343617
-rw-r--r--org.eclipse.mylyn.discovery-directory/pom.xml2
-rw-r--r--org.eclipse.mylyn.releng/bin/set-fixed-versions.sh17
-rw-r--r--org.eclipse.mylyn.releng/bin/update-versions.sh19
-rw-r--r--org.eclipse.mylyn.releng/integration-build/pom.xml2
-rw-r--r--org.eclipse.mylyn.releng/main-site/pom.xml4
-rw-r--r--org.eclipse.mylyn.releng/pom.xml6
-rw-r--r--org.eclipse.mylyn.releng/process-test-results/pom.xml4
-rw-r--r--org.eclipse.mylyn.releng/target-definition/mylyn-e3.5.target2
-rw-r--r--org.eclipse.mylyn.releng/target-definition/mylyn-e3.6.target2
-rw-r--r--org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target2
-rw-r--r--org.eclipse.mylyn.releng/target-definition/mylyn-e4.1.target2
-rw-r--r--org.eclipse.mylyn.releng/target-definition/pom.xml2
-rw-r--r--org.eclipse.mylyn.tests.standalone/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tests.standalone/pom.xml28
-rw-r--r--org.eclipse.mylyn.tests/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.tests/pom.xml4
-rw-r--r--pom.xml4
17 files changed, 70 insertions, 34 deletions
diff --git a/org.eclipse.mylyn.discovery-directory/pom.xml b/org.eclipse.mylyn.discovery-directory/pom.xml
index 8d3f5b4..ae97af3 100644
--- a/org.eclipse.mylyn.discovery-directory/pom.xml
+++ b/org.eclipse.mylyn.discovery-directory/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>mylyn-mylyn-parent</artifactId>
<groupId>org.eclipse.mylyn</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>org.eclipse.mylyn.discovery</artifactId>
diff --git a/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh b/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh
new file mode 100644
index 0000000..177612e
--- /dev/null
+++ b/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh
@@ -0,0 +1,17 @@
+find -name MANIFEST.MF | xargs sed -i -e 's/\.qualifier/.v20110316-0100/'
+
+find -name pom.xml -not -path "*feature*" | xargs sed -i -e 's/^\( <version>.*\)-SNAPSHOT<\/version>/\1.v20110316-0100<\/version>/'
+find -name feature.xml -path "*feature*" | xargs sed -i -e 's/0\.7\.0.qualifier/0.7.1.qualifier/'
+find -name pom.xml -path "*feature*" | xargs sed -i -e 's/^ <version>0.7.0-SNAPSHOT<\/version>/ <version>0.7.1-SNAPSHOT<\/version>/'
+find -name feature.xml -path "*feature*" | xargs sed -i -e 's/1\.4\.0.qualifier/1.4.1.qualifier/'
+find -name pom.xml -path "*feature*" | xargs sed -i -e 's/^ <version>1.4.0-SNAPSHOT<\/version>/ <version>1.4.1-SNAPSHOT<\/version>/'
+find -name feature.xml -path "*feature*" | xargs sed -i -e 's/3\.5\.0.qualifier/3.5.1.qualifier/'
+find -name pom.xml -path "*feature*" | xargs sed -i -e 's/^ <version>3.5.0-SNAPSHOT<\/version>/ <version>3.5.1-SNAPSHOT<\/version>/'
+
+sed -i -e 's/^\( <version>.*\)\.v20110316-0100<\/version>/\1-SNAPSHOT<\/version>/' pom.xml
+
+# change root pom back to -SNAPSHOT
+
+mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=1.4.1-SNAPSHOT
+
+grep Bundle-Version */META-INF/MANIFEST.MF | grep -v 0.7.0 | grep -v 3.5.0 | grep -v 1.4.0 | grep -v 0.1.0
diff --git a/org.eclipse.mylyn.releng/bin/update-versions.sh b/org.eclipse.mylyn.releng/bin/update-versions.sh
new file mode 100644
index 0000000..1fc5af2
--- /dev/null
+++ b/org.eclipse.mylyn.releng/bin/update-versions.sh
@@ -0,0 +1,19 @@
+update() {
+OLD=$1
+NEW=$2
+find -name MANIFEST.MF | xargs sed -i -e "s/Bundle-Version: $OLD.qualifier/Bundle-Version: $NEW.qualifier/"
+find -name feature.xml | xargs sed -i -e "s/$OLD.qualifier/$NEW.qualifier/"
+find -name pom.xml | xargs sed -i -e "s/<version>$OLD-SNAPSHOT<\/version>/<version>$NEW-SNAPSHOT<\/version>/"
+
+find -name feature.xml | xargs sed -i -e "s/\(mylyn.* version=\"\)$OLD\(\" match=\"equivalent\".*\)/\1$NEW\2/"
+}
+
+#mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=1.4.1-SNAPSHOT
+
+update 0.8.0 0.9.0
+update 1.5.0 1.6.0
+update 3.6.0 3.7.0
+update 5.2.200 5.3.0
+
+
+#grep Bundle-Version */META-INF/MANIFEST.MF | grep -v 0.9.0 | grep -v 3.7.0 | grep -v 1.5.0
diff --git a/org.eclipse.mylyn.releng/integration-build/pom.xml b/org.eclipse.mylyn.releng/integration-build/pom.xml
index 199b68d..c7c1da4 100644
--- a/org.eclipse.mylyn.releng/integration-build/pom.xml
+++ b/org.eclipse.mylyn.releng/integration-build/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.eclipse.mylyn</groupId>
<artifactId>mylyn-integration-build</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/org.eclipse.mylyn.releng/main-site/pom.xml b/org.eclipse.mylyn.releng/main-site/pom.xml
index 68e83d3..9b5cd84 100644
--- a/org.eclipse.mylyn.releng/main-site/pom.xml
+++ b/org.eclipse.mylyn.releng/main-site/pom.xml
@@ -15,10 +15,10 @@
<parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>mylyn-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<artifactId>main-site</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
<name>Mylyn for Eclipse 3.5, 3.6 and 3.7</name>
<properties>
diff --git a/org.eclipse.mylyn.releng/pom.xml b/org.eclipse.mylyn.releng/pom.xml
index e8d983d..b75c1a4 100644
--- a/org.eclipse.mylyn.releng/pom.xml
+++ b/org.eclipse.mylyn.releng/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <mylyn-version>3.6.0-SNAPSHOT</mylyn-version>
+ <mylyn-version>3.7.0-SNAPSHOT</mylyn-version>
<tycho-version>0.10.0</tycho-version>
<target-platform>mylyn-e3.7</target-platform>
@@ -51,7 +51,7 @@
<groupId>org.eclipse.mylyn</groupId>
<artifactId>mylyn-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<mailingLists>
@@ -243,7 +243,7 @@
<artifact>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>target-definition</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<classifier>${target-platform}</classifier>
</artifact>
</target>
diff --git a/org.eclipse.mylyn.releng/process-test-results/pom.xml b/org.eclipse.mylyn.releng/process-test-results/pom.xml
index f6d412a..ee9c775 100644
--- a/org.eclipse.mylyn.releng/process-test-results/pom.xml
+++ b/org.eclipse.mylyn.releng/process-test-results/pom.xml
@@ -5,11 +5,11 @@
<parent>
<artifactId>mylyn-parent</artifactId>
<groupId>org.eclipse.mylyn</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>process-test-results</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
<plugins>
diff --git a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.5.target b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.5.target
index 10b51d1..0ab1a19 100644
--- a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.5.target
+++ b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.5.target
@@ -51,7 +51,7 @@
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates"/>
+<repository location="http://download.eclipse.org/egit/staging/v1.0.0.201106090707-r"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.6.target b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.6.target
index 771d8d8..ea0ecfc 100644
--- a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.6.target
+++ b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.6.target
@@ -51,7 +51,7 @@
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates"/>
+<repository location="http://download.eclipse.org/egit/staging/v1.0.0.201106090707-r"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target
index 29f6502..1a33764 100644
--- a/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target
+++ b/org.eclipse.mylyn.releng/target-definition/mylyn-e3.7.target
@@ -53,7 +53,7 @@
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates"/>
+<repository location="http://download.eclipse.org/egit/staging/v1.0.0.201106090707-r"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.releng/target-definition/mylyn-e4.1.target b/org.eclipse.mylyn.releng/target-definition/mylyn-e4.1.target
index d774452..601ccf8 100644
--- a/org.eclipse.mylyn.releng/target-definition/mylyn-e4.1.target
+++ b/org.eclipse.mylyn.releng/target-definition/mylyn-e4.1.target
@@ -53,7 +53,7 @@
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/egit/updates"/>
+<repository location="http://download.eclipse.org/egit/staging/v1.0.0.201106090707-r"/>
</location>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.releng/target-definition/pom.xml b/org.eclipse.mylyn.releng/target-definition/pom.xml
index eb6227d..363136a 100644
--- a/org.eclipse.mylyn.releng/target-definition/pom.xml
+++ b/org.eclipse.mylyn.releng/target-definition/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>mylyn-parent</artifactId>
<groupId>org.eclipse.mylyn</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<artifactId>target-definition</artifactId>
<packaging>pom</packaging>
diff --git a/org.eclipse.mylyn.tests.standalone/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tests.standalone/META-INF/MANIFEST.MF
index e18c720..a1ebbbe 100644
--- a/org.eclipse.mylyn.tests.standalone/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tests.standalone/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylyn Standalone Tests
Bundle-SymbolicName: org.eclipse.mylyn.tests.standalone;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.7.0.qualifier
Bundle-Vendor: Eclipse Mylyn
Export-Package: org.eclipse.mylyn.tests;x-internal:=true
Bundle-ClassPath: .
diff --git a/org.eclipse.mylyn.tests.standalone/pom.xml b/org.eclipse.mylyn.tests.standalone/pom.xml
index d98fd89..1a7cf6f 100644
--- a/org.eclipse.mylyn.tests.standalone/pom.xml
+++ b/org.eclipse.mylyn.tests.standalone/pom.xml
@@ -5,11 +5,11 @@
<parent>
<artifactId>mylyn-mylyn-parent</artifactId>
<groupId>org.eclipse.mylyn</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>org.eclipse.mylyn.tests.standalone</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<testSourceDirectory>src</testSourceDirectory>
@@ -34,62 +34,62 @@
<dependency>
<groupId>org.eclipse.mylyn.commons</groupId>
<artifactId>org.eclipse.mylyn.commons.core</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.commons</groupId>
<artifactId>org.eclipse.mylyn.commons.net</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.commons</groupId>
<artifactId>org.eclipse.mylyn.commons.xmlrpc</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.commons</groupId>
<artifactId>org.eclipse.mylyn.commons.tests</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.bugzilla.core</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.bugzilla.tests</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.trac.core</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.trac.tests</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.tasks.core</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.tasks.tests</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.tasks</groupId>
<artifactId>org.eclipse.mylyn.tests.util</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.docs</groupId>
<artifactId>org.eclipse.mylyn.wikitext.tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>p2.osgi.bundle</groupId>
diff --git a/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF
index ab888ee..33f4733 100644
--- a/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Mylyn Tests
Bundle-SymbolicName: org.eclipse.mylyn.tests;singleton:=true
-Bundle-Version: 3.6.0.qualifier
+Bundle-Version: 3.7.0.qualifier
Bundle-Vendor: Eclipse Mylyn
Export-Package: org.eclipse.mylyn.tests;x-internal:=true,
org.eclipse.mylyn.tests.integration;x-internal:=true,
diff --git a/org.eclipse.mylyn.tests/pom.xml b/org.eclipse.mylyn.tests/pom.xml
index bd4f437..5c258d9 100644
--- a/org.eclipse.mylyn.tests/pom.xml
+++ b/org.eclipse.mylyn.tests/pom.xml
@@ -5,11 +5,11 @@
<parent>
<artifactId>mylyn-mylyn-parent</artifactId>
<groupId>org.eclipse.mylyn</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>org.eclipse.mylyn.tests</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<mylyn-test-suite>org.eclipse.mylyn.tests.AllTests</mylyn-test-suite>
diff --git a/pom.xml b/pom.xml
index e350503..c7a3691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>mylyn-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<relativePath>../org.eclipse.mylyn/org.eclipse.mylyn.releng</relativePath>
</parent>
<groupId>org.eclipse.mylyn</groupId>
<artifactId>mylyn-mylyn-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<profiles>
<profile>

Back to the top