|
 |
a5fc8a |
From 483dce9795e8a680651115bd7554a58d4fdd3d58 Mon Sep 17 00:00:00 2001
|
|
|
a5fc8a |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
a5fc8a |
Date: Thu, 19 Dec 2013 14:58:25 +0100
|
|
|
a5fc8a |
Subject: [PATCH 3/4] Port to Sonatype Sisu
|
|
|
a5fc8a |
|
|
|
a5fc8a |
[backport-feature-sonatype-sisu]
|
|
|
a5fc8a |
---
|
|
|
a5fc8a |
xmvn-connector/pom.xml | 4 ++--
|
|
|
a5fc8a |
xmvn-core/pom.xml | 12 ++++++++++--
|
|
|
a5fc8a |
.../maven/installer/impl/DefaultInstaller.java | 10 +++++-----
|
|
|
a5fc8a |
xmvn-mojo/pom.xml | 4 ++--
|
|
|
a5fc8a |
xmvn-parent/pom.xml | 17 ++++++++++++++---
|
|
|
a5fc8a |
xmvn-tools/pom.xml | 4 ++--
|
|
|
a5fc8a |
6 files changed, 35 insertions(+), 16 deletions(-)
|
|
|
a5fc8a |
|
|
|
a5fc8a |
diff --git a/xmvn-connector/pom.xml b/xmvn-connector/pom.xml
|
|
|
a5fc8a |
index 8b50535..769fd0a 100644
|
|
|
a5fc8a |
--- a/xmvn-connector/pom.xml
|
|
|
a5fc8a |
+++ b/xmvn-connector/pom.xml
|
|
|
a5fc8a |
@@ -72,8 +72,8 @@
|
|
|
a5fc8a |
<artifactId>xmvn-core</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
- <groupId>org.eclipse.sisu</groupId>
|
|
|
a5fc8a |
- <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
|
a5fc8a |
+ <groupId>org.sonatype.sisu</groupId>
|
|
|
a5fc8a |
+ <artifactId>sisu-inject-plexus</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
</dependencies>
|
|
|
a5fc8a |
</project>
|
|
|
a5fc8a |
diff --git a/xmvn-core/pom.xml b/xmvn-core/pom.xml
|
|
|
a5fc8a |
index 79238cd..4bbe6c0 100644
|
|
|
a5fc8a |
--- a/xmvn-core/pom.xml
|
|
|
a5fc8a |
+++ b/xmvn-core/pom.xml
|
|
|
a5fc8a |
@@ -50,13 +50,21 @@
|
|
|
a5fc8a |
<artifactId>plexus-component-annotations</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
- <groupId>org.eclipse.sisu</groupId>
|
|
|
a5fc8a |
- <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
|
a5fc8a |
+ <groupId>org.sonatype.sisu</groupId>
|
|
|
a5fc8a |
+ <artifactId>sisu-inject-plexus</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
<groupId>org.codehaus.plexus</groupId>
|
|
|
a5fc8a |
<artifactId>plexus-utils</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
+ <dependency>
|
|
|
a5fc8a |
+ <groupId>asm</groupId>
|
|
|
a5fc8a |
+ <artifactId>asm</artifactId>
|
|
|
a5fc8a |
+ </dependency>
|
|
|
a5fc8a |
+ <dependency>
|
|
|
a5fc8a |
+ <groupId>asm</groupId>
|
|
|
a5fc8a |
+ <artifactId>asm-commons</artifactId>
|
|
|
a5fc8a |
+ </dependency>
|
|
|
a5fc8a |
</dependencies>
|
|
|
a5fc8a |
<build>
|
|
|
a5fc8a |
<plugins>
|
|
|
a5fc8a |
diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/DefaultInstaller.java b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/DefaultInstaller.java
|
|
|
a5fc8a |
index 3817c7b..e22905f 100644
|
|
|
a5fc8a |
--- a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/DefaultInstaller.java
|
|
|
a5fc8a |
+++ b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/DefaultInstaller.java
|
|
|
a5fc8a |
@@ -48,10 +48,6 @@ import org.codehaus.plexus.component.annotations.Component;
|
|
|
a5fc8a |
import org.codehaus.plexus.component.annotations.Requirement;
|
|
|
a5fc8a |
import org.codehaus.plexus.logging.Logger;
|
|
|
a5fc8a |
import org.codehaus.plexus.util.StringUtils;
|
|
|
a5fc8a |
-import org.eclipse.sisu.space.asm.ClassReader;
|
|
|
a5fc8a |
-import org.eclipse.sisu.space.asm.ClassVisitor;
|
|
|
a5fc8a |
-import org.eclipse.sisu.space.asm.MethodVisitor;
|
|
|
a5fc8a |
-import org.eclipse.sisu.space.asm.Opcodes;
|
|
|
a5fc8a |
import org.fedoraproject.maven.config.Configuration;
|
|
|
a5fc8a |
import org.fedoraproject.maven.config.Configurator;
|
|
|
a5fc8a |
import org.fedoraproject.maven.config.InstallerSettings;
|
|
|
a5fc8a |
@@ -73,6 +69,10 @@ import org.fedoraproject.maven.resolver.ResolutionResult;
|
|
|
a5fc8a |
import org.fedoraproject.maven.resolver.Resolver;
|
|
|
a5fc8a |
import org.fedoraproject.maven.utils.ArtifactUtils;
|
|
|
a5fc8a |
import org.fedoraproject.maven.utils.LoggingUtils;
|
|
|
a5fc8a |
+import org.objectweb.asm.ClassReader;
|
|
|
a5fc8a |
+import org.objectweb.asm.MethodVisitor;
|
|
|
a5fc8a |
+import org.objectweb.asm.Opcodes;
|
|
|
a5fc8a |
+import org.objectweb.asm.commons.EmptyVisitor;
|
|
|
a5fc8a |
import org.sonatype.aether.artifact.Artifact;
|
|
|
a5fc8a |
import org.sonatype.aether.util.artifact.DefaultArtifact;
|
|
|
a5fc8a |
|
|
|
a5fc8a |
@@ -517,7 +517,7 @@ public class DefaultInstaller
|
|
|
a5fc8a |
|
|
|
a5fc8a |
final boolean[] usesNativeCode = new boolean[1];
|
|
|
a5fc8a |
|
|
|
a5fc8a |
- new ClassReader( jis ).accept( new ClassVisitor( Opcodes.ASM4 )
|
|
|
a5fc8a |
+ new ClassReader( jis ).accept( new EmptyVisitor()
|
|
|
a5fc8a |
{
|
|
|
a5fc8a |
@Override
|
|
|
a5fc8a |
public MethodVisitor visitMethod( int flags, String name, String desc, String sig, String[] exc )
|
|
|
a5fc8a |
diff --git a/xmvn-mojo/pom.xml b/xmvn-mojo/pom.xml
|
|
|
a5fc8a |
index 14505d2..9b9ae1f 100644
|
|
|
a5fc8a |
--- a/xmvn-mojo/pom.xml
|
|
|
a5fc8a |
+++ b/xmvn-mojo/pom.xml
|
|
|
a5fc8a |
@@ -68,8 +68,8 @@
|
|
|
a5fc8a |
<artifactId>plexus-component-annotations</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
- <groupId>org.eclipse.sisu</groupId>
|
|
|
a5fc8a |
- <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
|
a5fc8a |
+ <groupId>org.sonatype.sisu</groupId>
|
|
|
a5fc8a |
+ <artifactId>sisu-inject-plexus</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
<groupId>org.sonatype.aether</groupId>
|
|
|
a5fc8a |
diff --git a/xmvn-parent/pom.xml b/xmvn-parent/pom.xml
|
|
|
a5fc8a |
index bfa4da6..76894d2 100644
|
|
|
a5fc8a |
--- a/xmvn-parent/pom.xml
|
|
|
a5fc8a |
+++ b/xmvn-parent/pom.xml
|
|
|
a5fc8a |
@@ -75,13 +75,14 @@
|
|
|
a5fc8a |
<project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding>
|
|
|
a5fc8a |
|
|
|
a5fc8a |
<aetherVersion>1.13.1</aetherVersion>
|
|
|
a5fc8a |
+ <asmVersion>3.3.1</asmVersion>
|
|
|
a5fc8a |
<jcommanderVersion>1.32</jcommanderVersion>
|
|
|
a5fc8a |
<mavenInvokerVersion>2.1.1</mavenInvokerVersion>
|
|
|
a5fc8a |
<mavenVersion>3.0.5</mavenVersion>
|
|
|
a5fc8a |
<plexusUtilsVersion>3.0.15</plexusUtilsVersion>
|
|
|
a5fc8a |
<plexusVersion>1.5.5</plexusVersion>
|
|
|
a5fc8a |
<pluginToolsVersion>3.2</pluginToolsVersion>
|
|
|
a5fc8a |
- <sisuVersion>0.0.0.M5</sisuVersion>
|
|
|
a5fc8a |
+ <sisuVersion>2.3.0</sisuVersion>
|
|
|
a5fc8a |
|
|
|
a5fc8a |
|
|
|
a5fc8a |
<apivizVersion>1.3.2.GA</apivizVersion>
|
|
|
a5fc8a |
@@ -155,8 +156,8 @@
|
|
|
a5fc8a |
<version>${plexusVersion}</version>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
- <groupId>org.eclipse.sisu</groupId>
|
|
|
a5fc8a |
- <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
|
a5fc8a |
+ <groupId>org.sonatype.sisu</groupId>
|
|
|
a5fc8a |
+ <artifactId>sisu-inject-plexus</artifactId>
|
|
|
a5fc8a |
<version>${sisuVersion}</version>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
@@ -194,6 +195,16 @@
|
|
|
a5fc8a |
<artifactId>maven-invoker</artifactId>
|
|
|
a5fc8a |
<version>${mavenInvokerVersion}</version>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
+ <dependency>
|
|
|
a5fc8a |
+ <groupId>asm</groupId>
|
|
|
a5fc8a |
+ <artifactId>asm</artifactId>
|
|
|
a5fc8a |
+ <version>${asmVersion}</version>
|
|
|
a5fc8a |
+ </dependency>
|
|
|
a5fc8a |
+ <dependency>
|
|
|
a5fc8a |
+ <groupId>asm</groupId>
|
|
|
a5fc8a |
+ <artifactId>asm-commons</artifactId>
|
|
|
a5fc8a |
+ <version>${asmVersion}</version>
|
|
|
a5fc8a |
+ </dependency>
|
|
|
a5fc8a |
</dependencies>
|
|
|
a5fc8a |
</dependencyManagement>
|
|
|
a5fc8a |
<dependencies>
|
|
|
a5fc8a |
diff --git a/xmvn-tools/pom.xml b/xmvn-tools/pom.xml
|
|
|
a5fc8a |
index e1b21a3..8f68dfe 100644
|
|
|
a5fc8a |
--- a/xmvn-tools/pom.xml
|
|
|
a5fc8a |
+++ b/xmvn-tools/pom.xml
|
|
|
a5fc8a |
@@ -48,8 +48,8 @@
|
|
|
a5fc8a |
<artifactId>xmvn-core</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
<dependency>
|
|
|
a5fc8a |
- <groupId>org.eclipse.sisu</groupId>
|
|
|
a5fc8a |
- <artifactId>org.eclipse.sisu.plexus</artifactId>
|
|
|
a5fc8a |
+ <groupId>org.sonatype.sisu</groupId>
|
|
|
a5fc8a |
+ <artifactId>sisu-inject-plexus</artifactId>
|
|
|
a5fc8a |
</dependency>
|
|
|
a5fc8a |
</dependencies>
|
|
|
a5fc8a |
<build>
|
|
|
a5fc8a |
--
|
|
|
a5fc8a |
1.8.4.2
|
|
|
a5fc8a |
|