[java-sig-commits] [tycho/f17] Add missing tycho-testing-harness to be packaged.
Roland Grunberg
rgrunber at fedoraproject.org
Wed Apr 11 20:20:47 UTC 2012
commit 5244fdf4f25ebefb54affeab933036f84e8b0cb0
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Fri Mar 30 09:39:12 2012 -0400
Add missing tycho-testing-harness to be packaged.
sources | 1 -
tycho-0.14.0-bootstrap.patch | 728 ------------------------------------------
tycho-bootstrap.patch | 727 +++++++++++++++++++++++++++++++++++++++++
tycho.spec | 29 +-
4 files changed, 739 insertions(+), 746 deletions(-)
---
diff --git a/sources b/sources
index 10f7576..b9465b6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
819980acb31e0c06dca4fdd8320c39c1 tycho-0.14.x.tar.bz2
-08dd3f86350287dbb7a57b9c48c3fab1 maven-repo.tar.xz
diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch
new file mode 100644
index 0000000..631718e
--- /dev/null
+++ b/tycho-bootstrap.patch
@@ -0,0 +1,727 @@
+diff -rauN tycho-0.14.x.old/pom.xml tycho-0.14.x/pom.xml
+--- tycho-0.14.x.old/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -63,7 +63,7 @@
+
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Tycho (Incubation)</name>
+diff -rauN tycho-0.14.x.old/sisu-equinox/pom.xml tycho-0.14.x/sisu-equinox/pom.xml
+--- tycho-0.14.x.old/sisu-equinox/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/sisu-equinox/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>sisu-equinox</artifactId>
+diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-api/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-api/pom.xml
+--- tycho-0.14.x.old/sisu-equinox/sisu-equinox-api/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/sisu-equinox/sisu-equinox-api/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-api</artifactId>
+
+diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-embedder/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-embedder/pom.xml
+--- tycho-0.14.x.old/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-embedder</artifactId>
+
+diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-launching/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-launching/pom.xml
+--- tycho-0.14.x.old/sisu-equinox/sisu-equinox-launching/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/sisu-equinox/sisu-equinox-launching/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>sisu-equinox</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>sisu-equinox-launching</artifactId>
+
+diff -rauN tycho-0.14.x.old/target-platform-configuration/pom.xml tycho-0.14.x/target-platform-configuration/pom.xml
+--- tycho-0.14.x.old/target-platform-configuration/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/target-platform-configuration/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>target-platform-configuration</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.core.shared
+-Bundle-Version: 0.14.1
++Bundle-Version: 0.14.1.qualifier
+ Bundle-Name: Tycho Core Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Export-Package: org.eclipse.tycho.artifacts,
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.core.shared</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
+-Bundle-Version: 0.14.1
++Bundle-Version: 0.14.1.qualifier
+ Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.embedder.shared</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.noopsecurity</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.eclipse.tycho.p2.maven.repository,
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.resolver.impl
+ Require-Bundle: org.junit4,
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.14.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.14.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/pom.xml tycho-0.14.x/tycho-bundles/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-bundles</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/pom.xml tycho-0.14.x/tycho-bundles/tycho-bundles-external/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/tycho-bundles-external/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-bundles-external</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product tycho-0.14.x/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+--- tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1" 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.1.qualifier" useFeatures="false" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-target/pom.xml tycho-0.14.x/tycho-bundles/tycho-bundles-target/pom.xml
+--- tycho-0.14.x.old/tycho-bundles/tycho-bundles-target/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-bundles/tycho-bundles-target/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -5,7 +5,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+diff -rauN tycho-0.14.x.old/tycho-compiler-jdt/pom.xml tycho-0.14.x/tycho-compiler-jdt/pom.xml
+--- tycho-0.14.x.old/tycho-compiler-jdt/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-compiler-jdt/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-compiler-jdt</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-compiler-plugin/pom.xml tycho-0.14.x/tycho-compiler-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-compiler-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-compiler-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-compiler-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-core/pom.xml tycho-0.14.x/tycho-core/pom.xml
+--- tycho-0.14.x.old/tycho-core/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-core/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-core</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-embedder-api/pom.xml tycho-0.14.x/tycho-embedder-api/pom.xml
+--- tycho-0.14.x.old/tycho-embedder-api/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-embedder-api/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-embedder-api</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-its/pom.xml tycho-0.14.x/tycho-its/pom.xml
+--- tycho-0.14.x.old/tycho-its/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-its/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-its</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-maven-plugin/pom.xml tycho-0.14.x/tycho-maven-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-maven-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-maven-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-maven-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-metadata-model/pom.xml tycho-0.14.x/tycho-metadata-model/pom.xml
+--- tycho-0.14.x.old/tycho-metadata-model/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-metadata-model/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-metadata-model</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-p2/pom.xml tycho-0.14.x/tycho-p2/pom.xml
+--- tycho-0.14.x.old/tycho-p2/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-director-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-director-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-director-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-facade/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-facade/pom.xml
+--- tycho-0.14.x.old/tycho-p2/tycho-p2-facade/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/tycho-p2-facade/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-p2-facade</artifactId>
+
+diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-p2/tycho-p2-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/tycho-p2-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-publisher-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-repository-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-repository-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-packaging-plugin/pom.xml tycho-0.14.x/tycho-packaging-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-packaging-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-packaging-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-packaging-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-pomgenerator-plugin/pom.xml tycho-0.14.x/tycho-pomgenerator-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-pomgenerator-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-pomgenerator-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-pomgenerator-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-release/pom.xml tycho-0.14.x/tycho-release/pom.xml
+--- tycho-0.14.x.old/tycho-release/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-release/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-release</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-release/tycho-versions-plugin/pom.xml tycho-0.14.x/tycho-release/tycho-versions-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-release/tycho-versions-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-release/tycho-versions-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-release</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-versions-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-source-plugin/pom.xml tycho-0.14.x/tycho-source-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-source-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-source-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-source-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.junit</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -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.1
++Bundle-Version: 0.14.1.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.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400
+@@ -7,6 +7,6 @@
+ jars/surefire-booter-2.10.jar,
+ jars/surefire-api-2.10.jar
+-Bundle-Version: 0.14.1
++Bundle-Version: 0.14.1.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.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+--- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-surefire/pom.xml tycho-0.14.x/tycho-surefire/pom.xml
+--- tycho-0.14.x.old/tycho-surefire/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-surefire</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/pom.xml tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/pom.xml
+--- tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tycho-surefire-plugin</artifactId>
+diff -rauN tycho-0.14.x.old/tycho-testing-harness/pom.xml tycho-0.14.x/tycho-testing-harness/pom.xml
+--- tycho-0.14.x.old/tycho-testing-harness/pom.xml 2012-02-24 06:40:15.000000000 -0500
++++ tycho-0.14.x/tycho-testing-harness/pom.xml 2012-03-30 14:49:39.000000000 -0400
+@@ -17,7 +17,7 @@
+ <parent>
+ <artifactId>tycho</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+- <version>0.14.1</version>
++ <version>0.14.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>tycho-testing-harness</artifactId>
+
diff --git a/tycho.spec b/tycho.spec
index 16106fc..847bc08 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,4 @@
-%global bootstrap 0
-
+%global bootstrap 1
%global eclipsedir %{_libdir}/eclipse
%if %{bootstrap}
@@ -10,7 +9,7 @@
Name: tycho
Version: 0.14.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -27,15 +26,12 @@ Source1: EmptyMojo.java
# we need to make sure we are using maven 3 deps
Source2: depmap.xml
-%if %{bootstrap}
-Source3: maven-repo.tar.xz
-%endif
Patch0: %{name}-fix-build.patch
-%if %{bootstrap}
# 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
+%if %{bootstrap}
+Patch1: %{name}-bootstrap.patch
%endif
BuildArch: noarch
@@ -59,13 +55,13 @@ BuildRequires: maven-verifier-plugin
BuildRequires: plexus-containers-component-metadata
BuildRequires: eclipse-jdt
BuildRequires: decentxml
-%if ! %{bootstrap}
-BuildRequires: tycho
-%endif
+BuildRequires: %{name}
Requires: jpackage-utils
Requires: decentxml
Requires: maven
+Requires: maven-shared-verifier
+Requires: maven-surefire-provider-junit4
Requires: eclipse-jdt
Requires(post): jpackage-utils
@@ -123,10 +119,6 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject
cp %{SOURCE1} .
popd
-%if %{bootstrap}
-tar xf %{SOURCE3}
-%endif
-
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
export TYCHO_TARGET_PLATFORM=%{eclipsedir}
@@ -139,7 +131,7 @@ 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} \
+ tycho-{core,embedder-api,testing-harness} \
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 \
@@ -197,7 +189,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
-* Fri Mar 10 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-1
+* Tue Mar 27 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-1.1
+- Add missing tycho-testing-harness to be packaged.
+
+* Fri Mar 9 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-1
- Update to 0.14.1 upstream tag.
- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
More information about the java-sig-commits
mailing list