[tycho] Set the global default execution environment to JavaSE-1.6.
Roland Grunberg
rgrunber at fedoraproject.org
Mon Feb 25 21:15:28 UTC 2013
commit a9e1e45c3d6bc1134b4e2bdf3733100ab614d77c
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Mon Feb 25 14:15:25 2013 -0500
Set the global default execution environment to JavaSE-1.6.
This has changed from JavaSE-1.6 (Tycho 0.16.0) to J2SE-1.5 in Tycho
0.17.0-SNAPSHOT. It must be JavaSE-1.6 for Fedora.
tycho-bootstrap.patch | 404 ++++++++++++++++----------------
tycho-fix-build.patch | 45 +++-
tycho-fix-junit-versions.patch | 38 ---
tycho-fix-surefire-api-change.patch | 11 -
tycho-fix-surefire.patch | 20 +-
tycho-maven-surefire.patch | 28 ++--
tycho-set-reactor-cache-version.patch | 4 +-
tycho-use-custom-resolver.patch | 42 +++--
tycho.spec | 16 +-
9 files changed, 301 insertions(+), 307 deletions(-)
---
diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch
index a8f8000..da147f4 100644
--- a/tycho-bootstrap.patch
+++ b/tycho-bootstrap.patch
@@ -1,867 +1,867 @@
diff --git a/pom.xml b/pom.xml
-index ed2d224..87098a2 100644
+index 41e8bdf..6c04bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
<packaging>pom</packaging>
<name>Tycho (Incubation)</name>
diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml
-index de8536e..d5770b2 100644
+index b7db347..63dc8de 100644
--- a/sisu-equinox/pom.xml
+++ b/sisu-equinox/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>sisu-equinox</artifactId>
diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml
-index 0f0b76f..0fefe9f 100644
+index 9adad77..faaa7e0 100644
--- a/sisu-equinox/sisu-equinox-api/pom.xml
+++ b/sisu-equinox/sisu-equinox-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>sisu-equinox-api</artifactId>
diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml
-index b04fe7c..08cea80 100644
+index 4f3268d..c4faf98 100644
--- a/sisu-equinox/sisu-equinox-embedder/pom.xml
+++ b/sisu-equinox/sisu-equinox-embedder/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>sisu-equinox-embedder</artifactId>
diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml
-index 7d9b6da..5ffa76e 100644
+index 6742941..1f58fe0 100644
--- a/sisu-equinox/sisu-equinox-launching/pom.xml
+++ b/sisu-equinox/sisu-equinox-launching/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>sisu-equinox-launching</artifactId>
diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
-index ce749e7..a7a8629 100644
+index 67beabe..47c20ea 100644
--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>target-platform-configuration</artifactId>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
-index 720feb5..11bcb70 100644
+index 5fa695c..01815d8 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-artifactcomparator</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
-index 86dae92..16677f5 100644
+index cd6303d..2fd877c 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.core.shared
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="4.8.2"
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
-index e87c76b..2cffad0 100644
+index 011f8d9..0623476 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
-index 2ec4dcb..22e8105 100644
+index c72f2e5..b55f695 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.core.shared
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Name: Tycho Core Maven/OSGi Shared Classes (Incubation)
Bundle-Vendor: %providerName
Export-Package: org.eclipse.tycho.artifacts,
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
-index 050d6ba..dac02f4 100644
+index 333f4be..1feed73 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.core.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
-index 6807552..c418a01 100644
+index e3a119e..8af27eb 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes (Incubation)
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
-index d2e77ed..c7702de 100644
+index 8cc7d93..92692cc 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
-index 665eb95..0d6d0d2 100644
+index 898d6c0..ebadfd1 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Noop Equinox password provider (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
-index 2aa0e42..1d71dbb 100644
+index 1d2ce7e..45e0acd 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.noopsecurity</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
-index 4f71bc1..9ac1b2c 100644
+index fc38d0c..99454f8 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
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.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.maven.repository
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
-index 85310b8..296a0f6 100644
+index 1b267cb..42b3819 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
-index 5a23f51..f4b71b6 100644
+index 3bc2ac0..4e489de 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Maven/p2 Repository Integration (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
-index 6bc1516..15ac2aa 100644
+index 3700864..236aefa 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
-index b4608ea..8fd7fbb 100644
+index 0af92d6..a9601a7 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
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.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.resolver.impl
- Require-Bundle: org.junit4,
+ Require-Bundle: org.junit,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
-index 3f2e02a..ef860c8 100644
+index 47e308d..95eda35 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
-index 861d2d3..9a32ccf 100644
+index f17107d..8eedc97 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho p2 Resolver Bundle (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.security;bundle-version="1.0.100",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
-index c5ce76b..56fd319 100644
+index f9ec095..8ce7fe1 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
-index 5c2c2c2..dd29ccd 100644
+index 06f8b77..21597cd 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Export-Package:
org.eclipse.tycho.p2.resolver.facade,
org.eclipse.tycho.p2.target.facade,
org.eclipse.tycho.repository.registry.facade
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes (Incubation)
Bundle-ManifestVersion: 2
Bundle-Description: Tycho integrates Maven with Eclipse and OSGi
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
-index c487ff1..7f3d500 100644
+index cd41d86..172129b 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
-index d784af5..4cadf4e 100644
+index d337405..e546847 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
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 --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
-index ae6eb2c..98cb0bf 100644
+index f3e3154..eb40f79 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
-index db3c200..cddb8c5 100644
+index 766dc78..d6a3c0f 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
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 --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
-index 32bf52a..53ed0f0 100644
+index 8f4600f..155792f 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
-index 7f07fca..c24cd6c 100644
+index ea9d748..bff6996 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho p2 Tools Tests (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
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 --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
-index 7abd0c4..1fc80fc 100644
+index a69e064..0f5158d 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
-index 7a2e68c..285ebe7 100644
+index 5e6ab7e..4c24309 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Test Utilities (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.test.utils
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
org.eclipse.equinox.p2.core;bundle-version="1.0.100",
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
-index 50998ae..9d3b589 100644
+index c207704..d8d4aee 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.test.utils</artifactId>
diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml
-index 6071dc1..8e4f857 100644
+index dc44c77..386414d 100644
--- a/tycho-bundles/pom.xml
+++ b/tycho-bundles/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-bundles</artifactId>
diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml
-index aa0b727..46f50a4 100644
+index 5e977b8..3207f9f 100644
--- a/tycho-bundles/tycho-bundles-external/pom.xml
+++ b/tycho-bundles/tycho-bundles-external/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-bundles-external</artifactId>
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index 9e53672..8b54310 100644
+index 4733ad0..466aba6 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.16.0" useFeatures="false" includeLaunchers="false">
-+<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.16.0.qualifier" useFeatures="false" includeLaunchers="false">
+-<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.17.0.qualifier" useFeatures="false" includeLaunchers="false">
++<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.17.0" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml
-index 8027cd7..ab65018 100644
+index 76fca16..52ba169 100644
--- a/tycho-bundles/tycho-bundles-target/pom.xml
+++ b/tycho-bundles/tycho-bundles-target/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml
-index f5e7e8d..c8fd41b 100644
+index b6b0c9b..acaa17e 100644
--- a/tycho-bundles/tycho-standalone-p2-director/pom.xml
+++ b/tycho-bundles/tycho-standalone-p2-director/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-standalone-p2-director</artifactId>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
-index 712e431..c373e6a 100644
+index 8a12fde..fa6c17c 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-compiler-jdt</artifactId>
diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
-index 6fe696f..48086c8 100644
+index 0c8160b..6695f26 100644
--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
-index c3d5288..b3aa4b1 100644
+index 1c4f3a8..4d06441 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-core</artifactId>
diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml
-index bffb15a..8221ee1 100644
+index 11a2063..cf3a53d 100644
--- a/tycho-embedder-api/pom.xml
+++ b/tycho-embedder-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-embedder-api</artifactId>
diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
-index 030888b..5c56be6 100644
+index 504c4bd..4a296d5 100644
--- a/tycho-its/pom.xml
+++ b/tycho-its/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-its</artifactId>
diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml
-index bf3448f..d0f4887 100644
+index 2f8d41b..d54aa09 100644
--- a/tycho-maven-plugin/pom.xml
+++ b/tycho-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-maven-plugin</artifactId>
diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml
-index 940ab1a..3c294ce 100644
+index 9ea1262..0b2da1b 100644
--- a/tycho-metadata-model/pom.xml
+++ b/tycho-metadata-model/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-metadata-model</artifactId>
diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml
-index 1beff0b..69fd0cc 100644
+index fd0b562..a8a996b 100644
--- a/tycho-p2/pom.xml
+++ b/tycho-p2/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2</artifactId>
diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
-index 9f5ea22..8e69cea 100644
+index c195fb0..8243628 100644
--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2-director-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
-index 9a6d1e8..9dea239 100644
+index eb24017..b0d9910 100644
--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2-facade</artifactId>
diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml
-index 549c9ae..bcaa69d 100644
+index 9d30f82..7f17f2e 100644
--- a/tycho-p2/tycho-p2-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
-index f412b33..3e633db 100644
+index 74bca61..a4d6464 100644
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2-publisher-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml
-index d018877..608b023 100644
+index e0d2387..3b83a27 100644
--- a/tycho-p2/tycho-p2-repository-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-p2-repository-plugin</artifactId>
diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
-index 7e72161..de329c9 100644
+index 5f31f6f..babc099 100644
--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-packaging-plugin</artifactId>
diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml
-index 01ac8bc..8447652 100644
+index 2335234..521489b 100644
--- a/tycho-pomgenerator-plugin/pom.xml
+++ b/tycho-pomgenerator-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-pomgenerator-plugin</artifactId>
diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml
-index 5c331ca..304c0a6 100644
+index 8094816..c531618 100644
--- a/tycho-release/pom.xml
+++ b/tycho-release/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-release</artifactId>
diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
-index 5cd1956..6b5d4fe 100644
+index e3444f6..d066280 100644
--- a/tycho-release/tycho-versions-plugin/pom.xml
+++ b/tycho-release/tycho-versions-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-release</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-versions-plugin</artifactId>
diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml
-index 206a28d..b0f47ca 100644
+index 2d0fa37..b15fe71 100644
--- a/tycho-source-plugin/pom.xml
+++ b/tycho-source-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-source-plugin</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-index ad76bc9..264dedd 100644
+index f9c5bc1..e1afc7e 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Surefire OSGi JUnit3 Runner (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.surefire.junit;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
-index 9ff127c..188c45c 100644
+index cbeeaf0..a15c972 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.junit</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-index 916938b..4e46d83 100644
+index fa146d5..1b27a6c 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Surefire OSGi JUnit4 Runner (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.surefire.junit4;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
-index 4701d48..ecf287c 100644
+index d88a349..bcb4d39 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
-index d0ddf01..f77581e 100644
+index 29a160d..a4831a6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tycho Surefire OSGi JUnit4.7 Runner (Incubation)
Bundle-SymbolicName: org.eclipse.tycho.surefire.junit47;singleton:=true
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
-index df730e1..dd3b995 100644
+index eb9104e..678fb0c 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.junit47</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-index 51abc8d..d893a61 100644
+index 4913119..ceb4814 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .,
jars/surefire-api-2.13.jar,
jars/maven-surefire-common-2.13.jar,
jars/plexus-utils-3.0.jar
--Bundle-Version: 0.16.0
-+Bundle-Version: 0.16.0.qualifier
+-Bundle-Version: 0.17.0.qualifier
++Bundle-Version: 0.17.0
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 23829a2..ef1cbcc 100644
+index 555eef8..9ac6c89 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
-index 24e51d3..a7c914d 100644
+index 985e8f3..4f9d39f 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-surefire</artifactId>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
-index 2970388..e24eb32 100644
+index de9f60d..d620d92 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-surefire-plugin</artifactId>
diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml
-index 3bc2251..d2d0250 100644
+index 8eee619..074ab6d 100644
--- a/tycho-testing-harness/pom.xml
+++ b/tycho-testing-harness/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.16.0</version>
-+ <version>0.16.0-SNAPSHOT</version>
+- <version>0.17.0-SNAPSHOT</version>
++ <version>0.17.0</version>
</parent>
<artifactId>tycho-testing-harness</artifactId>
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 0e3111f..8453287 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,7 +1,7 @@
-From 06f5c9b4caf08c1aa2a3febb67a9db1e2f7c3781 Mon Sep 17 00:00:00 2001
+From 60d5610ddd39fb890687bb8c0a3b1255c6d01914 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
-Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
+Subject: [PATCH] Fix the Tycho build to work on Fedora.
Minor fixes of limited scope needed to have Tycho building on Fedora.
@@ -14,10 +14,15 @@ checking. We must keep previous build version strings different to avoid
a cyclic dependency, but doing so causes the version checking to fail,
so we must provide a way to disable it. (skipTychoVersionCheck)
+As of Eclipse Kepler, the bundle 'org.junit4' is no longer provided.
+Packages requiring JUnit 4 must use proper versioning on 'org.junit'.
+
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 5 -----
tycho-artifactcomparator/pom.xml | 4 ++--
+ .../META-INF/MANIFEST.MF | 2 +-
+ .../META-INF/MANIFEST.MF | 2 +-
.../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
.../tycho-standalone-p2-director/p2 Director.product | 1 -
@@ -25,10 +30,10 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 9 files changed, 19 insertions(+), 21 deletions(-)
+ 11 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
-index afe83e3..ed2d224 100644
+index 5776b0e..41e8bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,11 +226,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
@@ -44,7 +49,7 @@ index afe83e3..ed2d224 100644
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
-index 0a4ed6d..720feb5 100644
+index 27e15a9..5fa695c 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -24,7 +24,7 @@
@@ -63,6 +68,32 @@ index 0a4ed6d..720feb5 100644
-</project>
\ No newline at end of file
+</project>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+index e65eb5b..fc38d0c 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
++++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.maven.repository
+-Require-Bundle: org.junit4;bundle-version="4.8.1",
++Require-Bundle: org.junit;bundle-version="4.8.1",
+ org.eclipse.equinox.p2.publisher;bundle-version="1.2.0",
+ org.eclipse.equinox.ds;bundle-version="1.4.0",
+ org.eclipse.tycho.p2.resolver.impl
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+index 80be496..0af92d6 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
+ Bundle-Version: 0.17.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.resolver.impl
+-Require-Bundle: org.junit4,
++Require-Bundle: org.junit,
+ org.eclipse.equinox.ds,
+ org.eclipse.equinox.p2.transport.ecf
+ Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
index 87c9e11..927cea5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
@@ -77,7 +108,7 @@ index 87c9e11..927cea5 100644
} else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) {
result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version));
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index b12ff8c..9e53672 100644
+index dea801e..4733ad0 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -41,7 +41,6 @@
@@ -101,7 +132,7 @@ index dd80b5e..797b4ba 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
-index 4212cbb..712e431 100644
+index 9872fd7..8a12fde 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@
diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch
index cc78c79..13c864f 100644
--- a/tycho-fix-surefire.patch
+++ b/tycho-fix-surefire.patch
@@ -1,4 +1,4 @@
-From 468686d5055b5a7d67e50e844bfebb7c64cacc30 Mon Sep 17 00:00:00 2001
+From 315e4a7a7e116d7c85749449e7f9d2729fc4d0a5 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Fri, 21 Sep 2012 10:58:09 -0400
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
@@ -24,21 +24,21 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
6 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-index a456dbc..fea0de0 100644
+index 63da107..27d4a2b 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-@@ -6,6 +6,7 @@ Bundle-Version: 0.16.0
+@@ -6,6 +6,7 @@ Bundle-Version: 0.17.0.qualifier
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)"
-Bundle-ClassPath: jars/surefire-junit3-2.13.jar
-+Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
++Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
+Bundle-ClassPath: jars/surefire-junit3-2.13.jar,
+ jars/common-junit3-2.13.jar
Bundle-Vendor: %providerName
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
-index dce4c4f..9ff127c 100644
+index 42c4a97..cbeeaf0 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -44,6 +44,11 @@
@@ -54,10 +54,10 @@ index dce4c4f..9ff127c 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-index 88cc2bb..97524f8 100644
+index b5a9203..fa146d5 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-@@ -6,7 +6,9 @@ Bundle-Version: 0.16.0
+@@ -6,7 +6,9 @@ Bundle-Version: 0.17.0.qualifier
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@@ -69,7 +69,7 @@ index 88cc2bb..97524f8 100644
org.junit;version="4.0.0",
org.junit.runner;version="4.0.0",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
-index 92ba3fb..4701d48 100644
+index 71ba06e..d88a349 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -44,6 +44,16 @@
@@ -90,7 +90,7 @@ index 92ba3fb..4701d48 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
-index 22fd6eb..64f1c91 100644
+index 3aad05e..29a160d 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -105,7 +105,7 @@ index 22fd6eb..64f1c91 100644
org.junit;version="[4.7,5)",
org.junit.runner;version="[4.7,5)",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
-index 45b5c65..df730e1 100644
+index 1c465a7..eb9104e 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -54,6 +54,16 @@
diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch
index 9369b10..0409f49 100644
--- a/tycho-maven-surefire.patch
+++ b/tycho-maven-surefire.patch
@@ -1,4 +1,4 @@
-From dac3890f02ac6deccf238a1b78754b7c08a1e7b5 Mon Sep 17 00:00:00 2001
+From 62a1273b971ccd9fdba754c22469613bbf09d868 Mon Sep 17 00:00:00 2001
From: Jan Sievers <jan.sievers at sap.com>
Date: Tue, 4 Sep 2012 16:02:52 +0200
Subject: [PATCH] POC 386481 update maven surefire to latest version 2.13
@@ -42,7 +42,7 @@ Change-Id: Ibcb439a24add880c4cdafe67b42e29ca3cb14ff1
delete mode 100644 tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreRunListener.java
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-index ada8852..a456dbc 100644
+index 6d0559a..63da107 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
@@ -64,10 +64,10 @@ index 499ce76..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-index ac40634..88cc2bb 100644
+index de18fd6..b5a9203 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-@@ -6,7 +6,7 @@ Bundle-Version: 0.16.0
+@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0.qualifier
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@@ -88,10 +88,10 @@ index b787149..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
-index 578ad2c..22fd6eb 100644
+index 752b471..3aad05e 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
-@@ -6,11 +6,14 @@ Bundle-Version: 0.16.0
+@@ -6,11 +6,14 @@ Bundle-Version: 0.17.0.qualifier
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
@@ -123,7 +123,7 @@ index 716961d..2589258 100644
about_files/
-source.. = src/
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
-index 44c3e8a..45b5c65 100644
+index 6a7f598..1c465a7 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -44,6 +44,16 @@
@@ -382,7 +382,7 @@ index fb6bede..0000000
-
-}
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-index 00f8fee..73a0065 100644
+index 24107e1..4913119 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -4,8 +4,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
@@ -399,7 +399,7 @@ index 00f8fee..73a0065 100644
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 100806a..23829a2 100644
+index bb5ba5e..555eef8 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -52,6 +52,16 @@
@@ -420,7 +420,7 @@ index 100806a..23829a2 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-index 791221b..a305667 100644
+index 791221b..72a5f75 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
@@ -18,20 +18,25 @@ import java.io.IOException;
@@ -494,7 +494,7 @@ index 791221b..a305667 100644
+ RunResult result = ProviderFactory.invokeProvider(null, testClassLoader, surefireClassLoader,
+ createReporterFactory(startupReportConfig), providerConfiguration, false, startupConfiguration, true);
+
-+ return result.getFailsafeCode();
++ return result.getFailsafeCode() == null ? 0 : result.getFailsafeCode();
+ }
+
+ private static ReporterFactory createReporterFactory(StartupReportConfiguration startupReportConfig) {
@@ -503,7 +503,7 @@ index 791221b..a305667 100644
/*
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
-index eab06be..e6e9b9f 100644
+index aab6422..985e8f3 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -26,7 +26,7 @@
@@ -516,7 +516,7 @@ index eab06be..e6e9b9f 100644
<modules>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
-index 8a099eb..2970388 100644
+index 2f8c3fa..de9f60d 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -96,5 +96,10 @@
@@ -531,7 +531,7 @@ index 8a099eb..2970388 100644
</dependencies>
</project>
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
-index 393007b..ba936e5 100644
+index 57abaec..127d55b 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
@@ -18,6 +18,7 @@ import java.io.IOException;
diff --git a/tycho-set-reactor-cache-version.patch b/tycho-set-reactor-cache-version.patch
index 6093367..11f9237 100644
--- a/tycho-set-reactor-cache-version.patch
+++ b/tycho-set-reactor-cache-version.patch
@@ -6,8 +6,8 @@ index afe83e3..2cc9a6a 100644
<jdtAptVersion>1.0.500.v20120522-1651</jdtAptVersion>
<!-- version of tycho used by this build -->
-- <tychoBootstrapVersion>0.15.0</tychoBootstrapVersion>
-+ <tychoBootstrapVersion>0.16.0-SNAPSHOT</tychoBootstrapVersion>
+- <tychoBootstrapVersion>0.16.0</tychoBootstrapVersion>
++ <tychoBootstrapVersion>0.17.0</tychoBootstrapVersion>
</properties>
<dependencyManagement>
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 3a19705..b251c1b 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From d2140837249eb18247adf7ae9399c1092803f8f5 Mon Sep 17 00:00:00 2001
+From 3f7a7496cb2038b7840bd5983df1a339723fce52 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -24,19 +24,20 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
tycho-core/pom.xml | 5 ++
+ .../ee/ExecutionEnvironmentConfigurationImpl.java | 2 +-
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
.../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++-
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 12 +++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
- 9 files changed, 159 insertions(+), 10 deletions(-)
+ 10 files changed, 160 insertions(+), 11 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-index 5cc8718..7e4fcc1 100644
+index 6ea8a81..e90d279 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException;
+@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -62,7 +63,7 @@ index 5cc8718..7e4fcc1 100644
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
-index c56eeff..bb45548 100644
+index 3b8b9ab..b98c254 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
@@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
@@ -75,7 +76,7 @@ index c56eeff..bb45548 100644
import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
-@@ -225,6 +228,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+@@ -231,6 +234,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
IMetadataRepository metadataRepository = null;
IArtifactRepository artifactRepository = null;
@@ -88,7 +89,7 @@ index c56eeff..bb45548 100644
try {
remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
-@@ -365,12 +374,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+@@ -372,12 +381,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
result.addAll(contentPart.getUnits());
}
@@ -143,7 +144,7 @@ index c56eeff..bb45548 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
-index c3d5288..d76c229 100644
+index 6f936b9..1c4f3a8 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -146,6 +146,11 @@
@@ -158,6 +159,19 @@ index c3d5288..d76c229 100644
<dependency>
<groupId>org.eclipse.tycho</groupId>
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
+index d14cb48..51c7a98 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
+@@ -18,7 +18,7 @@ import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
+ import org.eclipse.tycho.core.ee.shared.SystemCapability;
+
+ public class ExecutionEnvironmentConfigurationImpl implements ExecutionEnvironmentConfiguration {
+- private static final String DEFAULT_EXECUTION_ENVIRONMENT = "J2SE-1.5";
++ private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-1.6";
+
+ private static final int PRIMARY = 0;
+ private static final int SECONDARY = 1;
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
index cccb6ff..fb8bf78 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -193,7 +207,7 @@ index cccb6ff..fb8bf78 100644
resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-index 695133d..6303f48 100644
+index 695133d..ad25d9c 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
@@ -20,6 +20,9 @@ import org.eclipse.tycho.artifacts.TargetPlatform;
@@ -246,7 +260,7 @@ index 695133d..6303f48 100644
return (TargetPlatform) project.getContextValue(TychoConstants.CTX_TARGET_PLATFORM);
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-index fb73469..6c2cee3 100644
+index f818671..18ae1b4 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
@@ -45,7 +45,9 @@ import org.eclipse.tycho.core.BundleProject;
@@ -301,7 +315,7 @@ index fb73469..6c2cee3 100644
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
-index 5c4a26f..802c9dd 100644
+index 63dba63..d292773 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
@@ -64,7 +64,11 @@ public class DefaultTargetPlatformConfigurationReader {
@@ -318,7 +332,7 @@ index 5c4a26f..802c9dd 100644
setTargetPlatformResolver(result, configuration);
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
-index 9935c5f..8f63735 100644
+index 1e878e5..19db009 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java
@@ -38,6 +38,9 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
@@ -348,10 +362,10 @@ index 9935c5f..8f63735 100644
request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false);
diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
-index 1c897b9..d869658 100644
+index d6cbc6d..85e2c0d 100644
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
-@@ -191,6 +191,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
+@@ -189,6 +189,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
tpBuilder.setProjectLocation(project.getBasedir());
tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts());
tpBuilder.setFailOnDuplicateIUs(failOnDuplicateIUs);
diff --git a/tycho.spec b/tycho.spec
index 740cb41..4aed15f 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -8,7 +8,7 @@
Name: tycho
Version: 0.17.0
-Release: 0.1.git3351b1%{?dist}
+Release: 0.2.git3351b1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -46,9 +46,6 @@ Patch6: %{name}-remove-units.patch
# Additional changes needed just for bootstrap build
Patch7: %{name}-fix-bootstrap-build.patch
-Patch8: %{name}-fix-surefire-api-change.patch
-Patch9: %{name}-fix-junit-versions.patch
-
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -136,6 +133,8 @@ This package contains the API documentation for %{name}.
find tycho-core -iname '*html' -delete
+sed -i -e 's/org.apache.maven.it.util.DirectoryScanner/org.apache.maven.shared.utils.io.DirectoryScanner/g' tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+
# place empty mojo in place
mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject
pushd tycho-maven-plugin/src/main/java/org/fedoraproject
@@ -160,9 +159,6 @@ buildVer=`grep -C 1 "<artifactId>tycho</artifactId>" pom.xml | grep "version" |
echo "System version is ${sysVer} and attempting to build ${buildVer}."
-%patch8 -p1
-%patch9 -p1
-
# If version installed on system is the same as the version being built
# an intermediary build must be done to prevent a cycle at build time.
if [ "${sysVer}" == "${buildVer}" ]; then
@@ -177,8 +173,6 @@ fi
%endif
-
-sed -i -e 's/org.apache.maven.it.util.DirectoryScanner/org.apache.maven.shared.utils.io.DirectoryScanner/g' tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
%build
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true clean install javadoc:aggregate
@@ -265,6 +259,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Mon Feb 25 2013 Roland Grunberg <rgrunber at redhat.com> 0.17.0-0.2.git3351b1
+- Set the global default execution environment to JavaSE-1.6.
+- Patch clean-up.
+
* Mon Feb 25 2013 Krzysztof Daniel <kdaniel at redhat.com> 0.17.0-0.1.git3351b1
- Update to latest upstream.
- RHBZ#915194 - API changed in maven-surefire
More information about the scm-commits
mailing list