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

[Roland Grunberg]

commit 2cd60a3709b756c5d79dccca41b0e12042e70cb0
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Fri Aug 24 10:58:09 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-use-custom-resolver.patch |   61 ++++++++++++++------------------------
 tycho.spec                      |    5 ++-
 2 files changed, 27 insertions(+), 39 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index ecb1374..5f9cab0 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,7 +1,7 @@
-From 1140fc003d9934e09b7c8f416fc87b0e8dcf3b0e Mon Sep 17 00:00:00 2001
+From 9dea234b988c593f22f9c6c77a453b2fa155c157 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.
+Subject: [PATCH 3/3] Implement a custom resolver for Tycho in local mode.
 
 When running in local mode, dependencies should be resolved by looking
 on the local system. Remote repositories should be ignored unless
@@ -24,12 +24,12 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
  .../tycho/p2/target/TargetDefinitionResolver.java  |  8 +++-
  .../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    | 38 ++++++++++++++-
  .../DefaultTargetPlatformConfigurationReader.java  |  5 +-
  .../tycho/osgi/runtime/TychoP2RuntimeLocator.java  | 17 +++++++
  .../p2/resolver/P2TargetPlatformResolver.java      | 10 ++++
- 8 files changed, 162 insertions(+), 9 deletions(-)
+ 8 files changed, 151 insertions(+), 10 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 6a85c49..d9d6055 100644
@@ -172,44 +172,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 060a844..dbbe51a 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.TargetEnvironment;
- import org.eclipse.tycho.core.TychoProject;
-+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 3fc622a..03a710b 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 fe6383f..d037faf 100644
 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
diff --git a/tycho.spec b/tycho.spec
index 6f6b22c..61fc3ac 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
 
 Name:           tycho
 Version:        0.15.0
-Release:        4.1%{?dist}
+Release:        5.1%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -183,6 +183,9 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Aug 24 2012 Roland Grunberg <rgrunber at redhat.com> 0.15.0-5.1
+- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
+
 * Wed Aug 22 2012 Roland Grunberg <rgrunber at redhat.com> 0.15.0-4.1
 - Fix local mode resolution bug.
 - Update spec file to honour new java packaging guidelines.