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-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@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 @@

tycho-fix-junit-versions.patch

@@ -1,38 +0,0 @@
---- tycho-0.16.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF.abk	2013-02-25 09:02:04.000000000 +0100
-+++ tycho-0.16.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF	2013-02-25 09:52:56.945987412 +0100
-@@ -6,10 +6,10 @@
- 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",
-- org.eclipse.equinox.p2.publisher;bundle-version="1.2.0",
-+Require-Bundle: 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
-+ org.eclipse.tycho.p2.resolver.impl,
-+ org.junit
- Import-Package: org.eclipse.tycho.locking.facade,
-  org.eclipse.tycho.repository.test.util,
-  org.eclipse.tycho.test.util
---- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF.bak	2012-10-19 10:07:18.000000000 +0200
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF	2013-02-25 09:57:10.809232586 +0100
-@@ -5,7 +5,7 @@
- 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
---- org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF.orig	2013-02-25 12:29:06.000000000 +0100
-+++ org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF	2013-02-25 12:29:37.091637429 +0100
-@@ -6,7 +6,7 @@
- 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.9.0)"
-+Require-Bundle: org.junit
- Bundle-ClassPath: jars/surefire-junit3-2.13.jar,
-  jars/common-junit3-2.13.jar
- Bundle-Vendor: %providerName

tycho-fix-surefire-api-change.patch

@@ -1,11 +0,0 @@
---- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java.bak	2013-02-23 21:21:16.000000000 +0100
-+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java	2013-02-23 21:33:27.638911936 +0100
-@@ -89,7 +89,7 @@
-         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) {

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@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 @@

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@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;

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</tychoBootstrapVersion>
-+		<tychoBootstrapVersion>0.16.0-SNAPSHOT</tychoBootstrapVersion>
++		<tychoBootstrapVersion>0.17.0</tychoBootstrapVersion>
  	</properties>
  
  	<dependencyManagement>

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@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);

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@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@redhat.com> 0.17.0-0.1.git3351b1
 - Update to latest upstream.
 - RHBZ#915194 - API changed in maven-surefire