From 5b4078c031a3d9610669f956b0b383635c0bca25 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jun 03 2014 12:46:14 +0000 Subject: Remove unneeded XMvn bits --- diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index a5f4165..23b7c91 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,4 +1,4 @@ -From 734062ed2524d976754b25000119fd7ffae1e08c Mon Sep 17 00:00:00 2001 +From 04001d5e56fe2f4711b1299466d52f138aed41e8 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 10:38:51 -0400 Subject: [PATCH] Implement a custom resolver for Tycho in local mode. @@ -32,16 +32,13 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b .../tycho/p2/target/TargetPlatformFactoryImpl.java | 43 +++++++++++++++++++-- .../tycho/p2/repository/LocalRepositoryReader.java | 44 ++++++++++++++++++++- .../facade/TargetPlatformConfigurationStub.java | 5 ++- - tycho-core/pom.xml | 6 +++ .../eclipse/tycho/core/locking/FileLockerImpl.java | 26 ++++++++++--- .../core/maven/TychoMavenLifecycleParticipant.java | 45 ++++++++++++++++++++++ .../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++++ .../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++++- .../DefaultTargetPlatformConfigurationReader.java | 6 ++- - .../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 ++++++++ .../p2/resolver/P2TargetPlatformResolver.java | 10 +++++ - tycho-p2/tycho-p2-repository-plugin/pom.xml | 6 +++ - 14 files changed, 260 insertions(+), 28 deletions(-) + 11 files changed, 231 insertions(+), 28 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 d3c5ed9..027a884 100644 @@ -252,23 +249,6 @@ index 0be3e6f..3fecf39 100644 } // convenience method for tests -diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index c811801..a59ea4d 100644 ---- a/tycho-core/pom.xml -+++ b/tycho-core/pom.xml -@@ -146,6 +146,12 @@ - org.eclipse.tycho.core.shared - ${project.version} - -+ -+ org.fedoraproject.xmvn -+ xmvn-connector-aether -+ 2.0.0 -+ runtime -+ - - - org.eclipse.tycho diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java index 86253bd..cef15d2 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java @@ -511,48 +491,6 @@ index 4a1f157..65cbf47 100644 setTargetPlatformResolver(result, configuration); -diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -index 1d929e2..88d68f4 100644 ---- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoOsgiRuntimeLocator.java -@@ -38,6 +38,8 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator; - import org.eclipse.tycho.dev.DevWorkspaceResolver; - import org.eclipse.tycho.locking.facade.FileLockService; - import org.eclipse.tycho.locking.facade.FileLocker; -+import org.eclipse.aether.artifact.DefaultArtifact; -+import org.eclipse.aether.repository.WorkspaceReader; - - /** - * Implementation of {@link org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator} for Tycho's -@@ -94,6 +96,9 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator { - @Requirement - private DevWorkspaceResolver workspaceState; - -+ @Requirement(hint = "ide") -+ private WorkspaceReader workspaceReader; -+ - public void locateRuntime(EquinoxRuntimeDescription description) throws MavenExecutionException { - WorkspaceTychoOsgiRuntimeLocator workspaceLocator = WorkspaceTychoOsgiRuntimeLocator - .getResolver(this.workspaceState); -@@ -201,6 +206,18 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator { - Artifact artifact = repositorySystem.createArtifact(dependency.getGroupId(), dependency.getArtifactId(), - dependency.getVersion(), dependency.getType()); - -+ if (workspaceReader != null) { -+ DefaultArtifact newArtifact = new DefaultArtifact(artifact.getGroupId() -+ + ":" + artifact.getArtifactId() -+ + ":" + artifact.getType() -+ + ":" + artifact.getVersion()); -+ -+ File artifactFile = workspaceReader.findArtifact(newArtifact); -+ if (artifactFile != null) { -+ artifact.setFile(artifactFile); -+ } -+ } -+ - ArtifactResolutionRequest request = new ArtifactResolutionRequest(); - 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 5bc5dfa..52e8200 100644 --- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java @@ -574,23 +512,6 @@ index 5bc5dfa..52e8200 100644 for (ArtifactRepository repository : project.getRemoteArtifactRepositories()) { addEntireP2RepositoryToTargetPlatform(repository, tpConfiguration); } -diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml -index 70cb7b0..a5c8835 100644 ---- a/tycho-p2/tycho-p2-repository-plugin/pom.xml -+++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml -@@ -36,6 +36,12 @@ - tycho-p2-facade - ${project.version} - -+ -+ org.fedoraproject.xmvn -+ xmvn-connector-aether -+ 2.0.0 -+ runtime -+ - - - -- 1.9.0 diff --git a/tycho.spec b/tycho.spec index b928d73..e284ec8 100644 --- a/tycho.spec +++ b/tycho.spec @@ -344,6 +344,7 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati * Tue Jun 3 2014 Mikolaj Izdebski - 0.20.0-11 - Skip intermediary build in non-bootstrap mode - Resolves: rhbz#1103839 +- Remove unneeded XMvn bits * Fri May 30 2014 Mikolaj Izdebski - 0.20.0-10 - Fix runtime dependencies on XMvn in POMs