Skip to content

Commit

Permalink
Reworked project
Browse files Browse the repository at this point in the history
  • Loading branch information
infvg committed Sep 13, 2024
1 parent 9b56fce commit 4970692
Show file tree
Hide file tree
Showing 12 changed files with 295 additions and 939 deletions.
305 changes: 171 additions & 134 deletions pom.xml
View file

Large diffs are not rendered by default.

12 changes: 2 additions & 10 deletions resolver-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<version>1.7-SNAPSHOT</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
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 artifacts != null;
for (Artifact artifact : artifacts) {
Assert.assertNotNull(artifact.getFile(), "Artifact " + artifact + " is not resolved");
assert artifact.getFile() != null;
}
}
}
91 changes: 14 additions & 77 deletions resolver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,111 +7,48 @@
<version>1.7-SNAPSHOT</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>
</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>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit 4970692

Please sign in to comment.