Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changing deps from eclipse.aether to maven-resolver

This commit is contained in:
Martin Stockhammer 2018-10-29 11:10:35 +01:00
parent 6e5f4e80dd
commit 8160004309
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archiva-modules/plugins/maven2-repository/pom.xml
View File

@ -98,18 +98,17 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-file</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
</dependency>
<dependency>

4
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/ArchivaRepositoryConnectorFactory.java
View File

@ -18,11 +18,11 @@ package org.apache.archiva.dependency.tree.maven2;
* under the License.
*/
import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.connector.file.FileRepositoryConnectorFactory;
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.spi.connector.ArtifactDownload;
import org.eclipse.aether.spi.connector.ArtifactUpload;
@ -41,7 +41,7 @@ public class ArchivaRepositoryConnectorFactory
implements RepositoryConnectorFactory
{
private FileRepositoryConnectorFactory delegate = new FileRepositoryConnectorFactory();
private BasicRepositoryConnectorFactory delegate = new BasicRepositoryConnectorFactory();
public ArchivaRepositoryConnectorFactory()
{

32
pom.xml
View File

@ -57,6 +57,7 @@
<maven3x.version>3.5.4</maven3x.version>
<maven.artifact-manager.version>2.2.1</maven.artifact-manager.version>
<maven.compat.version>3.0</maven.compat.version>
<maven.resolver.version>1.1.1</maven.resolver.version>
<sonatype.aether.version>1.13.1</sonatype.aether.version>
<eclipse.aether.version>0.9.0.M2</eclipse.aether.version>
@ -396,6 +397,10 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -903,6 +908,33 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
<version>${maven3x.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver</artifactId>
<version>${maven.resolver.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
<version>${maven.resolver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${maven.resolver.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>${maven.resolver.version}</version>
</dependency>
<!-- Eclipse aether -->