[tycho] Set BREE to at least JavaSE-1.6 for all eclipse packaging types.

[Roland Grunberg]

commit ba49332349d64d62571b8a968b1e971448181c6d
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Aug 23 14:47:33 2012 -0400

    Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
    
    We set the BREE to JavaSE-1.6 for 'eclipse-plugin',
    'eclipse-test-plugin', and 'eclipse-feature' packaging types but we
    should do this for all packaging types. (eg. 'eclipse-repository',
    'eclipse-application', 'eclipse-update-site')

 tycho-fix-swt.patch             |  129 ---------------------------------------
 tycho-use-custom-resolver.patch |   61 +++++++-----------
 tycho.spec                      |    7 ++-
 3 files changed, 28 insertions(+), 169 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 587056d..975d3c5 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 595646a547fca48d8211b29f9951190ba737f42a Mon Sep 17 00:00:00 2001
+From 3f23b14c4853e12d023b1e5a1a330997d034274d 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,12 +24,12 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
  .../tycho/p2/target/TargetDefinitionResolver.java  | 10 ++--
  .../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
  .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
- .../core/osgitools/EclipseFeatureProject.java      | 22 +++++++++
+ .../tycho/core/osgitools/AbstractTychoProject.java | 12 ++++-
  .../tycho/core/osgitools/OsgiBundleProject.java    | 42 ++++++++++++++++-
  .../DefaultTargetPlatformConfigurationReader.java  |  5 +-
  .../tycho/osgi/runtime/TychoP2RuntimeLocator.java  | 15 ++++++
  .../p2/resolver/P2TargetPlatformResolver.java      | 10 ++++
- 8 files changed, 164 insertions(+), 11 deletions(-)
+ 8 files changed, 153 insertions(+), 12 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 5fdc6a1..838e267 100644
@@ -174,44 +174,29 @@ index 0dd2fd4..15669a6 100644
          for (MavenProject project : projects) {
              resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
          }
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
-index 0fe42a6..1bc3a6e 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
-@@ -21,6 +21,9 @@ import org.eclipse.tycho.core.ArtifactDependencyVisitor;
- import org.eclipse.tycho.core.ArtifactDependencyWalker;
- import org.eclipse.tycho.core.TychoProject;
- import org.eclipse.tycho.core.facade.TargetEnvironment;
-+import org.eclipse.tycho.core.UnknownEnvironmentException;
-+import org.eclipse.tycho.core.utils.ExecutionEnvironment;
-+import org.eclipse.tycho.core.utils.ExecutionEnvironmentUtils;
- import org.eclipse.tycho.model.Feature;
+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 283770a..c642392 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
+@@ -98,7 +98,17 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
+             }
  
- @Component(role = TychoProject.class, hint = org.eclipse.tycho.ArtifactKey.TYPE_ECLIPSE_FEATURE)
-@@ -49,4 +52,23 @@ public class EclipseFeatureProject extends AbstractArtifactBasedProject {
-         Feature.loadFeature(project.getBasedir());
-     }
- 
-+    @Override
-+    public ExecutionEnvironment getExecutionEnvironment(MavenProject project) {
-+        ExecutionEnvironment ee = super.getExecutionEnvironment(project);
+             try {
+-                return ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
++                ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
 +
-+        if (System.getProperty("maven.local.mode") != null && ee != null) {
-+            try {
-+                // EE must be at least JavaSE-1.6
-+                final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
-+                if (ee.compareTo(javaSE16) < 0) {
-+                    ee = javaSE16;
++                if (System.getProperty("maven.local.mode") != null) {
++                    // EE must be at least JavaSE-1.6
++                    final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
++                    if (ee.compareTo(javaSE16) < 0) {
++                        ee = javaSE16;
++                    }
 +                }
-+            } catch (UnknownEnvironmentException e) {
-+                // Continue
-+            }
-+        }
-+
-+        return ee;
-+    }
 +
- }
++                return ee;
+             } catch (UnknownEnvironmentException e) {
+                 // can't happen, ee is validated during configuration parsing
+             }
 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 c4b783e..e83dd72 100644
 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
@@ -347,5 +332,5 @@ index 4db1bd4..b45a4ea 100644
  
          addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder);
 -- 
-1.7.11.2
+1.7.11.4
 
diff --git a/tycho.spec b/tycho.spec
index c671a5f..a521101 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
 %global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
 
 %if %{bootstrap}
@@ -9,7 +9,7 @@
 
 Name:           tycho
 Version:        0.16.0
-Release:        5.df2c35%{?dist}
+Release:        5.1.df2c35%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -191,6 +191,9 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-5.1.df2c35
+- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
+
 * Wed Aug 15 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-5.df2c35
 - Non-bootstrap build.