Author: jdcasey
Date: Wed Oct 11 22:07:08 2006
New Revision: 463133
URL: http://svn.apache.org/viewvc?view=rev&rev=463133
Log:
Got two integration tests working.
Added:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(with props)
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(with props)
maven/sandbox/maven-artifact-tools/src/main/assemble/
maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml
(with props)
Modified:
maven/sandbox/maven-artifact-tools/pom.xml
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/pom.xml
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/pom.xml
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
Modified: maven/sandbox/maven-artifact-tools/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/pom.xml?view=diff&rev=463133&r1=463132&r2=463133
==============================================================================
--- maven/sandbox/maven-artifact-tools/pom.xml (original)
+++ maven/sandbox/maven-artifact-tools/pom.xml Wed Oct 11 22:07:08 2006
@@ -1,4 +1,5 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-tools</artifactId>
@@ -28,13 +29,13 @@
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
</execution>
</executions>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
</plugin>
</plugins>
<pluginManagement>
@@ -73,6 +74,18 @@
<version>2.0.4</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-file</artifactId>
+ <version>1.0-alpha-7</version>
+ <!-- scope>runtime</scope -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>1.0-alpha-6</version>
+ <!-- scope>runtime</scope -->
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -117,6 +130,23 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-it-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assemble/it-repository.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
<debug>true</debug>
@@ -138,7 +168,7 @@
<goal>run</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
Modified:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/pom.xml?view=diff&rev=463133&r1=463132&r2=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/pom.xml
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/pom.xml
Wed Oct 11 22:07:08 2006
@@ -1,15 +1,54 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
<artifactId>resolve-using-artifact-with-deps</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <repositories>
+ <repository>
+ <id>it</id>
+
<url>file://${basedir}/../../../../target/maven-artifact-tools-1.0-SNAPSHOT-it-repository.dir</url>
+ </repository>
+ </repositories>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-tools</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-main-project-from-local-repo</id>
+ <configuration>
+ <actTransitively>false</actTransitively>
+ <resolutionFuzziness>artifactId</resolutionFuzziness>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>purge-local-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java?view=diff&rev=463133&r1=463132&r2=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
Wed Oct 11 22:07:08 2006
@@ -28,7 +28,7 @@
query.setVersion( "3.8.1" );
ArtifactRepositorySource rs = new SimpleArtifactRepositorySource(
Collections
- .singletonList( "http://repo1.maven.org/maven2"; ), "/tmp", mca );
+ .singletonList( "http://repo1.maven.org/maven2"; ), "file://" +
System.getProperty( "java.io.tmpdir" ), mca );
ArtifactResolutionResult result = new ArtifactResolutionTool( mca
).resolve( query, rs );
@@ -45,7 +45,7 @@
query.setVersion( "3.8.1" );
ArtifactRepositorySource rs = new SimpleArtifactRepositorySource(
Collections
- .singletonList( "http://repo1.maven.org/maven2"; ), "/tmp", mca );
+ .singletonList( "http://repo1.maven.org/maven2"; ), "file://" +
System.getProperty( "java.io.tmpdir" ), mca );
ArtifactResolutionResult result = new ArtifactResolutionTool( mca
).resolveProjectMetadata( query, rs );
Added:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java?view=auto&rev=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(added)
+++
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
Wed Oct 11 22:07:08 2006
@@ -0,0 +1,30 @@
+package org.apache.maven.shared.artifact.tools.test.assembly.resolve;
+
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
+import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
+
+import junit.framework.TestCase;
+
+public class ResolveTest
+ extends TestCase
+{
+
+ public void testResolveArtifact()
+ throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
+ InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ {
+ new Resolve().resolveJunitArtifact();
+ }
+
+ public void testResolvePom()
+ throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
+ InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ {
+ new Resolve().resolveJunitPom();
+ }
+
+}
Propchange:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/maven-artifact-tools/src/it/artifact-based/resolve-using-artifact-with-deps/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/pom.xml?view=diff&rev=463133&r1=463132&r2=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/pom.xml
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/pom.xml
Wed Oct 11 22:07:08 2006
@@ -5,8 +5,20 @@
<artifactId>resolve-using-assembly</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
+ <repositories>
+ <repository>
+ <id>it</id>
+
<url>file://${basedir}/../../../../target/maven-artifact-tools-1.0-SNAPSHOT-it-repository.dir</url>
+ </repository>
+ </repositories>
<dependencies>
<dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-tools</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -51,4 +63,30 @@
</exclusions>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-main-project-from-local-repo</id>
+ <configuration>
+ <actTransitively>false</actTransitively>
+ <resolutionFuzziness>artifactId</resolutionFuzziness>
+ </configuration>
+ <phase>initialize</phase>
+ <goals>
+ <goal>purge-local-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java?view=diff&rev=463133&r1=463132&r2=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
(original)
+++
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/main/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/Resolve.java
Wed Oct 11 22:07:08 2006
@@ -28,7 +28,7 @@
query.setVersion( "3.8.1" );
ArtifactRepositorySource rs = new SimpleArtifactRepositorySource(
Collections
- .singletonList( "http://repo1.maven.org/maven2"; ), "/tmp", mca );
+ .singletonList( "http://repo1.maven.org/maven2"; ), "file://" +
System.getProperty( "java.io.tmpdir" ), mca );
ArtifactResolutionResult result = new ArtifactResolutionTool( mca
).resolve( query, rs );
@@ -45,7 +45,7 @@
query.setVersion( "3.8.1" );
ArtifactRepositorySource rs = new SimpleArtifactRepositorySource(
Collections
- .singletonList( "http://repo1.maven.org/maven2"; ), "/tmp", mca );
+ .singletonList( "http://repo1.maven.org/maven2"; ), "file://" +
System.getProperty( "java.io.tmpdir" ), mca );
ArtifactResolutionResult result = new ArtifactResolutionTool( mca
).resolveProjectMetadata( query, rs );
Added:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java?view=auto&rev=463133
==============================================================================
---
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
(added)
+++
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
Wed Oct 11 22:07:08 2006
@@ -0,0 +1,30 @@
+package org.apache.maven.shared.artifact.tools.test.assembly.resolve;
+
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.shared.artifact.tools.InvalidConfigurationException;
+import
org.apache.maven.shared.artifact.tools.components.ComponentAccessException;
+
+import junit.framework.TestCase;
+
+public class ResolveTest
+ extends TestCase
+{
+
+ public void testResolveArtifact()
+ throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
+ InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ {
+ new Resolve().resolveJunitArtifact();
+ }
+
+ public void testResolvePom()
+ throws ArtifactResolutionException, ArtifactNotFoundException,
ComponentAccessException,
+ InvalidConfigurationException, InvalidVersionSpecificationException,
ProjectBuildingException
+ {
+ new Resolve().resolveJunitPom();
+ }
+
+}
Propchange:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/maven-artifact-tools/src/it/assembly-based/resolve-using-assembly/src/test/java/org/apache/maven/shared/artifact/tools/test/assembly/resolve/ResolveTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml?view=auto&rev=463133
==============================================================================
--- maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml
(added)
+++ maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml Wed
Oct 11 22:07:08 2006
@@ -0,0 +1,24 @@
+<assembly>
+ <id>it-repository</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>target/${artifactId}-${version}.jar</source>
+
<outputDirectory>org/apache/maven/shared/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}.jar</destName>
+ </file>
+ <file>
+
<source>target/${artifactId}-${version}-jar-with-dependencies.jar</source>
+
<outputDirectory>org/apache/maven/shared/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-jar-with-dependencies.jar</destName>
+ </file>
+ <file>
+ <source>pom.xml</source>
+
<outputDirectory>org/apache/maven/shared/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}.pom</destName>
+ </file>
+ </files>
+</assembly>
Propchange:
maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/maven-artifact-tools/src/main/assemble/it-repository.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
