Updated to aether:0.9.0.M3
diff --git a/pom.xml b/pom.xml
index 2637cf7..c4d39bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
<properties>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<mavenVersion>3.1.0</mavenVersion>
- <aetherVersion>0.9.0.M2</aetherVersion>
+ <aetherVersion>0.9.0.M3</aetherVersion>
</properties>
<dependencyManagement>
@@ -146,16 +146,26 @@
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-file</artifactId>
+ <artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-asynchttpclient</artifactId>
+ <artifactId>aether-transport-classpath</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <!-- This shuts off annoying warnings from ahc's logging -->
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-file</artifactId>
+ <version>${aetherVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-http</artifactId>
+ <version>${aetherVersion}</version>
+ </dependency>
+ <dependency>
+ <!-- This shuts off annoying warnings from slf4j-api -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.6.2</version>
@@ -289,11 +299,12 @@
</excludes>
<includes>
<include>org.eclipse.aether</include>
- <include>org.sonatype.aether</include>
<!-- CQ #5627 -->
<include>org.slf4j:slf4j-api:1.6.2</include>
<!-- CQ #5642 -->
<include>org.slf4j:slf4j-nop:1.6.2</include>
+ <!-- CQ #7347 -->
+ <include>org.slf4j:jcl-over-slf4j:1.6.2</include>
<!-- CQ #5643 -->
<include>org.apache.ant:ant:1.8.2</include>
<!-- CQ #5628 -->
@@ -304,10 +315,6 @@
<include>org.codehaus.plexus:plexus-utils:2.1</include>
<!-- CQ #7208 -->
<include>org.codehaus.plexus:plexus-interpolation:1.16</include>
- <!-- CQ #5633 -->
- <include>com.ning:async-http-client:1.6.5</include>
- <!-- CQ #6817 -->
- <include>io.netty:netty:3.4.4.Final</include>
<!-- CQ #5635 -->
<include>org.sonatype.sisu:sisu-inject-plexus:2.3.0</include>
<!-- CQ #5645 -->
@@ -326,6 +333,12 @@
<include>org.apache.maven:maven-repository-metadata:3.1.0</include>
<!-- CQ #7443 -->
<include>org.apache.maven:maven-aether-provider:3.1.0</include>
+ <!-- CQ #7344 -->
+ <include>org.apache.httpcomponents:httpclient:4.2.5</include>
+ <!-- CQ #7345 -->
+ <include>org.apache.httpcomponents:httpcore:4.2.4</include>
+ <!-- CQ #7346 -->
+ <include>commons-codec:commons-codec:1.6</include>
<!-- CQ #5653 -->
<include>org.apache.ant:ant-launcher:1.8.2:*:test</include>
<include>org.apache.ant:ant-testutil:1.8.2:*:test</include>
diff --git a/src/main/java/org/eclipse/aether/ant/AntRepoSys.java b/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
index 2808558..53860de 100644
--- a/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
+++ b/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
@@ -69,8 +69,7 @@
import org.eclipse.aether.collection.CollectRequest;
import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.collection.DependencyCollectionException;
-import org.eclipse.aether.connector.async.AsyncRepositoryConnectorFactory;
-import org.eclipse.aether.connector.file.FileRepositoryConnectorFactory;
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
import org.eclipse.aether.impl.DefaultServiceLocator;
import org.eclipse.aether.impl.RemoteRepositoryManager;
import org.eclipse.aether.repository.AuthenticationSelector;
@@ -78,7 +77,11 @@
import org.eclipse.aether.repository.MirrorSelector;
import org.eclipse.aether.repository.ProxySelector;
import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.spi.log.Logger;
+import org.eclipse.aether.transport.classpath.ClasspathTransporterFactory;
+import org.eclipse.aether.transport.file.FileTransporterFactory;
+import org.eclipse.aether.transport.http.HttpTransporterFactory;
import org.eclipse.aether.util.repository.AuthenticationBuilder;
import org.eclipse.aether.util.repository.ConservativeAuthenticationSelector;
import org.eclipse.aether.util.repository.DefaultAuthenticationSelector;
@@ -150,8 +153,10 @@
locator.setErrorHandler( new AntServiceLocatorErrorHandler( project ) );
locator.setServices( Logger.class, new AntLogger( project ) );
locator.setServices( ModelBuilder.class, modelBuilder );
- locator.addService( RepositoryConnectorFactory.class, FileRepositoryConnectorFactory.class );
- locator.addService( RepositoryConnectorFactory.class, AsyncRepositoryConnectorFactory.class );
+ locator.addService( RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class );
+ locator.addService( TransporterFactory.class, FileTransporterFactory.class );
+ locator.addService( TransporterFactory.class, HttpTransporterFactory.class );
+ locator.addService( TransporterFactory.class, ClasspathTransporterFactory.class );
}
private void initDefaults()
diff --git a/src/test/java/org/eclipse/aether/ant/DeployTest.java b/src/test/java/org/eclipse/aether/ant/DeployTest.java
index 37ed9b3..5a57dc4 100644
--- a/src/test/java/org/eclipse/aether/ant/DeployTest.java
+++ b/src/test/java/org/eclipse/aether/ant/DeployTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Sonatype, Inc.
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@
super.setUp();
distRepoPath = new File( "target/dist-repo" );
System.setProperty( "project.distrepo.url", distRepoPath.toURI().toString() );
- TestFileUtils.delete( distRepoPath );
+ TestFileUtils.deleteFile( distRepoPath );
configureProject( "src/test/ant/Deploy.xml" );
}
@@ -45,7 +45,7 @@
throws Exception
{
super.tearDown();
- TestFileUtils.delete( distRepoPath );
+ TestFileUtils.deleteFile( distRepoPath );
}
public void testDeployGlobalPom()
diff --git a/src/test/java/org/eclipse/aether/ant/InstallTest.java b/src/test/java/org/eclipse/aether/ant/InstallTest.java
index 8f548d5..18dda11 100644
--- a/src/test/java/org/eclipse/aether/ant/InstallTest.java
+++ b/src/test/java/org/eclipse/aether/ant/InstallTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Sonatype, Inc.
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,7 +27,7 @@
throws Exception
{
super.setUp();
- TestFileUtils.delete( new File( defaultLocalRepository, "test" ) );
+ TestFileUtils.deleteFile( new File( defaultLocalRepository, "test" ) );
configureProject( "src/test/ant/Install.xml" );
}
@@ -37,7 +37,7 @@
throws Exception
{
super.tearDown();
- TestFileUtils.delete( new File( defaultLocalRepository, "test" ) );
+ TestFileUtils.deleteFile( new File( defaultLocalRepository, "test" ) );
}
public void testInstallGlobalPom()
@@ -86,7 +86,7 @@
throws IOException
{
File repoPath = new File( BUILD_DIR, "local-repo-custom" );
- TestFileUtils.delete( repoPath );
+ TestFileUtils.deleteFile( repoPath );
executeTarget( "testCustomRepo" );
long tstamp = System.currentTimeMillis();
@@ -96,7 +96,7 @@
assertUpdatedFile( tstamp, repoPath, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.pom" );
assertUpdatedFile( tstamp, repoPath, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-ant.xml" );
- TestFileUtils.delete( repoPath );
+ TestFileUtils.deleteFile( repoPath );
}
private void assertUpdatedFile( long tstamp, File repoPath, String path )
diff --git a/src/test/java/org/eclipse/aether/ant/ResolveTest.java b/src/test/java/org/eclipse/aether/ant/ResolveTest.java
index 68d3b53..406abd7 100644
--- a/src/test/java/org/eclipse/aether/ant/ResolveTest.java
+++ b/src/test/java/org/eclipse/aether/ant/ResolveTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Sonatype, Inc.
+ * Copyright (c) 2010, 2013 Sonatype, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,20 +68,20 @@
throws IOException
{
File dir = new File( BUILD_DIR, "resolve-custom-layout" );
- TestFileUtils.delete( dir );
+ TestFileUtils.deleteFile( dir );
executeTarget( "testResolveCustomFileLayout" );
assertThat( "aether-api was not saved with custom file layout",
new File( dir, "org.sonatype.aether/aether-api/org/sonatype/aether/jar" ).exists() );
- TestFileUtils.delete( dir );
+ TestFileUtils.deleteFile( dir );
}
public void testResolveAttachments()
throws IOException
{
File dir = new File( BUILD_DIR, "resolve-attachments" );
- TestFileUtils.delete( dir );
+ TestFileUtils.deleteFile( dir );
executeTarget( "testResolveAttachments" );
File jdocDir = new File(dir, "javadoc");
@@ -98,7 +98,7 @@
everyItem( endsWith( "sources.jar" ) ) );
- TestFileUtils.delete( dir );
+ TestFileUtils.deleteFile( dir );
}
public void testResolvePath()
