commit 614ffa904409549f7d19457c925cd301b52a4078 Author: Roland Grunberg rgrunber@redhat.com Date: Fri Oct 19 15:58:17 2012 -0400
Update to finalized 0.16.0 Release.
Upstream has made some changes to the staged version.
sources | 2 +- tycho-use-custom-resolver.patch | 21 +++++++++++---------- tycho.spec | 5 ++++- 3 files changed, 16 insertions(+), 12 deletions(-) --- diff --git a/sources b/sources index 2b2ef89..0ad679c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0707feda6deccd62248a88caa0e120a5 tycho-0.16.x.tar.bz2 +e20a738b62efb1da02d5bbd1888bc9a4 tycho-0.16.x.tar.bz2 diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index 032594e..877bd59 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,7 +1,7 @@ -From ca217d64af47188160fa99bec91b89a1f577f700 Mon Sep 17 00:00:00 2001 +From 0dccc0201d08f24cc0fdc7a262cf36e5761cb012 Mon Sep 17 00:00:00 2001 From: Roland Grunberg rgrunber@redhat.com Date: Tue, 12 Jun 2012 10:38:51 -0400 -Subject: [PATCH 4/4] Implement a custom resolver for Tycho in local mode. +Subject: [PATCH] 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 @@ -28,8 +28,8 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b .../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++- .../DefaultTargetPlatformConfigurationReader.java | 5 +- .../osgi/runtime/TychoOsgiRuntimeLocator.java | 15 ++++++ - .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++ - 8 files changed, 154 insertions(+), 10 deletions(-) + .../p2/resolver/P2TargetPlatformResolver.java | 11 +++++ + 8 files changed, 155 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 5cc8718..5513dda 100644 @@ -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 9265839..cdae9e7 100644 +index c56eeff..73f8835 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; @@ -73,7 +73,7 @@ index 9265839..cdae9e7 100644 import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; -@@ -224,6 +227,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { +@@ -225,6 +228,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { IMetadataRepository metadataRepository = null; IArtifactRepository artifactRepository = null;
@@ -86,7 +86,7 @@ index 9265839..cdae9e7 100644 try { remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
-@@ -364,12 +373,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { +@@ -365,12 +374,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { result.addAll(contentPart.getUnits()); }
@@ -339,13 +339,14 @@ index 9935c5f..0885aea 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 2ce9113..48e690a 100644 +index 1c897b9..13803dc 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,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp +@@ -191,6 +191,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp tpBuilder.setProjectLocation(project.getBasedir()); tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts()); - + tpBuilder.setFailOnDuplicateIUs(failOnDuplicateIUs); ++ + // Add Fedora Local P2 Repository when running in local mode + if (System.getProperty("maven.local.mode") != null) { + String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo"; diff --git a/tycho.spec b/tycho.spec index d2b0108..e9f33a2 100644 --- a/tycho.spec +++ b/tycho.spec @@ -5,7 +5,7 @@
Name: tycho Version: 0.16.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries @@ -209,6 +209,9 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name}
%changelog +* Fri Oct 19 2012 Roland Grunberg rgrunber@redhat.com 0.16.0-14 +- Update to finalized 0.16.0 Release. + * Wed Oct 17 2012 Roland Grunberg rgrunber@redhat.com 0.16.0-13 - Build Tycho properly in one RPM build. - Update to 0.16.0 Release.
java-sig-commits@lists.fedoraproject.org