[tycho/f17] Non-bootstrap build.
by Roland Grunberg
commit e6684ba0810919e0d8939e7cb85c47181a680c0b
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 24 15:46:19 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 969119c..7780009 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,5 @@
%global eclipsedir %{_libdir}/eclipse
-%global bootstrap 1
+%global bootstrap 0
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.15.0
-Release: 5.1%{?dist}
+Release: 6%{?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(a)redhat.com> 0.15.0-6
+- Non-bootstrap build.
+
* Fri Aug 24 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-5.1
- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
11 years, 9 months
[tycho/f17] Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
by Roland Grunberg
commit fbb0a38308be189e54b770f1ec4866884ab4cd94
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 24 11:02:37 2012 -0400
Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
Fedora Eclipse now compiles all JSR14 upstream bundles with a target of
1.5, allowing us to leave in place parts of Tycho code that use those
particular libraries with generics.
tycho-fix-build.patch | 109 ++++---------------------------------------------
tycho.spec | 1 +
2 files changed, 9 insertions(+), 101 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index ca0efe0..00e5fd7 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,24 +1,17 @@
-From b67b6a5ab67eea4cb69d259fb7140a54355df61d Mon Sep 17 00:00:00 2001
+From 048c43afbf54608f7f3bfccaff6b85ca72ea1348 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)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 1/3] Fix the Tycho build to work on Fedora.
Minor fixes of limited scope needed to have Tycho building on Fedora.
-As of Fedora 17, the default JRE is JDK 1.7. This does not support
-JSR14. Many Eclipse OSGi bundles use JSR14 for a build target but since
-JDK 1.7 ignores certain information (eg. generics) we must be careful
-when using those libraries.
-
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
- pom.xml | 5 -----
- tycho-bundles/tycho-bundles-target/tycho.target | 2 --
- tycho-compiler-jdt/pom.xml | 4 ----
- .../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
- .../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
- .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 6 files changed, 18 insertions(+), 21 deletions(-)
+ pom.xml | 5 -----
+ tycho-bundles/tycho-bundles-target/tycho.target | 2 --
+ tycho-compiler-jdt/pom.xml | 4 ----
+ .../java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
+ 4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69e68c6..7cfb0cf 100644
@@ -64,92 +57,6 @@ index 9f7bdd7..6a1102b 100644
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
</dependency>
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-index 2859ab7..993cc58 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-@@ -25,7 +25,7 @@ public class OsgiManifest {
- private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0];
-
- private String location;
-- private Headers<String, String> headers;
-+ private Headers headers;
-
- // cache for parsed values of commonly used headers
- private String bundleSymbolicName;
-@@ -78,7 +78,7 @@ public class OsgiManifest {
- }
-
- private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException {
-- String value = headers.get(headerKey);
-+ String value = (String)headers.get(headerKey);
- if (value == null) {
- throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found");
- }
-@@ -100,12 +100,12 @@ public class OsgiManifest {
- && "dir".equals(bundleShapeElements[0].getValue());
- }
-
-- public Headers<String, String> getHeaders() {
-+ public Headers getHeaders() {
- return headers;
- }
-
- public String getValue(String key) {
-- return headers.get(key);
-+ return (String)headers.get(key);
- }
-
- public String getBundleSymbolicName() {
-@@ -141,7 +141,7 @@ public class OsgiManifest {
- }
-
- private ManifestElement[] parseHeader(String key) {
-- String value = headers.get(key);
-+ String value = (String)headers.get(key);
- if (value == null) {
- return null;
- }
-@@ -154,7 +154,7 @@ public class OsgiManifest {
-
- public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException {
- try {
-- return ManifestElement.parseHeader(key, headers.get(key));
-+ return ManifestElement.parseHeader(key, (String)headers.get(key));
- } catch (BundleException e) {
- throw new OsgiManifestParserException(location, e);
- }
-diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-index 42db7f6..a145c57 100644
---- a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-@@ -36,7 +36,7 @@ public class StandalonePluginConverterTest {
- converter.convertManifest(new File("src/test/resources/targetplatforms/pre-3.0/plugins/testjar_1.0.0.jar"), mf,
- false, "3.2", true, null);
- Assert.assertTrue(mf.isFile());
-- Headers<String, String> headers = Headers.parseManifest(new FileInputStream(mf));
-+ Headers headers = Headers.parseManifest(new FileInputStream(mf));
- Assert.assertEquals("testjar", headers.get("Bundle-SymbolicName"));
- }
-
-@@ -44,14 +44,14 @@ public class StandalonePluginConverterTest {
- public void testWriteManifest() throws PluginConversionException, BundleException, IOException {
- File tmpManifestFile = folder.newFile("testManifest");
- Hashtable<String, String> manifestToWrite = new Hashtable<String, String>();
-- Headers<String, String> originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
-+ Headers originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
- "/manifests/valid.mf"));
- for (Enumeration<String> keys = originalManifest.keys(); keys.hasMoreElements();) {
- String key = keys.nextElement();
-- manifestToWrite.put(key, originalManifest.get(key));
-+ manifestToWrite.put(key, (String)originalManifest.get(key));
- }
- converter.writeManifest(tmpManifestFile, manifestToWrite, false);
-- Headers<String, String> writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
-+ Headers writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
- assertEquals(originalManifest.size(), writtenManifest.size());
- for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
- String key = keys.nextElement();
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
index a9d80d3..3ddbe9c 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
@@ -170,5 +77,5 @@ index a9d80d3..3ddbe9c 100644
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
--
-1.7.11.2
+1.7.11.4
diff --git a/tycho.spec b/tycho.spec
index 61fc3ac..969119c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -185,6 +185,7 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%changelog
* Fri Aug 24 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-5.1
- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
+- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
* Wed Aug 22 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-4.1
- Fix local mode resolution bug.
11 years, 9 months
[tycho/f17] Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
by Roland Grunberg
commit 2cd60a3709b756c5d79dccca41b0e12042e70cb0
Author: Roland Grunberg <rgrunber(a)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(a)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(a)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(a)redhat.com> 0.15.0-4.1
- Fix local mode resolution bug.
- Update spec file to honour new java packaging guidelines.
11 years, 9 months
[tycho/f17] Update spec file to honour new java packaging guidelines.
by Roland Grunberg
commit 8a43dfc9677ac7b4432c1431b85065e53cf326b5
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 10 13:57:20 2012 -0400
Update spec file to honour new java packaging guidelines.
tycho.spec | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 8e76d71..6f6b22c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -68,9 +68,6 @@ Requires: maven-shared-verifier
Requires: maven-surefire-provider-junit4
Requires: eclipse-jdt
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
Tycho is a set of Maven plugins and extensions for building Eclipse
@@ -134,6 +131,8 @@ mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} install javadoc:aggregate
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+
+# pom and jar installation
for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
tycho-{core,embedder-api,testing-harness} \
sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
@@ -145,44 +144,34 @@ for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
aid=`basename $mod`
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
- %add_to_maven_depmap org.eclipse.tycho $aid %{version} JPP/%{name} $aid
- %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+ %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
-for pommod in tycho-p2 tycho-bundles{,/org.eclipse.tycho.p2.resolver.impl} \
- tycho-surefire tycho-release \
- sisu-equinox \
- ;do
+# pom installation
+for pommod in tycho-p2 tycho-bundles tycho-surefire \
+ tycho-release sisu-equinox; do
aid=`basename $pommod`
install -pm 644 $pommod/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
- %add_to_maven_depmap org.eclipse.tycho $aid %{version} JPP/%{name} $aid
- %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+ %add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
-# runtime
+# p2 runtime
pushd tycho-bundles/tycho-bundles-external
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
-install -m 644 target/tycho-bundles-external-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-bundles-external.zip
-%add_to_maven_depmap org.eclipse.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
-%add_to_maven_depmap org.sonatype.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
+install -m 644 target/tycho-bundles-external-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.zip
+%add_maven_depmap JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.zip -a "org.eclipse.tycho:tycho-bundles-external,org.sonatype.tycho:tycho-bundles-external"
popd
+# main
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_to_maven_depmap org.eclipse.tycho %{name} %{version} JPP/%{name} main
-%add_to_maven_depmap org.sonatype.tycho %{name} %{version} JPP/%{name} main
+%add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
-
-%post
-%update_maven_depmap
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%postun
-%update_maven_depmap
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%files
%{_mavenpomdir}/*
@@ -196,6 +185,7 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%changelog
* Wed Aug 22 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-4.1
- Fix local mode resolution bug.
+- Update spec file to honour new java packaging guidelines.
* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4
- Non-bootstrap build.
11 years, 9 months
[tycho/f17] Fix local mode resolution bug.
by Roland Grunberg
commit fe09c6eecfbb3e60b2cdaca984a87fe30a7e1840
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Aug 22 11:15:26 2012 -0400
Fix local mode resolution bug.
tycho-use-custom-resolver.patch | 92 +++++++++++++++++++++++++++++++++------
tycho.spec | 7 ++-
2 files changed, 83 insertions(+), 16 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index a03564c..ecb1374 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 204897532cb0a533634dc66faef31afb1822df03 Mon Sep 17 00:00:00 2001
+From 1140fc003d9934e09b7c8f416fc87b0e8dcf3b0e Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -21,15 +21,15 @@ tycho.local.keepTarget is set.
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
- .../tycho/p2/target/TargetDefinitionResolver.java | 8 +++--
- .../tycho/p2/target/TargetPlatformBuilderImpl.java | 6 ++++
- .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++
- .../core/osgitools/EclipseFeatureProject.java | 22 +++++++++++++
- .../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++++-
- .../DefaultTargetPlatformConfigurationReader.java | 5 ++-
- .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 ++++++++++
- .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++
- 8 files changed, 118 insertions(+), 4 deletions(-)
+ .../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/OsgiBundleProject.java | 38 ++++++++++++++-
+ .../DefaultTargetPlatformConfigurationReader.java | 5 +-
+ .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 +++++++
+ .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++
+ 8 files changed, 162 insertions(+), 9 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
@@ -58,10 +58,20 @@ index 6a85c49..d9d6055 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 e4b4084..8d58a3c 100644
+index e4b4084..d5395dd 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
-@@ -225,6 +225,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+@@ -41,6 +41,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.core.ProvisionException;
+ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+ import org.eclipse.equinox.p2.metadata.VersionedId;
++import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
++import org.eclipse.equinox.p2.metadata.expression.IExpression;
++import org.eclipse.equinox.p2.query.IQuery;
+ import org.eclipse.equinox.p2.query.IQueryResult;
+ import org.eclipse.equinox.p2.query.QueryUtil;
+ import org.eclipse.equinox.p2.repository.IRepository;
+@@ -225,6 +228,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
IMetadataRepository metadataRepository = null;
IArtifactRepository artifactRepository = null;
@@ -74,6 +84,60 @@ index e4b4084..8d58a3c 100644
try {
// TODO always log that a p2 repository is added to the target platform somewhere; used to be either from p2 or the following line
// logger.info("Adding repository (cached) " + location.toASCIIString());
+@@ -405,12 +414,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+ result.addAll(contentPart.getUnits());
+ }
+
+- SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
+- for (IMetadataRepository repository : metadataRepositories) {
+- IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+- result.addAll(matches.toUnmodifiableSet());
++ if (System.getProperty("maven.local.mode") != null && !offline) {
++ final String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
++ final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
++ IMetadataRepository systemLocalP2Repo = null;
++
++ // Sanity check even though the repo we want should be at index 1
++ for (IMetadataRepository repository : metadataRepositories) {
++ if (repository.getLocation().toString().equals(uri)) {
++ systemLocalP2Repo = repository;
++ break;
++ }
++ }
++
++ IQuery<IInstallableUnit> noLocalIUs = QueryUtil.createIUAnyQuery();
++
++ // Create a conjunction query that negates all IUs on the local system
++ for (IInstallableUnit unit : systemLocalP2Repo.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet()) {
++ noLocalIUs = QueryUtil.createCompoundQuery(noLocalIUs, QueryUtil.createMatchQuery(notmatchIU_ID, unit.getId()), true);
++ }
++
++ SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
++ for (IMetadataRepository repository : metadataRepositories) {
++ IQueryResult<IInstallableUnit> matches;
++ if (repository.getLocation().toString().equals(uri)) {
++ matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ } else {
++ // Don't collect any remote IUs that can be found on the system
++ // This will favour IUs in the system local p2 repository
++ matches = repository.query(noLocalIUs, sub.newChild(100));
++ }
++ result.addAll(matches.toUnmodifiableSet());
++ }
++ sub.done();
++ } else {
++ SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
++ for (IMetadataRepository repository : metadataRepositories) {
++ IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ result.addAll(matches.toUnmodifiableSet());
++ }
++ sub.done();
+ }
+- sub.done();
+
+ 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 0dd2fd4..15669a6 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -203,7 +267,7 @@ index fe6383f..d037faf 100644
throw new RuntimeException("Unknown execution environment specified in build.properties of project "
+ project, e);
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 c2997bc..fafb77e 100644
+index aad664a..98add9d 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
@@ -66,7 +66,10 @@ public class DefaultTargetPlatformConfigurationReader {
@@ -282,5 +346,5 @@ index ea06289..0768fd0 100644
addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder);
--
-1.7.11.2
+1.7.11.4
diff --git a/tycho.spec b/tycho.spec
index a79fe4e..8e76d71 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,5 @@
%global eclipsedir %{_libdir}/eclipse
-%global bootstrap 0
+%global bootstrap 1
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.15.0
-Release: 4%{?dist}
+Release: 4.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Wed Aug 22 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-4.1
+- Fix local mode resolution bug.
+
* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4
- Non-bootstrap build.
11 years, 9 months
[tycho/f18] Non-bootstrap build.
by Roland Grunberg
Summary of changes:
ff57af1... Non-bootstrap build. (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 9 months
[tycho] Non-bootstrap build.
by Roland Grunberg
commit ff57af15dbc952f032f2f04cfcbadc01b22484dd
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 24 12:06:49 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 2a2c8d4..b5a5905 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
%global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
%if %{bootstrap}
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.16.0
-Release: 5.1.df2c35%{?dist}
+Release: 6.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
+* Fri Aug 24 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-6.df2c35
+- Non-bootstrap build.
+
* Thu Aug 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-5.1.df2c35
- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
11 years, 9 months
[tycho] Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
by Roland Grunberg
commit 050d5c3c87269f1c81aa7a8a785781f506c77970
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 24 10:37:58 2012 -0400
Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
Fedora Eclipse now compiles all JSR14 upstream bundles with a target of
1.5, allowing us to leave in place parts of Tycho code that use those
particular libraries with generics.
tycho-fix-build.patch | 117 +++++--------------------------------------------
tycho.spec | 1 +
2 files changed, 13 insertions(+), 105 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 51e0318..6425964 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,30 +1,23 @@
-From 2ddba330f84d010cb462848c3686d084667091ec Mon Sep 17 00:00:00 2001
+From 19866503693224e992e2c3caa0b0c978bfe9aee5 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)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.
-As of Fedora 17, the default JRE is JDK 1.7. This does not support
-JSR14. Many Eclipse OSGi bundles use JSR14 for a build target but since
-JDK 1.7 ignores certain information (eg. generics) we must be careful
-when using those libraries.
-
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
- pom.xml | 5 -----
- tycho-artifactcomparator/pom.xml | 4 ++--
- .../tycho-bundles-external/tycho-bundles-external.product | 1 -
- tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
- .../tycho-standalone-p2-director/p2 Director.product | 1 -
- tycho-compiler-jdt/pom.xml | 4 ----
- .../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
- .../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
- .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
- .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 10 files changed, 25 insertions(+), 33 deletions(-)
+ pom.xml | 5 -----
+ tycho-artifactcomparator/pom.xml | 4 ++--
+ .../tycho-bundles-external/tycho-bundles-external.product | 1 -
+ tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
+ .../tycho-standalone-p2-director/p2 Director.product | 1 -
+ tycho-compiler-jdt/pom.xml | 4 ----
+ .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
+ .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
+ 8 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index dc7c1f5..1868f9a 100644
@@ -116,92 +109,6 @@ index 01b9a9e..c373e6a 100644
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
</dependency>
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-index 2859ab7..993cc58 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
-@@ -25,7 +25,7 @@ public class OsgiManifest {
- private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0];
-
- private String location;
-- private Headers<String, String> headers;
-+ private Headers headers;
-
- // cache for parsed values of commonly used headers
- private String bundleSymbolicName;
-@@ -78,7 +78,7 @@ public class OsgiManifest {
- }
-
- private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException {
-- String value = headers.get(headerKey);
-+ String value = (String)headers.get(headerKey);
- if (value == null) {
- throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found");
- }
-@@ -100,12 +100,12 @@ public class OsgiManifest {
- && "dir".equals(bundleShapeElements[0].getValue());
- }
-
-- public Headers<String, String> getHeaders() {
-+ public Headers getHeaders() {
- return headers;
- }
-
- public String getValue(String key) {
-- return headers.get(key);
-+ return (String)headers.get(key);
- }
-
- public String getBundleSymbolicName() {
-@@ -141,7 +141,7 @@ public class OsgiManifest {
- }
-
- private ManifestElement[] parseHeader(String key) {
-- String value = headers.get(key);
-+ String value = (String)headers.get(key);
- if (value == null) {
- return null;
- }
-@@ -154,7 +154,7 @@ public class OsgiManifest {
-
- public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException {
- try {
-- return ManifestElement.parseHeader(key, headers.get(key));
-+ return ManifestElement.parseHeader(key, (String)headers.get(key));
- } catch (BundleException e) {
- throw new OsgiManifestParserException(location, e);
- }
-diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-index 42db7f6..a145c57 100644
---- a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java
-@@ -36,7 +36,7 @@ public class StandalonePluginConverterTest {
- converter.convertManifest(new File("src/test/resources/targetplatforms/pre-3.0/plugins/testjar_1.0.0.jar"), mf,
- false, "3.2", true, null);
- Assert.assertTrue(mf.isFile());
-- Headers<String, String> headers = Headers.parseManifest(new FileInputStream(mf));
-+ Headers headers = Headers.parseManifest(new FileInputStream(mf));
- Assert.assertEquals("testjar", headers.get("Bundle-SymbolicName"));
- }
-
-@@ -44,14 +44,14 @@ public class StandalonePluginConverterTest {
- public void testWriteManifest() throws PluginConversionException, BundleException, IOException {
- File tmpManifestFile = folder.newFile("testManifest");
- Hashtable<String, String> manifestToWrite = new Hashtable<String, String>();
-- Headers<String, String> originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
-+ Headers originalManifest = Headers.parseManifest(getClass().getResourceAsStream(
- "/manifests/valid.mf"));
- for (Enumeration<String> keys = originalManifest.keys(); keys.hasMoreElements();) {
- String key = keys.nextElement();
-- manifestToWrite.put(key, originalManifest.get(key));
-+ manifestToWrite.put(key, (String)originalManifest.get(key));
- }
- converter.writeManifest(tmpManifestFile, manifestToWrite, false);
-- Headers<String, String> writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
-+ Headers writtenManifest = Headers.parseManifest(new FileInputStream(tmpManifestFile));
- assertEquals(originalManifest.size(), writtenManifest.size());
- for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
- String key = keys.nextElement();
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
index 5c4dcb3..9830aee 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
@@ -244,5 +151,5 @@ index a9d80d3..3ddbe9c 100644
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
--
-1.7.11.2
+1.7.11.4
diff --git a/tycho.spec b/tycho.spec
index a521101..2a2c8d4 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -193,6 +193,7 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%changelog
* Thu Aug 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-5.1.df2c35
- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
+- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
* Wed Aug 15 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-5.df2c35
- Non-bootstrap build.
11 years, 9 months
[tycho] Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
by Roland Grunberg
commit ba49332349d64d62571b8a968b1e971448181c6d
Author: Roland Grunberg <rgrunber(a)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(a)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(a)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(a)redhat.com> 0.16.0-5.df2c35
- Non-bootstrap build.
11 years, 9 months