[java-sig-commits] [tycho/f17] Update to 0.14.0 upstream release tag.
Roland Grunberg
rgrunber at fedoraproject.org
Fri Feb 17 14:44:40 UTC 2012
commit 1c67f6dcc7ad4df8979bb65387b180bbb3f13f7f
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Thu Feb 16 13:34:39 2012 -0500
Update to 0.14.0 upstream release tag.
.gitignore | 1 +
sources | 4 +-
tycho-0.14.0-bootstrap.patch | 728 +++++++++++++++++++++++++
tycho-0001-Remove-tycho-testing-harness.patch | 27 -
tycho-0002-Fix-Build-Issues.patch | 145 -----
tycho-0003-Jetty8-Update.patch | 240 --------
tycho-fix-build.patch | 120 ++++
tycho-version.patch | 685 -----------------------
tycho.spec | 65 ++-
9 files changed, 887 insertions(+), 1128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f58f829..526c781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/tycho-0.10.0.tar.xz
maven-repo.tar.xz
tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
+tycho-0.14.0.tar.bz2
diff --git a/sources b/sources
index 61ccbc8..9ee347f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cca75e3e09dbc187e2314413c1e3f02f maven-repo.tar.xz
-4a3986b897468bb77c43b812a952ecca tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
+08dd3f86350287dbb7a57b9c48c3fab1 maven-repo.tar.xz
+a3295a852335596f703a54ab154585f0 tycho-0.14.0.tar.bz2
diff --git a/tycho-0.14.0-bootstrap.patch b/tycho-0.14.0-bootstrap.patch
new file mode 100644
index 0000000..5d0b92a
--- /dev/null
+++ b/tycho-0.14.0-bootstrap.patch
@@ -0,0 +1,728 @@
+diff -rauN tycho-0.14.0.old/pom.xml tycho-0.14.0/pom.xml
+--- tycho-0.14.0.old/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/pom.xml 2012-02-14 12:34:57.742000141 -0500
+@@ -63,7 +63,7 @@
+
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Tycho (Incubation)</name>
+diff -rauN tycho-0.14.0.old/sisu-equinox/pom.xml tycho-0.14.0/sisu-equinox/pom.xml
+--- tycho-0.14.0.old/sisu-equinox/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/sisu-equinox/pom.xml 2012-02-14 12:34:57.859000150 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>sisu-equinox</artifactId>
+diff -rauN tycho-0.14.0.old/sisu-equinox/sisu-equinox-api/pom.xml tycho-0.14.0/sisu-equinox/sisu-equinox-api/pom.xml
+--- tycho-0.14.0.old/sisu-equinox/sisu-equinox-api/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/sisu-equinox/sisu-equinox-api/pom.xml 2012-02-14 12:34:57.860000142 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-api</artifactId>
+
+diff -rauN tycho-0.14.0.old/sisu-equinox/sisu-equinox-embedder/pom.xml tycho-0.14.0/sisu-equinox/sisu-equinox-embedder/pom.xml
+--- tycho-0.14.0.old/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-02-14 12:34:57.980000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-embedder</artifactId>
+
+diff -rauN tycho-0.14.0.old/sisu-equinox/sisu-equinox-launching/pom.xml tycho-0.14.0/sisu-equinox/sisu-equinox-launching/pom.xml
+--- tycho-0.14.0.old/sisu-equinox/sisu-equinox-launching/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/sisu-equinox/sisu-equinox-launching/pom.xml 2012-02-14 12:34:57.981000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-launching</artifactId>
+
+diff -rauN tycho-0.14.0.old/target-platform-configuration/pom.xml tycho-0.14.0/target-platform-configuration/pom.xml
+--- tycho-0.14.0.old/target-platform-configuration/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/target-platform-configuration/pom.xml 2012-02-14 12:34:57.987000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>target-platform-configuration</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-02-14 12:34:57.794000119 -0500
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.core.shared
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho Core Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Export-Package: org.eclipse.tycho.artifacts,
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-02-14 12:34:57.794000119 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.core.shared</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-02-14 12:34:57.834000134 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Fragment-Host: org.eclipse.tycho.core.shared
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.junit;bundle-version="4.8.2"
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-02-14 12:34:57.823000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-02-14 12:34:57.744000141 -0500
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-02-14 12:34:57.744000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.embedder.shared</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-02-14 12:34:57.823000140 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Noop Equinox password provider (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-02-14 12:34:57.818000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.noopsecurity</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-02-14 12:34:57.806000152 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Maven/p2 Repository Integration (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-02-14 12:34:57.806000152 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-02-14 12:34:57.845000120 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Maven/p2 Repository Integration Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository.tests;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.eclipse.tycho.p2.maven.repository,
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-02-14 12:34:57.844000124 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-02-14 12:34:57.805000156 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Resolver Bundle (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
+ Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.equinox.security;bundle-version="1.0.100",
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-02-14 12:34:57.804000161 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-02-14 12:34:57.838000151 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Resolver Bundle Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.resolver.impl
+ Require-Bundle: org.junit4,
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-02-14 12:34:57.838000151 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-02-14 12:34:57.795000121 -0500
+@@ -5,7 +5,7 @@
+ org.eclipse.tycho.p2.resolver.facade,
+ org.eclipse.tycho.p2.target.facade,
+ org.eclipse.tycho.repository.registry.facade
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Tycho integrates Maven with Eclipse and OSGi
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-02-14 12:34:57.795000121 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-02-14 12:34:57.808000141 -0500
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho p2 Tools Bundle (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-02-14 12:34:57.807000146 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-02-14 12:34:57.803000165 -0500
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho p2 Tools Maven/OSGi Shared Classes (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-02-14 12:34:57.803000165 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-02-14 12:34:57.855000184 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Tools Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.tools.impl
+ Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
+diff -rauN tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-02-14 12:34:57.854000191 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/pom.xml tycho-0.14.0/tycho-bundles/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/pom.xml 2012-02-14 12:34:57.743000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-bundles</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/tycho-bundles-external/pom.xml tycho-0.14.0/tycho-bundles/tycho-bundles-external/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/tycho-bundles-external/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/tycho-bundles-external/pom.xml 2012-02-14 12:34:57.856000173 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-bundles-external</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product tycho-0.14.0/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+--- tycho-0.14.0.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-02-14 12:34:57.858000159 -0500
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <?pde version="3.5"?>
+
+-<product uid="tycho-bundles-external" name="org.eclipse.tycho.p2" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.14.0" useFeatures="false" includeLaunchers="false">
++<product uid="tycho-bundles-external" name="org.eclipse.tycho.p2" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.14.0.qualifier" useFeatures="false" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+diff -rauN tycho-0.14.0.old/tycho-bundles/tycho-bundles-target/pom.xml tycho-0.14.0/tycho-bundles/tycho-bundles-target/pom.xml
+--- tycho-0.14.0.old/tycho-bundles/tycho-bundles-target/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-bundles/tycho-bundles-target/pom.xml 2012-02-14 12:34:57.743000141 -0500
+@@ -5,7 +5,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+diff -rauN tycho-0.14.0.old/tycho-compiler-jdt/pom.xml tycho-0.14.0/tycho-compiler-jdt/pom.xml
+--- tycho-0.14.0.old/tycho-compiler-jdt/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-compiler-jdt/pom.xml 2012-02-14 12:34:57.985000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-compiler-jdt</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-compiler-plugin/pom.xml tycho-0.14.0/tycho-compiler-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-compiler-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-compiler-plugin/pom.xml 2012-02-14 12:34:57.986000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-compiler-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-core/pom.xml tycho-0.14.0/tycho-core/pom.xml
+--- tycho-0.14.0.old/tycho-core/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-core/pom.xml 2012-02-14 12:34:57.983000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-core</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-embedder-api/pom.xml tycho-0.14.0/tycho-embedder-api/pom.xml
+--- tycho-0.14.0.old/tycho-embedder-api/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-embedder-api/pom.xml 2012-02-14 12:34:57.982000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-embedder-api</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-its/pom.xml tycho-0.14.0/tycho-its/pom.xml
+--- tycho-0.14.0.old/tycho-its/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-its/pom.xml 2012-02-14 12:34:58.214000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-its</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-maven-plugin/pom.xml tycho-0.14.0/tycho-maven-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-maven-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-maven-plugin/pom.xml 2012-02-14 12:34:57.988000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-maven-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-metadata-model/pom.xml tycho-0.14.0/tycho-metadata-model/pom.xml
+--- tycho-0.14.0.old/tycho-metadata-model/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-metadata-model/pom.xml 2012-02-14 12:34:57.982000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-metadata-model</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-p2/pom.xml tycho-0.14.0/tycho-p2/pom.xml
+--- tycho-0.14.0.old/tycho-p2/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/pom.xml 2012-02-14 12:34:58.012000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-p2/tycho-p2-director-plugin/pom.xml tycho-0.14.0/tycho-p2/tycho-p2-director-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-02-14 12:34:58.013000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-director-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-p2/tycho-p2-facade/pom.xml tycho-0.14.0/tycho-p2/tycho-p2-facade/pom.xml
+--- tycho-0.14.0.old/tycho-p2/tycho-p2-facade/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/tycho-p2-facade/pom.xml 2012-02-14 12:34:58.012000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-p2-facade</artifactId>
+
+diff -rauN tycho-0.14.0.old/tycho-p2/tycho-p2-plugin/pom.xml tycho-0.14.0/tycho-p2/tycho-p2-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-p2/tycho-p2-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/tycho-p2-plugin/pom.xml 2012-02-14 12:34:58.023000132 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml tycho-0.14.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-02-14 12:34:58.024000133 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-p2/tycho-p2-repository-plugin/pom.xml tycho-0.14.0/tycho-p2/tycho-p2-repository-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-02-14 12:34:58.213000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-packaging-plugin/pom.xml tycho-0.14.0/tycho-packaging-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-packaging-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-packaging-plugin/pom.xml 2012-02-14 12:34:57.986000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-packaging-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-pomgenerator-plugin/pom.xml tycho-0.14.0/tycho-pomgenerator-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-pomgenerator-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-pomgenerator-plugin/pom.xml 2012-02-14 12:34:57.988000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-pomgenerator-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-release/pom.xml tycho-0.14.0/tycho-release/pom.xml
+--- tycho-0.14.0.old/tycho-release/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-release/pom.xml 2012-02-14 12:34:58.011000142 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-release</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-release/tycho-versions-plugin/pom.xml tycho-0.14.0/tycho-release/tycho-versions-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-release/tycho-versions-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-release/tycho-versions-plugin/pom.xml 2012-02-14 12:34:58.011000142 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-release</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-versions-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-source-plugin/pom.xml tycho-0.14.0/tycho-source-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-source-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-source-plugin/pom.xml 2012-02-14 12:34:57.987000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-source-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-14 12:34:58.009000143 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Surefire OSGi JUnit3 Runner (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.junit;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-02-14 12:34:58.008000141 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.junit</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-02-14 12:34:58.010000143 -0500
+@@ -2,7 +2,7 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Surefire OSGi JUnit4 Runner (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.junit4;singleton:=true
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-02-14 12:34:58.010000143 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-14 12:34:58.007000134 -0500
+@@ -6,7 +6,7 @@
+ Bundle-ClassPath: .,
+ jars/surefire-booter-2.10.jar,
+ jars/surefire-api-2.10.jar
+-Bundle-Version: 0.14.0
++Bundle-Version: 0.14.0.qualifier
+ Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
+diff -rauN tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+--- tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-14 12:34:57.990000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-surefire/pom.xml tycho-0.14.0/tycho-surefire/pom.xml
+--- tycho-0.14.0.old/tycho-surefire/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/pom.xml 2012-02-14 12:34:57.988000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-surefire</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-surefire/tycho-surefire-plugin/pom.xml tycho-0.14.0/tycho-surefire/tycho-surefire-plugin/pom.xml
+--- tycho-0.14.0.old/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-02-14 12:34:57.989000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-surefire-plugin</artifactId>
+diff -rauN tycho-0.14.0.old/tycho-testing-harness/pom.xml tycho-0.14.0/tycho-testing-harness/pom.xml
+--- tycho-0.14.0.old/tycho-testing-harness/pom.xml 2012-02-06 10:26:59.000000000 -0500
++++ tycho-0.14.0/tycho-testing-harness/pom.xml 2012-02-14 12:34:57.984000140 -0500
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.0</version>
++ <version>0.14.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-testing-harness</artifactId>
+
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
new file mode 100644
index 0000000..2ed901b
--- /dev/null
+++ b/tycho-fix-build.patch
@@ -0,0 +1,120 @@
+--- ./tycho-0.14.0.old/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-06 10:26:59.000000000 -0500
++++ ./tycho-0.14.0/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-10 16:25:37.000000000 -0500
+@@ -37,6 +37,14 @@
+ return null;
+ }
+
++ public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean bool, String... tasks)
++ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
++ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
++ PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
++ PluginVersionResolutionException {
++ return null;
++ }
++
+ public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks)
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+--- ./tycho-0.14.0.old/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-06 10:26:59.000000000 -0500
++++ ./tycho-0.14.0/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-10 15:39:49.723000889 -0500
+@@ -36,7 +36,7 @@
+ converter.convertManifest(new File("src/test/resources/targetplatforms/pre-3.0/plugins/testjar_1.0.0.jar"), mf,
+ false, "3.2", true, null);
+ Assert.assertTrue(mf.isFile());
+- Headers<String, String> headers = Headers.parseManifest(new FileInputStream(mf));
++ Headers headers = Headers.parseManifest(new FileInputStream(mf));
+ Assert.assertEquals("testjar", headers.get("Bundle-SymbolicName"));
+ }
+
+@@ -44,14 +44,14 @@
+ public void testWriteManifest() throws PluginConversionException, BundleException, IOException {
+ File tmpManifestFile = folder.newFile("testManifest");
+ Hashtable<String, String> manifestToWrite = new Hashtable<String, String>();
+- Headers<String, String> originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
++ Headers originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
+ "/manifests/valid.mf"));
+ for (Enumeration<String> keys = originalManifest.keys(); keys.hasMoreElements();) {
+ String key = keys.nextElement();
+- manifestToWrite.put(key, originalManifest.get(key));
++ manifestToWrite.put(key, (String)originalManifest.get(key));
+ }
+ converter.writeManifest(tmpManifestFile, manifestToWrite, false);
+- Headers<String, String> writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
++ Headers writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
+ assertEquals(originalManifest.size(), writtenManifest.size());
+ for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
+ String key = keys.nextElement();
+--- ./tycho-0.14.0.old/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-02-06 10:26:59.000000000 -0500
++++ ./tycho-0.14.0/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-02-14 10:47:58.743002506 -0500
+@@ -18,7 +18,7 @@
+ public enum EEType {
+
+ // order is significant for comparison
+- OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JAVA_SE("JavaSE");
++ OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JAVA_SE("JavaSE"), JRE("JRE");
+
+ private final String profileName;
+
+--- ./tycho-0.14.0.old/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-06 10:26:59.000000000 -0500
++++ ./tycho-0.14.0/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-10 15:36:32.000000000 -0500
+@@ -25,7 +25,7 @@
+ private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0];
+
+ private String location;
+- private Headers<String, String> headers;
++ private Headers headers;
+
+ // cache for parsed values of commonly used headers
+ private String bundleSymbolicName;
+@@ -78,7 +78,7 @@
+ }
+
+ private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException {
+- String value = headers.get(headerKey);
++ String value = (String)headers.get(headerKey);
+ if (value == null) {
+ throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found");
+ }
+@@ -100,12 +100,12 @@
+ && "dir".equals(bundleShapeElements[0].getValue());
+ }
+
+- public Headers<String, String> getHeaders() {
++ public Headers getHeaders() {
+ return headers;
+ }
+
+ public String getValue(String key) {
+- return headers.get(key);
++ return (String)headers.get(key);
+ }
+
+ public String getBundleSymbolicName() {
+@@ -141,7 +141,7 @@
+ }
+
+ private ManifestElement[] parseHeader(String key) {
+- String value = headers.get(key);
++ String value = (String)headers.get(key);
+ if (value == null) {
+ return null;
+ }
+@@ -154,7 +154,7 @@
+
+ public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException {
+ try {
+- return ManifestElement.parseHeader(key, headers.get(key));
++ return ManifestElement.parseHeader(key, (String)headers.get(key));
+ } catch (BundleException e) {
+ throw new OsgiManifestParserException(location, e);
+ }
+--- ./tycho-0.14.0.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-06 10:26:59.000000000 -0500
++++ ./tycho-0.14.0/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-14 12:04:02.275017810 -0500
+@@ -6,6 +6,6 @@
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+ JavaSE-1.6
+-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
++Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
+ Bundle-ClassPath: jars/surefire-junit3-2.10.jar
+ Bundle-Vendor: %providerName
diff --git a/tycho.spec b/tycho.spec
index 1d4bf9b..8a067b4 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,34 +1,32 @@
-%global bootstrap 0
-
-%global sha1 6391f1dafb35cbef48753e89c743ee9664a1c79d
+%global bootstrap 1
%global e_osgi org.eclipse.osgi
%global e_osgi_v 3.6.2.R36x_v20110210
-%global e_osgi_v2 3.8.0.v20110726-1606
+%global e_osgi_v2 3.8.0.v20120123-1419
+%global e_osgi_v3 3.8.0.v20110726-1606
%global e_core org.eclipse.jdt.core
%global e_core_v 3.6.2.v_A76_R36x
-%global e_core_v2 3.8.0.v_C03
+%global e_core_v2 3.8.1.v20120125-1544
%global eclipsedir %{_libdir}/eclipse
+
%if %{bootstrap}
-%global snap %{nil}
-%else
%global snap -SNAPSHOT
+%else
+%global snap %{nil}
%endif
-
Name: tycho
Version: 0.14.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
# license file is missing but all files having some licensing information are ASL 2.0
License: ASL 2.0
URL: http://tycho.sonatype.org/
-# git clone git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho.git
-# git archive --prefix="tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d/" --format=tar 6391f1 | xz > tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
-Source0: %{name}-%{version}-%{sha1}.tar.xz
+# http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.14.0.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
# this is a workaround for maven-plugin-plugin changes that happened after
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
@@ -40,11 +38,12 @@ Source2: depmap.xml
%if %{bootstrap}
Source3: maven-repo.tar.xz
%endif
-Patch0: %{name}-0001-Remove-tycho-testing-harness.patch
-Patch1: %{name}-0002-Fix-Build-Issues.patch
-Patch2: %{name}-0003-Jetty8-Update.patch
+Patch0: %{name}-fix-build.patch
%if %{bootstrap}
-Patch3: %{name}-version.patch
+# Set some temporary build version so that the bootstrapped build has
+# a different version from the nonbootstrapped. Otherwise there will
+# be cyclic dependencies.
+Patch1: %{name}-%{version}-bootstrap.patch
%endif
BuildArch: noarch
@@ -64,6 +63,7 @@ BuildRequires: maven-shared-osgi
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-verifier-plugin
BuildRequires: plexus-containers-component-metadata
BuildRequires: eclipse-jdt
BuildRequires: decentxml
@@ -116,13 +116,11 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}-%{sha1}
+%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p2
%if %{bootstrap}
-%patch3 -p1
+%patch1 -p1
%endif
find tycho-core -iname '*html' -delete
@@ -137,8 +135,8 @@ popd
%if %{bootstrap}
tar xf %{SOURCE3}
%else
-mkdir -p .m2/org/eclipse/%{name}/%{name}-p2-runtime/%{version}
-unzip -d .m2/org/eclipse/%{name}/%{name}-p2-runtime/%{version} %{_javadir}/%{name}/%{name}-p2-runtime.zip
+mkdir -p .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version}
+unzip -d .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version} %{_javadir}/%{name}/%{name}-bundles-external.zip
%endif
# prepare directories for eclipse symlinks
@@ -147,6 +145,7 @@ mkdir -p .m2/org/sonatype/tycho/%{e_osgi}/%{e_osgi_v}/
mkdir -p .m2/org/sonatype/tycho/%{e_core}/%{e_core_v}/
mkdir -p .m2/org/eclipse/tycho
mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v2}/
+mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v3}/
mkdir -p .m2/org/eclipse/tycho/%{e_core}/%{e_core_v2}/
# maven resolver doesn't know how to resolve from directories other than _javadir
@@ -162,6 +161,8 @@ popd
pushd .m2/org/eclipse/tycho
ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
%{e_osgi}/%{e_osgi_v2}/%{e_osgi}-%{e_osgi_v2}.jar
+ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
+ %{e_osgi}/%{e_osgi_v3}/%{e_osgi}-%{e_osgi_v3}.jar
ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \
%{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar || \
ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
@@ -169,6 +170,7 @@ ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
popd
%build
+export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
export TYCHO_TARGET_PLATFORM=%{eclipsedir}
mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \
-Dmaven.local.depmap.file=%{SOURCE2} \
@@ -179,7 +181,8 @@ mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
- tycho-{core,embedder-api,equinox{,-api,-launching}} \
+ tycho-{core,embedder-api} \
+ sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
tycho-{metadata-model,p2/tycho-p2-{director-plugin,facade,plugin,{publisher,repository}-plugin}} \
tycho-{maven,packaging,pomgenerator,source}-plugin tycho-release/tycho-versions-plugin \
tycho-bundles/org* \
@@ -194,6 +197,7 @@ done
for pommod in tycho-p2 tycho-bundles{,/org.eclipse.tycho.p2.resolver.impl} \
tycho-surefire tycho-release \
+ sisu-equinox \
;do
aid=`basename $pommod`
install -pm 644 $pommod/pom.xml \
@@ -203,11 +207,11 @@ for pommod in tycho-p2 tycho-bundles{,/org.eclipse.tycho.p2.resolver.impl} \
done
# runtime
-pushd tycho-bundles/tycho-p2-runtime
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-p2-runtime.pom
-install -m 644 target/tycho-p2-runtime-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-p2-runtime.zip
-%add_to_maven_depmap org.eclipse.tycho tycho-p2-runtime %{version} JPP/%{name} tycho-p2-runtime
-%add_to_maven_depmap org.sonatype.tycho tycho-p2-runtime %{version} JPP/%{name} tycho-p2-runtime
+pushd tycho-bundles/tycho-bundles-external
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
+install -m 644 target/tycho-bundles-external-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-bundles-external.zip
+%add_to_maven_depmap org.eclipse.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
+%add_to_maven_depmap org.sonatype.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
popd
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
@@ -235,6 +239,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Tue Feb 14 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.0-3
+- Update to 0.14.0 upstream tag.
+
* Thu Feb 9 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.0-2
- Non-bootstrap build.
More information about the java-sig-commits
mailing list