Attachment 712000 Details for Bug 922730 – Proposed patch

[patch] Proposed patch

mizdebsk_rhbz922730.patch (text/plain), 5.51 KB, created by Mikolaj Izdebski on 2013-03-18 14:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2013-03-18 14:29:36 UTC

Size: 5.51 KB

patch

obsolete

>From ea7b3986e51bee237045b611184c24ff0cb80bee Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Mon, 18 Mar 2013 15:04:37 +0100
>Subject: [PATCH] Don't use private XMvn classes
>
>DefaultResolver class is marked as public only for technical reasons.
>It's not part of XMvn public API and it should not be referenced
>directly.  The only valid use of XMvn resolver is through Plexus
>Container.  Other usages can lead to undefined behaviour, including
>NullPointerException (rhbz#922730).
>
>More information un usage on XMvn API can be found at:
>mizdebsk.fedorapeople.org/xmvn/site/howto/embed.html
>
>- Resolves: rhbz#922730
>---
> tycho-use-custom-resolver.patch | 29 +++++++++++++++++++----------
> tycho.spec                      |  6 +++++-
> 2 files changed, 24 insertions(+), 11 deletions(-)
>
>diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
>index b251c1b..5434a94 100644
>--- a/tycho-use-custom-resolver.patch
>+++ b/tycho-use-custom-resolver.patch
>@@ -1,4 +1,4 @@
>-From 3f7a7496cb2038b7840bd5983df1a339723fce52 Mon Sep 17 00:00:00 2001
>+From c89c9f16bab60600d7897566386ff82acd6cbe60 Mon Sep 17 00:00:00 2001
> From: Roland Grunberg <rgrunber@redhat.com>
> Date: Tue, 12 Jun 2012 10:38:51 -0400
> Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
>@@ -29,9 +29,9 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
>  .../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
>  .../tycho/core/osgitools/OsgiBundleProject.java    | 29 +++++++++++-
>  .../DefaultTargetPlatformConfigurationReader.java  |  6 ++-
>- .../osgi/runtime/TychoOsgiRuntimeLocator.java      | 12 +++++
>+ .../osgi/runtime/TychoOsgiRuntimeLocator.java      | 14 ++++++
>  .../p2/resolver/P2TargetPlatformResolver.java      | 11 +++++
>- 10 files changed, 160 insertions(+), 11 deletions(-)
>+ 10 files changed, 162 insertions(+), 11 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 6ea8a81..e90d279 100644
>@@ -332,7 +332,7 @@ index 63dba63..d292773 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 1e878e5..19db009 100644
>+index 1e878e5..e499d41 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,9 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
>@@ -341,18 +341,27 @@ index 1e878e5..19db009 100644
>  import org.eclipse.tycho.locking.facade.FileLocker;
> +import org.sonatype.aether.util.artifact.DefaultArtifact;
> +
>-+import org.fedoraproject.maven.resolver.DefaultResolver;
>++import org.fedoraproject.maven.resolver.Resolver;
>  
>  /**
>   * Implementation of {@link org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator} for Tycho's
>-@@ -201,6 +204,15 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator {
>+@@ -94,6 +97,9 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator {
>+     @Requirement
>+     private DevWorkspaceResolver workspaceState;
>+ 
>++    @Requirement(optional = true)
>++    private Resolver xmvnResolver;
>++
>+     public void locateRuntime(EquinoxRuntimeDescription description) throws MavenExecutionException {
>+         WorkspaceTychoOsgiRuntimeLocator workspaceLocator = WorkspaceTychoOsgiRuntimeLocator
>+                 .getResolver(this.workspaceState);
>+@@ -201,6 +207,14 @@ public class TychoOsgiRuntimeLocator implements EquinoxRuntimeLocator {
>          Artifact artifact = repositorySystem.createArtifact(dependency.getGroupId(), dependency.getArtifactId(),
>                  dependency.getVersion(), dependency.getType());
>  
> +        // If we are in local mode, find the artifact on the system
>-+        if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) {
>-+            DefaultResolver resolver = new DefaultResolver();
>-+            File file = resolver.resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
>++        if (xmvnResolver != null) {
>++            File file = xmvnResolver.resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
> +            if (file != null) {
> +                artifact.setFile(file);
> +            }
>@@ -384,5 +393,5 @@ index d6cbc6d..85e2c0d 100644
>  
>          addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder);
> -- 
>-1.7.11.7
>+1.8.1.4
> 
>diff --git a/tycho.spec b/tycho.spec
>index 826cbdf..d6697c1 100644
>--- a/tycho.spec
>+++ b/tycho.spec
>@@ -8,7 +8,7 @@
> 
> Name:           tycho
> Version:        0.17.0
>-Release:        0.5.git3351b1%{?dist}
>+Release:        0.6.git3351b1%{?dist}
> Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
> 
> Group:          Development/Libraries
>@@ -267,6 +267,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Mon Mar 18 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.17.0-0.6.git3351b1
>+- Don't use private XMvn API
>+- Resolves: rhbz#922730
>+
> * Sun Mar 17 2013 Roland Grunberg <rgrunber@redhat.com> 0.17.0-0.5.git3351b1
> - Non-bootstrap build.
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 922730: 711907 | 712000