Skip to content

Commit

Permalink
Replace aether by maven-resolver in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfdenise
jfdenise committed Dec 3, 2024
1 parent b82ed46 commit 4412059
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 18 deletions.
58 changes: 50 additions & 8 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
<maven.surefire.plugin>3.0.0-M6</maven.surefire.plugin>
<!-- required by tests -->
<version.org.apache.httpcomponents.httpclient>4.5.13</version.org.apache.httpcomponents.httpclient>
<version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
<version.org.apache.maven.resolver>1.9.18</version.org.apache.maven.resolver>
<version.org.apache.maven.wagon>3.5.3</version.org.apache.maven.wagon>
<version.org.jboss.logging.slf4j-jboss-logging>1.2.1.Final</version.org.jboss.logging.slf4j-jboss-logging>
<version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>3.3.0
</version.org.apache.maven.plugin-testing.maven-plugin-testing-harness>
Expand Down Expand Up @@ -225,14 +226,30 @@
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-plugin</artifactId>
<version>${version.org.jboss.galleon}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-api</artifactId>
<version>${version.org.jboss.galleon}</version>
</dependency>

<dependency>
<groupId>org.jboss.galleon</groupId>
<artifactId>galleon-maven-universe</artifactId>
<version>${version.org.jboss.galleon}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
Expand Down Expand Up @@ -317,14 +334,39 @@
<version>${version.org.apache.maven.plugin-testing.maven-plugin-testing-harness}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${version.org.eclipse.aether}</version>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>${version.org.apache.maven.wagon}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId>
<version>${version.org.eclipse.aether}</version>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${version.org.apache.maven.resolver}</version>
</dependency>
<dependency>
<groupId>org.jboss.slf4j</groupId>
Expand Down
40 changes: 30 additions & 10 deletions tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>3.3.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
Expand All @@ -81,13 +75,39 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<!-- Only required by tests -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 4412059

Please sign in to comment.