Skip to content

Reworked project to utilize maven-resolver #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
infvg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reworked project to utilize maven-resolver #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e7855
Reworked project to utilize maven-resolver
Sep 17, 2024
15d1657
Modified project
Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 172 additions & 135 deletions pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions resolver-integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
<parent>
<groupId>io.airlift.resolver</groupId>
<artifactId>resolver-root</artifactId>
<version>1.7-SNAPSHOT</version>
<version>1.7-wxd</version>
</parent>

<groupId>io.airlift.resolver</groupId>
<artifactId>resolver-integration</artifactId>
<packaging>jar</packaging>

Expand All @@ -24,17 +23,10 @@
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
Expand Down
16 changes: 9 additions & 7 deletions resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
*/
package io.airlift.resolver;

import org.sonatype.aether.artifact.Artifact;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.artifact.DefaultArtifact;
import org.junit.Assert;
import org.junit.Test;

import java.io.File;
import java.util.List;
Expand All @@ -32,9 +34,9 @@ public void testResolveArtifacts()
ArtifactResolver artifactResolver = new ArtifactResolver("target/local-repo", MAVEN_CENTRAL_URI);
List<Artifact> artifacts = artifactResolver.resolveArtifacts(new DefaultArtifact("org.apache.maven:maven-core:3.0.4"));

Assert.assertNotNull(artifacts, "artifacts is null");
Assert.assertNotNull("artifacts is null", artifacts);
for (Artifact artifact : artifacts) {
Assert.assertNotNull(artifact.getFile(), "Artifact " + artifact + " is not resolved");
Assert.assertNotNull("Artifact " + artifact + " is not resolved", artifact.getFile());
}
}

Expand All @@ -47,9 +49,9 @@ public void testResolvePom()
ArtifactResolver artifactResolver = new ArtifactResolver("target/local-repo", MAVEN_CENTRAL_URI);
List<Artifact> artifacts = artifactResolver.resolvePom(pomFile);

Assert.assertNotNull(artifacts, "artifacts is null");
Assert.assertNotNull("artifacts is null", artifacts);
for (Artifact artifact : artifacts) {
Assert.assertNotNull(artifact.getFile(), "Artifact " + artifact + " is not resolved");
Assert.assertNotNull("Artifact " + artifact + " is not resolved", artifact.getFile());
}
}
}
109 changes: 35 additions & 74 deletions resolver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,115 +4,76 @@
<parent>
<groupId>io.airlift.resolver</groupId>
<artifactId>resolver-root</artifactId>
<version>1.7-SNAPSHOT</version>
<version>1.7-wxd</version>
</parent>

<groupId>io.airlift.resolver</groupId>
<artifactId>resolver</artifactId>

<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-spi</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-file</artifactId>
</dependency>

<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-asynchttpclient</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<scope>runtime</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<artifactId>maven-compat</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<scope>runtime</scope>
<artifactId>maven-core</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>

<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.2</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<failOnWarning>false</failOnWarning>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>org.apache.maven:logback-core</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading