Repository: maven-aether Updated Branches: refs/heads/ant-tasks 222122a4f -> 261b17db3
http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/ReactorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/ReactorTest.java b/src/test/java/org/eclipse/aether/internal/ant/ReactorTest.java deleted file mode 100644 index 361f773..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/ReactorTest.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.eclipse.aether.internal.ant; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.io.File; -import java.io.IOException; - -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.ant.ProjectWorkspaceReader; - -public class ReactorTest - extends AntBuildsTest -{ - - private Artifact artifact( String coords ) - { - return new DefaultArtifact( coords ); - } - - public void testPom() - throws IOException - { - executeTarget( "testPom" ); - ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); - File found = reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ); - assertNotNull( found ); - assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); - } - - public void testArtifact() - throws IOException - { - executeTarget( "testArtifact" ); - ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); - File found = reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ); - assertNotNull( found ); - assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); - - found = reader.findArtifact( artifact( "test:test:xml:0.1-SNAPSHOT" ) ); - assertNotNull( found ); - assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); - } - - public void testArtifactInMemoryPom() - throws IOException - { - executeTarget( "testArtifactInMemoryPom" ); - ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); - File found = reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ); - assertNull( found ); - - found = reader.findArtifact( artifact( "test:test:xml:0.1-SNAPSHOT" ) ); - assertNotNull( found ); - assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); - } - - public void testResolveArtifact() - throws IOException - { - executeTarget( "testResolveArtifact" ); - String prop = project.getProperty( "resolve.test:test:jar" ); - assertEquals( new File( projectDir, "pom1.xml" ).getAbsolutePath(), prop ); - } - - public void testResolveArtifactInMemoryPom() - throws IOException - { - executeTarget( "testResolveArtifactInMemoryPom" ); - String prop = project.getProperty( "resolve.test:test:jar" ); - assertEquals( new File( projectDir, "pom1.xml" ).getAbsolutePath(), prop ); - assertLogContaining( "The POM for test:test:jar:0.1-SNAPSHOT is missing, no dependency information available" ); - } - - public void testResolveVersionRange() - throws IOException - { - executeTarget( "testResolveVersionRange" ); - String prop = project.getProperty( "resolve.test:test:jar" ); - assertEquals( new File( projectDir, "pom1.xml" ).getAbsolutePath(), prop ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/ResolveTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/ResolveTest.java b/src/test/java/org/eclipse/aether/internal/ant/ResolveTest.java deleted file mode 100644 index 6c27e7a..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/ResolveTest.java +++ /dev/null @@ -1,150 +0,0 @@ -package org.eclipse.aether.internal.ant; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; - -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.Map; - -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.FileResource; - -public class ResolveTest - extends AntBuildsTest -{ - - public void testResolveGlobalPom() - { - executeTarget( "testResolveGlobalPom" ); - - 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" ) ) ); - } - - public void testResolveOverrideGlobalPom() - { - executeTarget( "testResolveOverrideGlobalPom" ); - - 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" ) ) ); - } - - public void testResolveGlobalPomIntoOtherLocalRepo() - { - executeTarget( "testResolveGlobalPomIntoOtherLocalRepo" ); - - 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/eclipse/aether/aether-api/0.9.0.M3/aether-api-0.9.0.M3.jar" ) ); - } - - public void testResolveCustomFileLayout() - throws IOException - { - File dir = new File( BUILD_DIR, "resolve-custom-layout" ); - executeTarget( "testResolveCustomFileLayout" ); - - assertThat( "aether-api was not saved with custom file layout", - new File( dir, "org.eclipse.aether/aether-api/org/eclipse/aether/jar" ).exists() ); - } - - public void testResolveAttachments() - throws IOException - { - File dir = new File( BUILD_DIR, "resolve-attachments" ); - executeTarget( "testResolveAttachments" ); - - File jdocDir = new File(dir, "javadoc"); - - assertThat( "aether-api-javadoc was not saved with custom file layout", - 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.eclipse.aether-aether-api-sources.jar" ).exists() ); - assertThat( "found non-sources files", Arrays.asList( sourcesDir.list() ), - everyItem( endsWith( "sources.jar" ) ) ); - } - - public void testResolvePath() - { - executeTarget( "testResolvePath" ); - Map<?, ?> refs = getProject().getReferences(); - Object obj = refs.get( "out" ); - assertThat( "ref 'out' is no path", obj, instanceOf( Path.class ) ); - Path path = (Path) obj; - String[] elements = path.list(); - assertThat( "no aether-api on classpath", elements, - hasItemInArray( allOf( containsString( "aether-api" ), endsWith( ".jar" ) ) ) ); - } - - public void testResolveDepsFromFile() - { - executeTarget( "testResolveDepsFromFile" ); - - String prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-spi:jar" ); - assertThat( "aether-spi was not resolved as a property", prop, notNullValue() ); - assertThat( "aether-spi was not resolved to default local repository", prop, - allOf( containsString( "aether-spi" ), endsWith( ".jar" ) ) ); - prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-api:jar" ); - assertThat( "aether-api was resolved as a property", prop, nullValue() ); - } - - public void testResolveNestedDependencyCollections() - { - executeTarget( "testResolveNestedDependencyCollections" ); - - String prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-spi:jar" ); - assertThat( "aether-spi was not resolved as a property", prop, notNullValue() ); - prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-util:jar" ); - assertThat( "aether-util was not resolved as a property", prop, notNullValue() ); - prop = getProject().getProperty( "test.resolve.path.org.eclipse.aether:aether-api:jar" ); - assertThat( "aether-api was resolved as a property", prop, nullValue() ); - } - - public void testResolveResourceCollectionOnly() - { - executeTarget( "testResolveResourceCollectionOnly" ); - - ResourceCollection resources = (ResourceCollection) getProject().getReference( "files" ); - assertThat( resources, is( notNullValue() ) ); - assertThat( resources.size(), is( 2 ) ); - assertThat( resources.isFilesystemOnly(), is( true ) ); - Iterator<?> it = resources.iterator(); - FileResource file = (FileResource) it.next(); - assertThat( file.getFile().getName(), is( "aether-spi-0.9.0.v20140226.jar" ) ); - file = (FileResource) it.next(); - assertThat( file.getFile().getName(), is( "aether-api-0.9.0.v20140226.jar" ) ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/SettingsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/SettingsTest.java b/src/test/java/org/eclipse/aether/internal/ant/SettingsTest.java deleted file mode 100644 index 9d9bcf1..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/SettingsTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.eclipse.aether.internal.ant; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.hamcrest.MatcherAssert.*; -import static org.hamcrest.Matchers.*; - -import java.io.File; -import java.io.IOException; - -import org.eclipse.aether.internal.ant.AntRepoSys; - -public class SettingsTest - extends AntBuildsTest -{ - - public void testUserSettings() - { - executeTarget( "testUserSettings" ); - assertThat( "user settings not set", AntRepoSys.getInstance( getProject() ).getUserSettings().getName(), - equalTo( "userSettings.xml" ) ); - } - - public void testGlobalSettings() - { - executeTarget( "testGlobalSettings" ); - assertThat( "global settings not set", AntRepoSys.getInstance( getProject() ).getGlobalSettings().getName(), - equalTo( "globalSettings.xml" ) ); - } - - public void testBothSettings() - { - executeTarget( "testBothSettings" ); - assertThat( "global settings not set", AntRepoSys.getInstance( getProject() ).getGlobalSettings().getName(), - equalTo( "globalSettings.xml" ) ); - assertThat( "user settings not set", AntRepoSys.getInstance( getProject() ).getUserSettings().getName(), - equalTo( "userSettings.xml" ) ); - } - - public void testFallback() - throws IOException - { - executeTarget("setUp"); - assertThat( "no fallback to local settings", - AntRepoSys.getInstance( getProject() ).getUserSettings().getAbsolutePath(), endsWith( ".m2" - + File.separator + "settings.xml" ) ); - } -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/tasks/LayoutTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/tasks/LayoutTest.java b/src/test/java/org/eclipse/aether/internal/ant/tasks/LayoutTest.java deleted file mode 100644 index d1f11d5..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/tasks/LayoutTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.eclipse.aether.internal.ant.tasks; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.assertEquals; - -import org.apache.tools.ant.BuildException; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.ant.tasks.Layout; -import org.junit.Test; - -/** - */ -public class LayoutTest -{ - - @Test( expected = BuildException.class ) - public void testUnknownVariable() - { - new Layout( "{unknown}" ); - } - - @Test - public void testGetPath() - { - Layout layout; - - layout = - new Layout( "{groupIdDirs}/{artifactId}/{baseVersion}/{artifactId}-{version}-{classifier}.{extension}" ); - assertEquals( "org/apache/maven/maven-model/3.0-SNAPSHOT/maven-model-3.0-20100720.132618-1.jar", - layout.getPath( new DefaultArtifact( "org.apache.maven:maven-model:3.0-20100720.132618-1" ) ) ); - - layout = new Layout( "{groupId}/{artifactId}-{version}-{classifier}.{extension}" ); - assertEquals( "org.apache.maven/maven-model-3.0-sources.jar", - layout.getPath( new DefaultArtifact( "org.apache.maven:maven-model:jar:sources:3.0" ) ) ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/types/DependencyTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/types/DependencyTest.java b/src/test/java/org/eclipse/aether/internal/ant/types/DependencyTest.java deleted file mode 100644 index d804646..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/types/DependencyTest.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.eclipse.aether.internal.ant.types; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.*; - -import org.eclipse.aether.internal.ant.types.Dependency; -import org.junit.Test; - -/** - */ -public class DependencyTest -{ - - @Test - public void testSetCoordsGidAidVer() - { - Dependency dep = new Dependency(); - dep.setCoords( "gid:aid:ver" ); - - assertEquals( "gid", dep.getGroupId() ); - assertEquals( "aid", dep.getArtifactId() ); - assertEquals( "ver", dep.getVersion() ); - assertEquals( "jar", dep.getType() ); - assertEquals( "", dep.getClassifier() ); - assertEquals( "compile", dep.getScope() ); - } - - @Test - public void testSetCoordsGidAidVerScope() - { - Dependency dep = new Dependency(); - dep.setCoords( "gid:aid:ver:scope" ); - - assertEquals( "gid", dep.getGroupId() ); - assertEquals( "aid", dep.getArtifactId() ); - assertEquals( "ver", dep.getVersion() ); - assertEquals( "jar", dep.getType() ); - assertEquals( "", dep.getClassifier() ); - assertEquals( "scope", dep.getScope() ); - } - - @Test - public void testSetCoordsGidAidVerTypeScope() - { - Dependency dep = new Dependency(); - dep.setCoords( "gid:aid:ver:type:scope" ); - - assertEquals( "gid", dep.getGroupId() ); - assertEquals( "aid", dep.getArtifactId() ); - assertEquals( "ver", dep.getVersion() ); - assertEquals( "type", dep.getType() ); - assertEquals( "", dep.getClassifier() ); - assertEquals( "scope", dep.getScope() ); - } - - @Test - public void testSetCoordsGidAidVerTypeClsScope() - { - Dependency dep = new Dependency(); - dep.setCoords( "gid:aid:ver:type:cls:scope" ); - - assertEquals( "gid", dep.getGroupId() ); - assertEquals( "aid", dep.getArtifactId() ); - assertEquals( "ver", dep.getVersion() ); - assertEquals( "type", dep.getType() ); - assertEquals( "cls", dep.getClassifier() ); - assertEquals( "scope", dep.getScope() ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/types/ExclusionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/types/ExclusionTest.java b/src/test/java/org/eclipse/aether/internal/ant/types/ExclusionTest.java deleted file mode 100644 index c539655..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/types/ExclusionTest.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.eclipse.aether.internal.ant.types; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.*; - -import org.eclipse.aether.internal.ant.types.Exclusion; -import org.junit.Test; - -/** - */ -public class ExclusionTest -{ - - @Test - public void testSetCoordsGid() - { - Exclusion ex = new Exclusion(); - ex.setCoords( "gid" ); - - assertEquals( "gid", ex.getGroupId() ); - assertEquals( "*", ex.getArtifactId() ); - assertEquals( "*", ex.getExtension() ); - assertEquals( "*", ex.getClassifier() ); - } - - @Test - public void testSetCoordsGidAid() - { - Exclusion ex = new Exclusion(); - ex.setCoords( "gid:aid" ); - - assertEquals( "gid", ex.getGroupId() ); - assertEquals( "aid", ex.getArtifactId() ); - assertEquals( "*", ex.getExtension() ); - assertEquals( "*", ex.getClassifier() ); - } - - @Test - public void testSetCoordsGidAidExt() - { - Exclusion ex = new Exclusion(); - ex.setCoords( "gid:aid:ext" ); - - assertEquals( "gid", ex.getGroupId() ); - assertEquals( "aid", ex.getArtifactId() ); - assertEquals( "ext", ex.getExtension() ); - assertEquals( "*", ex.getClassifier() ); - } - - @Test - public void testSetCoordsGidAidExtCls() - { - Exclusion ex = new Exclusion(); - ex.setCoords( "gid:aid:ext:cls" ); - - assertEquals( "gid", ex.getGroupId() ); - assertEquals( "aid", ex.getArtifactId() ); - assertEquals( "ext", ex.getExtension() ); - assertEquals( "cls", ex.getClassifier() ); - - ex = new Exclusion(); - ex.setCoords( "gid:aid:ext:" ); - - assertEquals( "gid", ex.getGroupId() ); - assertEquals( "aid", ex.getArtifactId() ); - assertEquals( "ext", ex.getExtension() ); - assertEquals( "", ex.getClassifier() ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/java/org/eclipse/aether/internal/ant/types/PomTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/internal/ant/types/PomTest.java b/src/test/java/org/eclipse/aether/internal/ant/types/PomTest.java deleted file mode 100644 index d1f0760..0000000 --- a/src/test/java/org/eclipse/aether/internal/ant/types/PomTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.eclipse.aether.internal.ant.types; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import static org.junit.Assert.*; - -import org.eclipse.aether.internal.ant.types.Pom; -import org.junit.Test; - -/** - */ -public class PomTest -{ - - @Test - public void testSetCoordsGid() - { - Pom pom = new Pom(); - pom.setCoords( "gid:aid:ver" ); - - assertEquals( "gid", pom.getGroupId() ); - assertEquals( "aid", pom.getArtifactId() ); - assertEquals( "ver", pom.getVersion() ); - } - -} http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/Deploy/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Deploy/ant.xml b/src/test/resources/ant/Deploy/ant.xml index 0231fad..1b019f5 100644 --- a/src/test/resources/ant/Deploy/ant.xml +++ b/src/test/resources/ant/Deploy/ant.xml @@ -23,7 +23,7 @@ <!ENTITY common SYSTEM "../common.xml"> ]> -<project xmlns:repo="antlib:org.eclipse.aether.ant"> +<project xmlns:repo="antlib:org.apache.maven.aether.ant"> &common; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/Install/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Install/ant.xml b/src/test/resources/ant/Install/ant.xml index 98ea39a..1a3ace5 100644 --- a/src/test/resources/ant/Install/ant.xml +++ b/src/test/resources/ant/Install/ant.xml @@ -23,7 +23,7 @@ <!ENTITY common SYSTEM "../common.xml"> ]> -<project xmlns:repo="antlib:org.eclipse.aether.ant"> +<project xmlns:repo="antlib:org.apache.maven.aether.ant"> &common; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/Reactor/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Reactor/ant.xml b/src/test/resources/ant/Reactor/ant.xml index 62f91b3..3cc0ca9 100644 --- a/src/test/resources/ant/Reactor/ant.xml +++ b/src/test/resources/ant/Reactor/ant.xml @@ -23,7 +23,7 @@ <!ENTITY common SYSTEM "../common.xml"> ]> -<project xmlns:repo="antlib:org.eclipse.aether.ant"> +<project xmlns:repo="antlib:org.apache.maven.aether.ant"> &common; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/Resolve/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Resolve/ant.xml b/src/test/resources/ant/Resolve/ant.xml index d50c322..fbad0c9 100644 --- a/src/test/resources/ant/Resolve/ant.xml +++ b/src/test/resources/ant/Resolve/ant.xml @@ -23,7 +23,7 @@ <!ENTITY common SYSTEM "../common.xml"> ]> -<project xmlns:repo="antlib:org.eclipse.aether.ant"> +<project xmlns:repo="antlib:org.apache.maven.aether.ant"> &common; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/Settings/ant.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Settings/ant.xml b/src/test/resources/ant/Settings/ant.xml index b7f0581..313885e 100644 --- a/src/test/resources/ant/Settings/ant.xml +++ b/src/test/resources/ant/Settings/ant.xml @@ -23,7 +23,7 @@ <!ENTITY common SYSTEM "../common.xml"> ]> -<project xmlns:repo="antlib:org.eclipse.aether.ant"> +<project xmlns:repo="antlib:org.apache.maven.aether.ant"> &common; http://git-wip-us.apache.org/repos/asf/maven-aether/blob/261b17db/src/test/resources/ant/common.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/common.xml b/src/test/resources/ant/common.xml index de3c0de..669633d 100644 --- a/src/test/resources/ant/common.xml +++ b/src/test/resources/ant/common.xml @@ -17,4 +17,4 @@ under the License. --> -<taskdef uri="antlib:org.eclipse.aether.ant" resource="org/eclipse/aether/ant/antlib.xml"/> +<taskdef uri="antlib:org.apache.maven.aether.ant" resource="org/eclipse/aether/ant/antlib.xml"/>
