[tycho/f18] Revert "Fix bug in overriding of BREE to JavaSE-1.6."

[Krzysztof Daniel]

commit 798680a88bc29bcf405342a569d92ca64fa59110
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Oct 8 14:10:45 2012 +0200

    Revert "Fix bug in overriding of BREE to JavaSE-1.6."
    
    This reverts commit f6d260aef7d6b53683e05dd8f8b0fbe3ec467941.

 tycho-use-custom-resolver.patch |   12 ++++++------
 tycho.spec                      |    7 ++-----
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index f1d72da..6f3160e 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 4df42326a0bc35ec82cda69c5d74e9b5d55d30d7 Mon Sep 17 00:00:00 2001
+From 301845a76668cd327760b726dfc88ddc1a3b1b50 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.
@@ -60,7 +60,7 @@ index 5cc8718..5513dda 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 d1cd5da..1cc4050 100644
+index a1be14a..c4fc948 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;
@@ -141,7 +141,7 @@ index d1cd5da..1cc4050 100644
          if (logger.isDebugEnabled()) {
              IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
 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..9e8268d 100644
+index 3efb896..329893a 100644
 --- 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
 @@ -11,6 +11,7 @@
@@ -175,7 +175,7 @@ index cccb6ff..9e8268d 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..5a698a2 100644
+index 695133d..29fb84c 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;
@@ -192,14 +192,14 @@ index 695133d..5a698a2 100644
  
          String configuredForcedProfile = tpConfiguration.getExecutionEnvironment();
          if (configuredForcedProfile != null) {
-+            configuredForcedProfile = overrideToAtLeastJavaSE16(configuredForcedProfile);
++            overrideToAtLeastJavaSE16(configuredForcedProfile);
              sink.overrideProfileConfiguration(configuredForcedProfile,
                      "target-platform-configuration <executionEnvironment>");
          }
  
          String configuredDefaultProfile = tpConfiguration.getExecutionEnvironmentDefault();
          if (configuredDefaultProfile != null) {
-+            configuredDefaultProfile = overrideToAtLeastJavaSE16(configuredDefaultProfile);
++            overrideToAtLeastJavaSE16(configuredDefaultProfile);
              sink.setProfileConfiguration(configuredDefaultProfile,
                      "target-platform-configuration <executionEnvironmentDefault>");
          }
diff --git a/tycho.spec b/tycho.spec
index 2547a92..bb51b90 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
 %global sha d7f8850f746dd72e0a97c1fdf32c06ce794fb83d
 
 %if %{bootstrap}
@@ -11,7 +11,7 @@
 
 Name:           tycho
 Version:        0.16.0
-Release:        8.1.d7f885%{?dist}
+Release:        8.d7f885%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -195,9 +195,6 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
 %{_javadocdir}/%{name}
 
 %changelog
-* Thu Oct 4 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-8.1.d7f885
-- Fix Bug in overriding of BREE to JavaSE-1.6.
-
 * Wed Oct 3 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-8.d7f885
 - Non-bootstrap build.