Refactored test resource structure to isolate tests from each other
Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/9d039ef1 Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/9d039ef1 Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/9d039ef1 Branch: refs/heads/ant-tasks Commit: 9d039ef1317830df0ab85eedab045591db65dc3c Parents: 1e36b78 Author: Benjamin Bentmann <bentm...@sonatype.com> Authored: Thu Jan 2 22:22:35 2014 +0100 Committer: Benjamin Bentmann <bentm...@sonatype.com> Committed: Thu Jan 2 22:22:35 2014 +0100 ---------------------------------------------------------------------- src/test/ant/Deploy.xml | 64 ---------------- src/test/ant/Install.xml | 63 --------------- src/test/ant/Reactor.xml | 58 -------------- src/test/ant/Resolve.xml | 81 -------------------- src/test/ant/Settings.xml | 38 --------- src/test/ant/common.xml | 12 --- src/test/ant/dummy-pom.xml | 26 ------- src/test/ant/other-pom.xml | 26 ------- src/test/ant/pom.xml | 47 ------------ src/test/ant/reactor/pom1.xml | 26 ------- src/test/ant/reactor/pom2.xml | 34 -------- .../org/eclipse/aether/ant/AntBuildsTest.java | 26 ++++++- .../java/org/eclipse/aether/ant/DeployTest.java | 11 +-- .../org/eclipse/aether/ant/InstallTest.java | 20 ++--- .../aether/ant/ProjectWorkspaceReaderTest.java | 50 +++--------- .../org/eclipse/aether/ant/ReactorTest.java | 24 ++---- .../org/eclipse/aether/ant/ResolveTest.java | 9 --- .../org/eclipse/aether/ant/SettingsTest.java | 10 +-- .../ProjectWorkspaceReader/dummy-file.txt | 1 + .../ProjectWorkspaceReader/dummy-pom.xml | 26 +++++++ src/test/resources/ant/Deploy/ant.xml | 64 ++++++++++++++++ src/test/resources/ant/Deploy/dummy-pom.xml | 26 +++++++ src/test/resources/ant/Deploy/other-pom.xml | 26 +++++++ src/test/resources/ant/Install/ant.xml | 63 +++++++++++++++ src/test/resources/ant/Install/dummy-pom.xml | 26 +++++++ src/test/resources/ant/Install/other-pom.xml | 26 +++++++ src/test/resources/ant/Reactor/ant.xml | 58 ++++++++++++++ src/test/resources/ant/Reactor/pom1.xml | 26 +++++++ src/test/resources/ant/Reactor/pom2.xml | 34 ++++++++ src/test/resources/ant/Resolve/ant.xml | 81 ++++++++++++++++++++ src/test/resources/ant/Resolve/dummy-pom.xml | 26 +++++++ src/test/resources/ant/Resolve/pom.xml | 47 ++++++++++++ src/test/resources/ant/Settings/ant.xml | 38 +++++++++ src/test/resources/ant/common.xml | 12 +++ 34 files changed, 631 insertions(+), 574 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/Deploy.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/Deploy.xml b/src/test/ant/Deploy.xml deleted file mode 100644 index ed9291f..0000000 --- a/src/test/ant/Deploy.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<!DOCTYPE project [ - <!ENTITY common SYSTEM "common.xml"> -]> - -<project xmlns:repo="antlib:org.eclipse.aether.ant"> - - &common; - - <repo:remoterepo id="distrepo" url="${project.distrepo.url}" type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> - - <target name="setUp"> - <touch file="${project.dir}/dummy-pom.xml"/> - <touch file="${project.dir}/other-pom.xml"/> - <touch file="${project.dir}/common.xml"/> - </target> - - <target name="testDeployGlobalPom" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:deploy remotereporef="distrepo"/> - </target> - - <target name="testDeployOverrideGlobalPom" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:deploy remotereporef="distrepo"> - <pom file="${project.dir}/other-pom.xml"/> - </repo:deploy> - </target> - - <target name="testDeployOverrideGlobalPomByRef" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:pom file="${project.dir}/other-pom.xml" id="other"/> - <repo:deploy remotereporef="distrepo"/> - <repo:deploy pomref="other" remotereporef="distrepo"/> - </target> - - <target name="testDeployAttachedArtifact" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:artifact classifier="ant" file="${project.dir}/common.xml" id="ant"/> - <repo:deploy remotereporef="distrepo"> - <repo:artifact refid="ant"/> - </repo:deploy> - </target> - - <target name="testInlineRepo" depends="setUp"> - <repo:localrepo dir="${build.dir}/local-repo-custom" /> - <repo:deploy pomref="pom" remotereporef="distrepo"> - <repo:artifact refid="ant"/> - </repo:deploy> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/Install.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/Install.xml b/src/test/ant/Install.xml deleted file mode 100644 index f083500..0000000 --- a/src/test/ant/Install.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<!DOCTYPE project [ - <!ENTITY common SYSTEM "common.xml"> -]> - -<project xmlns:repo="antlib:org.eclipse.aether.ant"> - - &common; - - <repo:pom file="${project.dir}/dummy-pom.xml" id="pom"/> - <repo:artifact classifier="ant" file="${project.dir}/common.xml" id="ant"/> - - <target name="setUp"> - <touch file="${project.dir}/dummy-pom.xml"/> - <touch file="${project.dir}/other-pom.xml"/> - <touch file="${project.dir}/common.xml"/> - </target> - - <target name="testInstallGlobalPom" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:install/> - </target> - - <target name="testInstallOverrideGlobalPom" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:install> - <pom file="${project.dir}/other-pom.xml"/> - </repo:install> - </target> - - <target name="testInstallOverrideGlobalPomByRef" depends="setUp"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:pom file="${project.dir}/other-pom.xml" id="other"/> - <repo:install/> - <repo:install pomref="other"/> - </target> - - <target name="testDefaultRepo" depends="setUp"> - <repo:install pomref="pom"> - <repo:artifact refid="ant"/> - </repo:install> - </target> - - <target name="testCustomRepo" depends="setUp"> - <repo:localrepo dir="${build.dir}/local-repo-custom" /> - <repo:install pomref="pom"> - <repo:artifact refid="ant"/> - </repo:install> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/Reactor.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/Reactor.xml b/src/test/ant/Reactor.xml deleted file mode 100644 index cad36fc..0000000 --- a/src/test/ant/Reactor.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<!DOCTYPE project [ - <!ENTITY common SYSTEM "common.xml"> -]> - -<project xmlns:repo="antlib:org.eclipse.aether.ant"> - - &common; - - <target name="testPom"> - <repo:pom file="${project.dir}/reactor/pom1.xml"/> - </target> - - <target name="testArtifact"> - <repo:pom file="${project.dir}/reactor/pom1.xml" id="pom"/> - <repo:artifact pomref="pom" file="${project.dir}/reactor/pom1.xml"/> - </target> - - <target name="testArtifactInMemoryPom"> - <repo:pom groupid="test" artifactid="test" version="0.1-SNAPSHOT" id="pom"/> - <repo:artifact pomref="pom" file="${project.dir}/reactor/pom1.xml"/> - </target> - - <target name="testResolveArtifact"> - <repo:pom file="${project.dir}/reactor/pom1.xml" id="pom"/> - <repo:artifact pomref="pom" file="${project.dir}/reactor/pom1.xml" type="jar"/> - <repo:pom file="${project.dir}/reactor/pom2.xml" id="pom2"/> - - <repo:resolve> - <dependencies pomref="pom2"/> - <properties prefix="resolve"/> - </repo:resolve> - </target> - - <target name="testResolveArtifactInMemoryPom"> - <repo:pom groupid="test" artifactid="test" version="0.1-SNAPSHOT" id="pom"/> - <repo:artifact pomref="pom" file="${project.dir}/reactor/pom1.xml" type="jar"/> - <repo:pom file="${project.dir}/reactor/pom2.xml" id="pom2"/> - - <repo:resolve> - <dependencies pomref="pom2"/> - <properties prefix="resolve"/> - </repo:resolve> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/Resolve.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/Resolve.xml b/src/test/ant/Resolve.xml deleted file mode 100644 index d753c29..0000000 --- a/src/test/ant/Resolve.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<!DOCTYPE project [ - <!ENTITY common SYSTEM "common.xml"> -]> - -<project xmlns:repo="antlib:org.eclipse.aether.ant"> - - &common; - - <repo:remoterepo id="remote" url="http://repo1.maven.org/maven2"; type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> - <repo:remoterepos id="aether.repositories"> - <repo:remoterepo refid="remote"/> - </repo:remoterepos> - - <target name="setUp"> - <delete dir="${build.dir}/resolvetest-local-repo"/> - </target> - - <target name="testResolveGlobalPom"> - <repo:pom file="${project.dir}/pom.xml"/> - <repo:resolve> - <properties prefix="test.resolve.path" classpath="compile"/> - </repo:resolve> - </target> - - <target name="testResolveOverrideGlobalPom"> - <repo:pom file="${project.dir}/dummy-pom.xml"/> - <repo:resolve> - <dependencies> - <pom file="${project.dir}/pom.xml"/> - </dependencies> - <properties prefix="test.resolve.path" classpath="compile"/> - </repo:resolve> - </target> - - <target name="testResolveGlobalPomIntoOtherLocalRepo"> - <repo:localrepo dir="${build.dir}/local-repo-custom"/> - <repo:pom file="${project.dir}/pom.xml"/> - <repo:resolve> - <properties prefix="test.resolve.path" classpath="compile"/> - </repo:resolve> - </target> - - <target name="testResolveCustomFileLayout"> - <repo:pom file="${project.dir}/pom.xml"/> - <repo:resolve> - <files dir="${build.dir}/resolve-custom-layout/" layout="{groupId}/{artifactId}/{groupIdDirs}/{extension}"/> - </repo:resolve> - </target> - - <target name="testResolveAttachments"> - <repo:resolve> - <dependencies> - <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"/> - </repo:resolve> - </target> - - <target name="testResolvePath"> - <repo:pom file="${project.dir}/pom.xml"/> - <repo:resolve> - <path refid="out" classpath="compile"/> - </repo:resolve> - <echo>${tostring:out}</echo> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/Settings.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/Settings.xml b/src/test/ant/Settings.xml deleted file mode 100644 index 115069a..0000000 --- a/src/test/ant/Settings.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<!DOCTYPE project [ - <!ENTITY common SYSTEM "common.xml"> -]> - -<project xmlns:repo="antlib:org.eclipse.aether.ant"> - - &common; - - <target name="setUp"> - <!-- touch file="${project.dir}/common.xml"/--> - </target> - - <target name="testUserSettings" depends="setUp"> - <repo:settings file="userSettings.xml"/> - </target> - - <target name="testGlobalSettings" depends="setUp"> - <repo:settings globalfile="globalSettings.xml"/> - </target> - - <target name="testBothSettings" depends="setUp"> - <repo:settings file="userSettings.xml" globalfile="globalSettings.xml"/> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/common.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/common.xml b/src/test/ant/common.xml deleted file mode 100644 index 361b953..0000000 --- a/src/test/ant/common.xml +++ /dev/null @@ -1,12 +0,0 @@ -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<taskdef uri="antlib:org.eclipse.aether.ant" resource="org/eclipse/aether/ant/antlib.xml"/> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/dummy-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/dummy-pom.xml b/src/test/ant/dummy-pom.xml deleted file mode 100644 index 8c76e0c..0000000 --- a/src/test/ant/dummy-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>test</groupId> - <artifactId>test</artifactId> - <version>0.1-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/other-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/other-pom.xml b/src/test/ant/other-pom.xml deleted file mode 100644 index 86d035e..0000000 --- a/src/test/ant/other-pom.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>test</groupId> - <artifactId>other</artifactId> - <version>0.1-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/pom.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/pom.xml b/src/test/ant/pom.xml deleted file mode 100644 index 574e835..0000000 --- a/src/test/ant/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.sonatype.forge</groupId> - <artifactId>forge-parent</artifactId> - <version>10</version> - </parent> - - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-ant-tasks</artifactId> - <version>1.0-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <aetherVersion>0.9.0.M3</aetherVersion> - </properties> - - <dependencies> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-api</artifactId> - <version>${aetherVersion}</version> - </dependency> - <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-system</artifactId> - <version>${aetherVersion}</version> - <type>pom</type> - <scope>system</scope> - <systemPath>${basedir}/pom.xml</systemPath> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/reactor/pom1.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/reactor/pom1.xml b/src/test/ant/reactor/pom1.xml deleted file mode 100644 index a5d423f..0000000 --- a/src/test/ant/reactor/pom1.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>test</groupId> - <artifactId>test</artifactId> - <version>0.1-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/ant/reactor/pom2.xml ---------------------------------------------------------------------- diff --git a/src/test/ant/reactor/pom2.xml b/src/test/ant/reactor/pom2.xml deleted file mode 100644 index 569b9e5..0000000 --- a/src/test/ant/reactor/pom2.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Copyright (c) 2010, 2011 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 - ~ http://www.eclipse.org/legal/epl-v10.html - ~ - ~ Contributors: - ~ Sonatype, Inc. - initial API and implementation ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>test</groupId> - <artifactId>test2</artifactId> - <version>0.1-SNAPSHOT</version> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <dependencies> - <dependency> - <groupId>test</groupId> - <artifactId>test</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java b/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java index 6de1e26..3dca901 100644 --- a/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java +++ b/src/test/java/org/eclipse/aether/ant/AntBuildsTest.java @@ -16,6 +16,7 @@ import java.io.PrintStream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.DefaultLogger; +import org.apache.tools.ant.Project; import org.eclipse.aether.internal.test.util.TestFileUtils; public abstract class AntBuildsTest @@ -28,12 +29,30 @@ public abstract class AntBuildsTest static { - BASE_DIR = new File( "." ).getAbsoluteFile(); + BASE_DIR = new File( "" ).getAbsoluteFile(); BUILD_DIR = new File( BASE_DIR, "target/ant" ); } + protected File projectDir; + protected File localRepoDir; + protected String getProjectDirName() + { + String name = getClass().getSimpleName(); + if ( name.endsWith( "Test" ) ) + { + name = name.substring( 0, name.length() - 4 ); + } + return name; + } + + protected void setUpProperties() + throws Exception + { + // hook for subclasses to set further system properties for the project to pick up + } + @Override protected void setUp() throws Exception @@ -42,12 +61,15 @@ public abstract class AntBuildsTest TestFileUtils.deleteFile( BUILD_DIR ); - File projectDir = new File( BASE_DIR, "src/test/ant" ); + projectDir = new File( new File( BASE_DIR, "src/test/resources/ant" ), getProjectDirName() ); localRepoDir = new File( BUILD_DIR, "local-repo" ); System.setProperty( "project.dir", projectDir.getAbsolutePath() ); System.setProperty( "build.dir", BUILD_DIR.getAbsolutePath() ); System.setProperty( "maven.repo.local", localRepoDir.getAbsolutePath() ); + setUpProperties(); + + configureProject( new File( projectDir, "ant.xml" ).getAbsolutePath(), Project.MSG_VERBOSE ); } @Override http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/DeployTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/DeployTest.java b/src/test/java/org/eclipse/aether/ant/DeployTest.java index e404a1f..2107bf9 100644 --- a/src/test/java/org/eclipse/aether/ant/DeployTest.java +++ b/src/test/java/org/eclipse/aether/ant/DeployTest.java @@ -27,13 +27,10 @@ public class DeployTest private File distRepoDir; @Override - protected void setUp() - throws Exception + protected void setUpProperties() { - super.setUp(); distRepoDir = new File( BUILD_DIR, "dist-repo" ); System.setProperty( "project.distrepo.url", distRepoDir.toURI().toString() ); - configureProject( "src/test/ant/Deploy.xml" ); } public void testDeployGlobalPom() @@ -43,7 +40,7 @@ public class DeployTest assertLogContaining( "Uploading" ); - assertUpdatedFile( tstamp, distRepoDir, "test/test/0.1-SNAPSHOT/maven-metadata.xml" ); + assertUpdatedFile( tstamp, distRepoDir, "test/dummy/0.1-SNAPSHOT/maven-metadata.xml" ); } public void testDeployOverrideGlobalPom() @@ -63,7 +60,7 @@ public class DeployTest assertLogContaining( "Uploading" ); - assertUpdatedFile( tstamp, distRepoDir, "test/test/0.1-SNAPSHOT/maven-metadata.xml" ); + assertUpdatedFile( tstamp, distRepoDir, "test/dummy/0.1-SNAPSHOT/maven-metadata.xml" ); assertUpdatedFile( tstamp, distRepoDir, "test/other/0.1-SNAPSHOT/maven-metadata.xml" ); } @@ -73,7 +70,7 @@ public class DeployTest assertLogContaining( "Uploading" ); - File dir = new File(distRepoDir, "test/test/0.1-SNAPSHOT/" ); + File dir = new File(distRepoDir, "test/dummy/0.1-SNAPSHOT/" ); String[] files = dir.list(); assertThat( "attached artifact not found: " + Arrays.toString( files ), files, hasItemInArray( endsWith( "-ant.xml" ) ) ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/InstallTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/InstallTest.java b/src/test/java/org/eclipse/aether/ant/InstallTest.java index c375c54..33d662d 100644 --- a/src/test/java/org/eclipse/aether/ant/InstallTest.java +++ b/src/test/java/org/eclipse/aether/ant/InstallTest.java @@ -20,14 +20,6 @@ public class InstallTest extends AntBuildsTest { - @Override - protected void setUp() - throws Exception - { - super.setUp(); - configureProject( "src/test/ant/Install.xml" ); - } - public void testInstallGlobalPom() { executeTarget( "testInstallGlobalPom" ); @@ -35,7 +27,7 @@ public class InstallTest assertLogContaining( "Installing" ); - assertUpdatedFile( tstamp, localRepoDir, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.pom" ); + assertUpdatedFile( tstamp, localRepoDir, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT.pom" ); } public void testInstallOverrideGlobalPom() @@ -55,7 +47,7 @@ public class InstallTest assertLogContaining( "Installing" ); - assertUpdatedFile( tstamp, localRepoDir, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.pom" ); + assertUpdatedFile( tstamp, localRepoDir, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT.pom" ); assertUpdatedFile( tstamp, localRepoDir, "test/other/0.1-SNAPSHOT/other-0.1-SNAPSHOT.pom" ); } @@ -66,8 +58,8 @@ public class InstallTest assertLogContaining( "Installing" ); - assertUpdatedFile( tstamp, localRepoDir, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT.pom" ); - assertUpdatedFile( tstamp, localRepoDir, "test/test/0.1-SNAPSHOT/test-0.1-SNAPSHOT-ant.xml" ); + assertUpdatedFile( tstamp, localRepoDir, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT.pom" ); + assertUpdatedFile( tstamp, localRepoDir, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT-ant.xml" ); } public void testCustomRepo() @@ -81,8 +73,8 @@ public class InstallTest System.out.println( getLog() ); assertLogContaining( "Installing" ); - 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" ); + assertUpdatedFile( tstamp, repoPath, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT.pom" ); + assertUpdatedFile( tstamp, repoPath, "test/dummy/0.1-SNAPSHOT/dummy-0.1-SNAPSHOT-ant.xml" ); } private void assertUpdatedFile( long tstamp, File repoPath, String path ) http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/ProjectWorkspaceReaderTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/ProjectWorkspaceReaderTest.java b/src/test/java/org/eclipse/aether/ant/ProjectWorkspaceReaderTest.java index 720f8fb..e5a6bc7 100644 --- a/src/test/java/org/eclipse/aether/ant/ProjectWorkspaceReaderTest.java +++ b/src/test/java/org/eclipse/aether/ant/ProjectWorkspaceReaderTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 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 @@ -44,72 +44,42 @@ public class ProjectWorkspaceReaderTest return new DefaultArtifact( coords ); } - @Test - public void testFindPom() + private File getFile( String name ) { - Pom pom = new Pom(); - pom.setProject( project ); - pom.setFile( new File( "src/test/ant/dummy-pom.xml" ) ); - - reader.addPom( pom ); - - assertEquals( new File( "src/test/ant/dummy-pom.xml" ), - reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ) ); + return new File( "src/test/resources/ProjectWorkspaceReader", name ); } @Test - public void testFindNoPom() + public void testFindPom() { - assertNull( reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ) ); - Pom pom = new Pom(); pom.setProject( project ); - pom.setFile( new File( "src/test/ant/dummy-pom.xml" ) ); + pom.setFile( getFile( "dummy-pom.xml" ) ); reader.addPom( pom ); + assertEquals( pom.getFile(), reader.findArtifact( artifact( "test:dummy:pom:0.1-SNAPSHOT" ) ) ); assertNull( reader.findArtifact( artifact( "unavailable:test:pom:0.1-SNAPSHOT" ) ) ); } @Test - public void testFindNoArtifact() + public void testFindArtifact() { - assertNull( reader.findArtifact( artifact( "test:test:jar:0.1-SNAPSHOT" ) ) ); - Pom pom = new Pom(); pom.setProject( project ); - pom.setFile( new File( "src/test/ant/dummy-pom.xml" ) ); + pom.setFile( getFile( "dummy-pom.xml" ) ); reader.addPom( pom ); org.eclipse.aether.ant.types.Artifact artifact = new org.eclipse.aether.ant.types.Artifact(); artifact.setProject( project ); artifact.addPom( pom ); - artifact.setFile( new File( "src/test/ant/common.xml" ) ); + artifact.setFile( getFile( "dummy-file.txt" ) ); reader.addArtifact( artifact ); + assertEquals( artifact.getFile(), reader.findArtifact( artifact( "test:dummy:txt:0.1-SNAPSHOT" ) ) ); assertNull( reader.findArtifact( artifact( "unavailable:test:jar:0.1-SNAPSHOT" ) ) ); } - @Test - public void testFindArtifact() - { - assertNull( reader.findArtifact( artifact( "test:test:jar:0.1-SNAPSHOT" ) ) ); - - Pom pom = new Pom(); - pom.setProject( project ); - pom.setFile( new File( "src/test/ant/dummy-pom.xml" ) ); - - reader.addPom( pom ); - - org.eclipse.aether.ant.types.Artifact artifact = new org.eclipse.aether.ant.types.Artifact(); - artifact.setProject( project ); - artifact.addPom( pom ); - artifact.setFile( new File( "src/test/ant/common.xml" ) ); - - reader.addArtifact( artifact ); - - assertNull( reader.findArtifact( artifact( "test:test:jar:0.1-SNAPSHOT" ) ) ); - } } http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/ReactorTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/ReactorTest.java b/src/test/java/org/eclipse/aether/ant/ReactorTest.java index f8483af..ea56fae 100644 --- a/src/test/java/org/eclipse/aether/ant/ReactorTest.java +++ b/src/test/java/org/eclipse/aether/ant/ReactorTest.java @@ -13,7 +13,6 @@ package org.eclipse.aether.ant; import java.io.File; import java.io.IOException; -import org.apache.tools.ant.Project; import org.eclipse.aether.ant.ProjectWorkspaceReader; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -22,17 +21,6 @@ public class ReactorTest extends AntBuildsTest { - private File pomDir; - - @Override - protected void setUp() - throws Exception - { - super.setUp(); - pomDir = new File( "src/test/ant/reactor" ).getAbsoluteFile(); - configureProject( "src/test/ant/Reactor.xml", Project.MSG_VERBOSE ); - } - private Artifact artifact( String coords ) { return new DefaultArtifact( coords ); @@ -45,7 +33,7 @@ public class ReactorTest ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); File found = reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ); assertNotNull( found ); - assertEquals( new File( pomDir, "pom1.xml" ), found.getAbsoluteFile() ); + assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); } public void testArtifact() @@ -55,11 +43,11 @@ public class ReactorTest ProjectWorkspaceReader reader = ProjectWorkspaceReader.getInstance(); File found = reader.findArtifact( artifact( "test:test:pom:0.1-SNAPSHOT" ) ); assertNotNull( found ); - assertEquals( new File( pomDir, "pom1.xml" ), found.getAbsoluteFile() ); + assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); found = reader.findArtifact( artifact( "test:test:xml:0.1-SNAPSHOT" ) ); assertNotNull( found ); - assertEquals( new File( pomDir, "pom1.xml" ), found.getAbsoluteFile() ); + assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); } public void testArtifactInMemoryPom() @@ -72,7 +60,7 @@ public class ReactorTest found = reader.findArtifact( artifact( "test:test:xml:0.1-SNAPSHOT" ) ); assertNotNull( found ); - assertEquals( new File( pomDir, "pom1.xml" ), found.getAbsoluteFile() ); + assertEquals( new File( projectDir, "pom1.xml" ), found.getAbsoluteFile() ); } public void testResolveArtifact() @@ -80,7 +68,7 @@ public class ReactorTest { executeTarget( "testResolveArtifact" ); String prop = project.getProperty( "resolve.test:test:jar" ); - assertEquals( new File( "src/test/ant/reactor/pom1.xml" ).getAbsolutePath(), prop ); + assertEquals( new File( projectDir, "pom1.xml" ).getAbsolutePath(), prop ); } public void testResolveArtifactInMemoryPom() @@ -88,7 +76,7 @@ public class ReactorTest { executeTarget( "testResolveArtifactInMemoryPom" ); String prop = project.getProperty( "resolve.test:test:jar" ); - assertEquals( new File( "src/test/ant/reactor/pom1.xml" ).getAbsolutePath(), prop ); + assertEquals( new File( projectDir, "pom1.xml" ).getAbsolutePath(), prop ); assertLogContaining( "The POM for test:test:jar:0.1-SNAPSHOT is missing, no dependency information available" ); } } http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 a9bb1c4..5505c20 100644 --- a/src/test/java/org/eclipse/aether/ant/ResolveTest.java +++ b/src/test/java/org/eclipse/aether/ant/ResolveTest.java @@ -18,21 +18,12 @@ import java.io.IOException; import java.util.Arrays; import java.util.Map; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Path; public class ResolveTest extends AntBuildsTest { - @Override - protected void setUp() - throws Exception - { - super.setUp(); - configureProject( "src/test/ant/Resolve.xml", Project.MSG_VERBOSE ); - } - public void testResolveGlobalPom() { executeTarget( "testResolveGlobalPom" ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/java/org/eclipse/aether/ant/SettingsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/eclipse/aether/ant/SettingsTest.java b/src/test/java/org/eclipse/aether/ant/SettingsTest.java index 7d327ce..d292a21 100644 --- a/src/test/java/org/eclipse/aether/ant/SettingsTest.java +++ b/src/test/java/org/eclipse/aether/ant/SettingsTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * 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 @@ -20,14 +20,6 @@ public class SettingsTest extends AntBuildsTest { - @Override - protected void setUp() - throws Exception - { - super.setUp(); - configureProject( "src/test/ant/Settings.xml" ); - } - public void testUserSettings() { executeTarget( "testUserSettings" ); http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ProjectWorkspaceReader/dummy-file.txt ---------------------------------------------------------------------- diff --git a/src/test/resources/ProjectWorkspaceReader/dummy-file.txt b/src/test/resources/ProjectWorkspaceReader/dummy-file.txt new file mode 100644 index 0000000..b8a5cfa --- /dev/null +++ b/src/test/resources/ProjectWorkspaceReader/dummy-file.txt @@ -0,0 +1 @@ +A test artifact. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ProjectWorkspaceReader/dummy-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ProjectWorkspaceReader/dummy-pom.xml b/src/test/resources/ProjectWorkspaceReader/dummy-pom.xml new file mode 100644 index 0000000..6f26067 --- /dev/null +++ b/src/test/resources/ProjectWorkspaceReader/dummy-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>dummy</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 new file mode 100644 index 0000000..a4f660e --- /dev/null +++ b/src/test/resources/ant/Deploy/ant.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<!DOCTYPE project [ + <!ENTITY common SYSTEM "../common.xml"> +]> + +<project xmlns:repo="antlib:org.eclipse.aether.ant"> + + &common; + + <repo:remoterepo id="distrepo" url="${project.distrepo.url}" type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> + + <target name="setUp"> + <touch file="${project.dir}/dummy-pom.xml"/> + <touch file="${project.dir}/other-pom.xml"/> + <touch file="${project.dir}/ant.xml"/> + </target> + + <target name="testDeployGlobalPom" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:deploy remotereporef="distrepo"/> + </target> + + <target name="testDeployOverrideGlobalPom" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:deploy remotereporef="distrepo"> + <pom file="${project.dir}/other-pom.xml"/> + </repo:deploy> + </target> + + <target name="testDeployOverrideGlobalPomByRef" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:pom file="${project.dir}/other-pom.xml" id="other"/> + <repo:deploy remotereporef="distrepo"/> + <repo:deploy pomref="other" remotereporef="distrepo"/> + </target> + + <target name="testDeployAttachedArtifact" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:artifact classifier="ant" file="${project.dir}/ant.xml" id="ant"/> + <repo:deploy remotereporef="distrepo"> + <repo:artifact refid="ant"/> + </repo:deploy> + </target> + + <target name="testInlineRepo" depends="setUp"> + <repo:localrepo dir="${build.dir}/local-repo-custom" /> + <repo:deploy pomref="pom" remotereporef="distrepo"> + <repo:artifact refid="ant"/> + </repo:deploy> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Deploy/dummy-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Deploy/dummy-pom.xml b/src/test/resources/ant/Deploy/dummy-pom.xml new file mode 100644 index 0000000..6f26067 --- /dev/null +++ b/src/test/resources/ant/Deploy/dummy-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>dummy</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Deploy/other-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Deploy/other-pom.xml b/src/test/resources/ant/Deploy/other-pom.xml new file mode 100644 index 0000000..86d035e --- /dev/null +++ b/src/test/resources/ant/Deploy/other-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>other</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 new file mode 100644 index 0000000..ec3228b --- /dev/null +++ b/src/test/resources/ant/Install/ant.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<!DOCTYPE project [ + <!ENTITY common SYSTEM "../common.xml"> +]> + +<project xmlns:repo="antlib:org.eclipse.aether.ant"> + + &common; + + <repo:pom file="${project.dir}/dummy-pom.xml" id="pom"/> + <repo:artifact classifier="ant" file="${project.dir}/ant.xml" id="ant"/> + + <target name="setUp"> + <touch file="${project.dir}/dummy-pom.xml"/> + <touch file="${project.dir}/other-pom.xml"/> + <touch file="${project.dir}/ant.xml"/> + </target> + + <target name="testInstallGlobalPom" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:install/> + </target> + + <target name="testInstallOverrideGlobalPom" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:install> + <pom file="${project.dir}/other-pom.xml"/> + </repo:install> + </target> + + <target name="testInstallOverrideGlobalPomByRef" depends="setUp"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:pom file="${project.dir}/other-pom.xml" id="other"/> + <repo:install/> + <repo:install pomref="other"/> + </target> + + <target name="testDefaultRepo" depends="setUp"> + <repo:install pomref="pom"> + <repo:artifact refid="ant"/> + </repo:install> + </target> + + <target name="testCustomRepo" depends="setUp"> + <repo:localrepo dir="${build.dir}/local-repo-custom" /> + <repo:install pomref="pom"> + <repo:artifact refid="ant"/> + </repo:install> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Install/dummy-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Install/dummy-pom.xml b/src/test/resources/ant/Install/dummy-pom.xml new file mode 100644 index 0000000..6f26067 --- /dev/null +++ b/src/test/resources/ant/Install/dummy-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>dummy</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Install/other-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Install/other-pom.xml b/src/test/resources/ant/Install/other-pom.xml new file mode 100644 index 0000000..86d035e --- /dev/null +++ b/src/test/resources/ant/Install/other-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>other</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 new file mode 100644 index 0000000..81b5a4e --- /dev/null +++ b/src/test/resources/ant/Reactor/ant.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<!DOCTYPE project [ + <!ENTITY common SYSTEM "../common.xml"> +]> + +<project xmlns:repo="antlib:org.eclipse.aether.ant"> + + &common; + + <target name="testPom"> + <repo:pom file="${project.dir}/pom1.xml"/> + </target> + + <target name="testArtifact"> + <repo:pom file="${project.dir}/pom1.xml" id="pom"/> + <repo:artifact pomref="pom" file="${project.dir}/pom1.xml"/> + </target> + + <target name="testArtifactInMemoryPom"> + <repo:pom groupid="test" artifactid="test" version="0.1-SNAPSHOT" id="pom"/> + <repo:artifact pomref="pom" file="${project.dir}/pom1.xml"/> + </target> + + <target name="testResolveArtifact"> + <repo:pom file="${project.dir}/pom1.xml" id="pom"/> + <repo:artifact pomref="pom" file="${project.dir}/pom1.xml" type="jar"/> + <repo:pom file="${project.dir}/pom2.xml" id="pom2"/> + + <repo:resolve> + <dependencies pomref="pom2"/> + <properties prefix="resolve"/> + </repo:resolve> + </target> + + <target name="testResolveArtifactInMemoryPom"> + <repo:pom groupid="test" artifactid="test" version="0.1-SNAPSHOT" id="pom"/> + <repo:artifact pomref="pom" file="${project.dir}/pom1.xml" type="jar"/> + <repo:pom file="${project.dir}/pom2.xml" id="pom2"/> + + <repo:resolve> + <dependencies pomref="pom2"/> + <properties prefix="resolve"/> + </repo:resolve> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Reactor/pom1.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Reactor/pom1.xml b/src/test/resources/ant/Reactor/pom1.xml new file mode 100644 index 0000000..a5d423f --- /dev/null +++ b/src/test/resources/ant/Reactor/pom1.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>test</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Reactor/pom2.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Reactor/pom2.xml b/src/test/resources/ant/Reactor/pom2.xml new file mode 100644 index 0000000..569b9e5 --- /dev/null +++ b/src/test/resources/ant/Reactor/pom2.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>test2</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>test</groupId> + <artifactId>test</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 new file mode 100644 index 0000000..2dbfa58 --- /dev/null +++ b/src/test/resources/ant/Resolve/ant.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<!DOCTYPE project [ + <!ENTITY common SYSTEM "../common.xml"> +]> + +<project xmlns:repo="antlib:org.eclipse.aether.ant"> + + &common; + + <repo:remoterepo id="remote" url="http://repo1.maven.org/maven2"; type="default" releases="true" snapshots="true" updates="always" checksums="fail"/> + <repo:remoterepos id="aether.repositories"> + <repo:remoterepo refid="remote"/> + </repo:remoterepos> + + <target name="setUp"> + <delete dir="${build.dir}/resolvetest-local-repo"/> + </target> + + <target name="testResolveGlobalPom"> + <repo:pom file="${project.dir}/pom.xml"/> + <repo:resolve> + <properties prefix="test.resolve.path" classpath="compile"/> + </repo:resolve> + </target> + + <target name="testResolveOverrideGlobalPom"> + <repo:pom file="${project.dir}/dummy-pom.xml"/> + <repo:resolve> + <dependencies> + <pom file="${project.dir}/pom.xml"/> + </dependencies> + <properties prefix="test.resolve.path" classpath="compile"/> + </repo:resolve> + </target> + + <target name="testResolveGlobalPomIntoOtherLocalRepo"> + <repo:localrepo dir="${build.dir}/local-repo-custom"/> + <repo:pom file="${project.dir}/pom.xml"/> + <repo:resolve> + <properties prefix="test.resolve.path" classpath="compile"/> + </repo:resolve> + </target> + + <target name="testResolveCustomFileLayout"> + <repo:pom file="${project.dir}/pom.xml"/> + <repo:resolve> + <files dir="${build.dir}/resolve-custom-layout/" layout="{groupId}/{artifactId}/{groupIdDirs}/{extension}"/> + </repo:resolve> + </target> + + <target name="testResolveAttachments"> + <repo:resolve> + <dependencies> + <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"/> + </repo:resolve> + </target> + + <target name="testResolvePath"> + <repo:pom file="${project.dir}/pom.xml"/> + <repo:resolve> + <path refid="out" classpath="compile"/> + </repo:resolve> + <echo>${tostring:out}</echo> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Resolve/dummy-pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Resolve/dummy-pom.xml b/src/test/resources/ant/Resolve/dummy-pom.xml new file mode 100644 index 0000000..8c76e0c --- /dev/null +++ b/src/test/resources/ant/Resolve/dummy-pom.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>test</groupId> + <artifactId>test</artifactId> + <version>0.1-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/Resolve/pom.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/Resolve/pom.xml b/src/test/resources/ant/Resolve/pom.xml new file mode 100644 index 0000000..574e835 --- /dev/null +++ b/src/test/resources/ant/Resolve/pom.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.sonatype.forge</groupId> + <artifactId>forge-parent</artifactId> + <version>10</version> + </parent> + + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-ant-tasks</artifactId> + <version>1.0-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <aetherVersion>0.9.0.M3</aetherVersion> + </properties> + + <dependencies> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-api</artifactId> + <version>${aetherVersion}</version> + </dependency> + <dependency> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-system</artifactId> + <version>${aetherVersion}</version> + <type>pom</type> + <scope>system</scope> + <systemPath>${basedir}/pom.xml</systemPath> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/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 new file mode 100644 index 0000000..b2bd392 --- /dev/null +++ b/src/test/resources/ant/Settings/ant.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<!DOCTYPE project [ + <!ENTITY common SYSTEM "../common.xml"> +]> + +<project xmlns:repo="antlib:org.eclipse.aether.ant"> + + &common; + + <target name="setUp"> + <!-- touch file="${project.dir}/common.xml"/--> + </target> + + <target name="testUserSettings" depends="setUp"> + <repo:settings file="userSettings.xml"/> + </target> + + <target name="testGlobalSettings" depends="setUp"> + <repo:settings globalfile="globalSettings.xml"/> + </target> + + <target name="testBothSettings" depends="setUp"> + <repo:settings file="userSettings.xml" globalfile="globalSettings.xml"/> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/maven-aether/blob/9d039ef1/src/test/resources/ant/common.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/ant/common.xml b/src/test/resources/ant/common.xml new file mode 100644 index 0000000..361b953 --- /dev/null +++ b/src/test/resources/ant/common.xml @@ -0,0 +1,12 @@ +<!-- + ~ Copyright (c) 2010, 2011 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 + ~ http://www.eclipse.org/legal/epl-v10.html + ~ + ~ Contributors: + ~ Sonatype, Inc. - initial API and implementation +--> + +<taskdef uri="antlib:org.eclipse.aether.ant" resource="org/eclipse/aether/ant/antlib.xml"/>
