You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/10/02 09:16:24 UTC
[maven-dependency-analyzer] branch drop-plexus created (now e79ddf2)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch drop-plexus
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git.
at e79ddf2 WIP drop plexus
This branch includes the following new commits:
new e79ddf2 WIP drop plexus
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-dependency-analyzer] 01/01: WIP drop plexus
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch drop-plexus
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
commit e79ddf25bf9bebaf06f9654a77b5efeab5f850dd
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Oct 2 11:16:12 2021 +0200
WIP drop plexus
---
pom.xml | 16 +++++++++++++---
.../shared/dependency/analyzer/DefaultClassAnalyzer.java | 6 ++++--
.../analyzer/DefaultProjectDependencyAnalyzer.java | 13 ++++++++-----
.../dependency/analyzer/asm/ASMDependencyAnalyzer.java | 7 +++++--
.../analyzer/DefaultProjectDependencyAnalyzerTest.java | 10 ++++++----
5 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98ddda4..6575c98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,8 @@
<mavenVersion>3.1.1</mavenVersion>
<surefire.version>2.22.2</surefire.version>
<javaVersion>7</javaVersion>
+ <maven31xEclipseAether.version>0.9.0.M2</maven31xEclipseAether.version>
+ <maven31xEclipseSisu.version>0.3.4</maven31xEclipseSisu.version>
<project.build.outputTimestamp>2020-08-05T13:26:53Z</project.build.outputTimestamp>
</properties>
@@ -98,6 +100,12 @@
<version>2.1.0</version>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
@@ -169,12 +177,14 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>sisu-maven-plugin</artifactId>
+ <version>0.3.4</version>
<executions>
<execution>
<goals>
- <goal>generate-metadata</goal>
+ <goal>main-index</goal>
+ <goal>test-index</goal>
</goals>
</execution>
</executions>
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
index 52ecd18..914b2b7 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java
@@ -24,14 +24,16 @@ import java.net.URL;
import java.util.Set;
import java.util.zip.ZipException;
-import org.codehaus.plexus.component.annotations.Component;
+import javax.inject.Named;
+import javax.inject.Singleton;
/**
* <p>DefaultClassAnalyzer class.</p>
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
*/
-@Component( role = ClassAnalyzer.class )
+@Named
+@Singleton
public class DefaultClassAnalyzer
implements ClassAnalyzer
{
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
index cb44ddc..5fb7146 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
@@ -34,28 +34,31 @@ import java.util.jar.JarFile;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
/**
* <p>DefaultProjectDependencyAnalyzer class.</p>
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
*/
-@Component( role = ProjectDependencyAnalyzer.class )
+@Named
+@Singleton
public class DefaultProjectDependencyAnalyzer
implements ProjectDependencyAnalyzer
{
/**
* ClassAnalyzer
*/
- @Requirement
+ @Inject
private ClassAnalyzer classAnalyzer;
/**
* DependencyAnalyzer
*/
- @Requirement
+ @Inject
private DependencyAnalyzer dependencyAnalyzer;
/** {@inheritDoc} */
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
index 2836c4d..c913fa9 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzer.java
@@ -25,14 +25,17 @@ import java.util.Set;
import org.apache.maven.shared.dependency.analyzer.ClassFileVisitorUtils;
import org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer;
-import org.codehaus.plexus.component.annotations.Component;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
/**
* ASMDependencyAnalyzer
*
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
*/
-@Component( role = DependencyAnalyzer.class )
+@Named( "ASM" )
+@Singleton
public class ASMDependencyAnalyzer
implements DependencyAnalyzer
{
diff --git a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index ebb85fa..7d18e8d 100644
--- a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -65,6 +65,8 @@ public class DefaultProjectDependencyAnalyzerTest
private ProjectDependencyAnalyzer analyzer;
+ private RepositoryTool repositoryTool;
+
private static File localRepo;
/*
@@ -76,18 +78,18 @@ public class DefaultProjectDependencyAnalyzerTest
{
super.setUp();
- buildTool = (BuildTool) lookup( BuildTool.ROLE );
+ buildTool = lookup( BuildTool.class );
- projectTool = (ProjectTool) lookup( ProjectTool.ROLE );
+ projectTool = lookup( ProjectTool.class );
if ( localRepo == null )
{
- RepositoryTool repositoryTool = (RepositoryTool) lookup( RepositoryTool.ROLE );
+ repositoryTool = lookup( RepositoryTool.class );
localRepo = repositoryTool.findLocalRepositoryDirectory();
System.out.println( "Local repository: " + localRepo );
}
- analyzer = (ProjectDependencyAnalyzer) lookup( ProjectDependencyAnalyzer.class.getName() );
+ analyzer = lookup( ProjectDependencyAnalyzer.class );
}
@Test