You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/05/07 13:29:56 UTC
[03/50] [abbrv] maven-aether git commit: Used org.eclipse.aether
artifacts for tests
Used org.eclipse.aether artifacts for tests
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/5c663b9a
Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/5c663b9a
Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/5c663b9a
Branch: refs/heads/ant-tasks
Commit: 5c663b9adffeffd11b53e5ded88bf08030cc6a9f
Parents: 21f9e1b
Author: Benjamin Bentmann <be...@sonatype.com>
Authored: Thu Jan 2 16:43:47 2014 +0100
Committer: Benjamin Bentmann <be...@sonatype.com>
Committed: Thu Jan 2 16:43:47 2014 +0100
----------------------------------------------------------------------
src/test/ant/Resolve.xml | 2 +-
src/test/ant/pom.xml | 8 ++++----
src/test/java/org/eclipse/aether/ant/ResolveTest.java | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/5c663b9a/src/test/ant/Resolve.xml
----------------------------------------------------------------------
diff --git a/src/test/ant/Resolve.xml b/src/test/ant/Resolve.xml
index 177b1f1..d753c29 100644
--- a/src/test/ant/Resolve.xml
+++ b/src/test/ant/Resolve.xml
@@ -63,7 +63,7 @@
<target name="testResolveAttachments">
<repo:resolve>
<dependencies>
- <dependency groupid="org.sonatype.aether" artifactid="aether-impl" version="1.11" />
+ <dependency groupid="org.eclipse.aether" artifactid="aether-impl" version="0.9.0.M3" />
</dependencies>
<files dir="${build.dir}/resolve-attachments/" layout="javadoc/{groupId}-{artifactId}-{classifier}.{extension}" attachments="javadoc"/>
<files dir="${build.dir}/resolve-attachments/" layout="sources/{groupId}-{artifactId}-{classifier}.{extension}" attachments="sources"/>
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/5c663b9a/src/test/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/test/ant/pom.xml b/src/test/ant/pom.xml
index 5dbd0ab..574e835 100644
--- a/src/test/ant/pom.xml
+++ b/src/test/ant/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2010, 2011 Sonatype, Inc.
+ ~ Copyright (c) 2010, 2014 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
@@ -26,17 +26,17 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aetherVersion>1.11</aetherVersion>
+ <aetherVersion>0.9.0.M3</aetherVersion>
</properties>
<dependencies>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.aether</groupId>
+ <groupId>org.eclipse.aether</groupId>
<artifactId>aether-system</artifactId>
<version>${aetherVersion}</version>
<type>pom</type>
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/5c663b9a/src/test/java/org/eclipse/aether/ant/ResolveTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/eclipse/aether/ant/ResolveTest.java b/src/test/java/org/eclipse/aether/ant/ResolveTest.java
index 2946f4c..a9bb1c4 100644
--- a/src/test/java/org/eclipse/aether/ant/ResolveTest.java
+++ b/src/test/java/org/eclipse/aether/ant/ResolveTest.java
@@ -37,7 +37,7 @@ public class ResolveTest
{
executeTarget( "testResolveGlobalPom" );
- String prop = getProject().getProperty( "test.resolve.path.org.sonatype.aether:aether-api:jar" );
+ String prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-api:jar" );
assertThat( "aether-api was not resolved as a property", prop, notNullValue() );
assertThat( "aether-api was not resolved to default local repository", prop,
allOf( containsString( "aether-api" ), endsWith( ".jar" ) ) );
@@ -47,7 +47,7 @@ public class ResolveTest
{
executeTarget( "testResolveOverrideGlobalPom" );
- String prop = getProject().getProperty( "test.resolve.path.org.sonatype.aether:aether-api:jar" );
+ String prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-api:jar" );
assertThat( "aether-api was not resolved as a property", prop, notNullValue() );
assertThat( "aether-api was not resolved to default local repository", prop,
allOf( containsString( "aether-api" ), endsWith( ".jar" ) ) );
@@ -57,10 +57,10 @@ public class ResolveTest
{
executeTarget( "testResolveGlobalPomIntoOtherLocalRepo" );
- String prop = getProject().getProperty( "test.resolve.path.org.sonatype.aether:aether-api:jar" );
+ String prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-api:jar" );
assertThat( "aether-api was not resolved as a property", prop, notNullValue() );
assertThat( "aether-api was not resolved to default local repository", prop.replace( '\\', '/' ),
- endsWith( "local-repo-custom/org/sonatype/aether/aether-api/1.11/aether-api-1.11.jar" ) );
+ endsWith( "local-repo-custom/org/eclipse/aether/aether-api/0.9.0.M3/aether-api-0.9.0.M3.jar" ) );
}
public void testResolveCustomFileLayout()
@@ -70,7 +70,7 @@ public class ResolveTest
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() );
+ new File( dir, "org.eclipse.aether/aether-api/org/eclipse/aether/jar" ).exists() );
}
public void testResolveAttachments()
@@ -82,13 +82,13 @@ public class ResolveTest
File jdocDir = new File(dir, "javadoc");
assertThat( "aether-api-javadoc was not saved with custom file layout",
- new File( jdocDir, "org.sonatype.aether-aether-api-javadoc.jar" ).exists() );
+ new File( jdocDir, "org.eclipse.aether-aether-api-javadoc.jar" ).exists() );
assertThat( "found non-javadoc files", Arrays.asList( jdocDir.list() ), everyItem( endsWith( "javadoc.jar" ) ) );
File sourcesDir = new File( dir, "sources" );
assertThat( "aether-api-sources was not saved with custom file layout",
- new File( sourcesDir, "org.sonatype.aether-aether-api-sources.jar" ).exists() );
+ new File( sourcesDir, "org.eclipse.aether-aether-api-sources.jar" ).exists() );
assertThat( "found non-sources files", Arrays.asList( sourcesDir.list() ),
everyItem( endsWith( "sources.jar" ) ) );
}