Author: markh
Date: Mon Sep 17 02:15:02 2007
New Revision: 576317
URL: http://svn.apache.org/viewvc?rev=576317&view=rev
Log:
Renamed testJarWithDependency to testJarWithCompileDependency
Added:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/
- copied from r575740,
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/
Removed:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithDependency/
Modified:
maven/shared/trunk/maven-dependency-analyzer/pom.xml
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/pom.xml
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project1/pom.xml
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project2/pom.xml
Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=576317&r1=576316&r2=576317&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Mon Sep 17 02:15:02
2007
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.1</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=576317&r1=576316&r2=576317&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Mon Sep 17 02:15:02 2007
@@ -72,15 +72,15 @@
assertEquals( expectedAnalysis, actualAnalysis );
}
- public void testJarWithDependency() throws TestToolsException,
ProjectDependencyAnalyzerException
+ public void testJarWithCompileDependency() throws TestToolsException,
ProjectDependencyAnalyzerException
{
- compileProject( "jarWithDependency/pom.xml" );
+ compileProject( "jarWithCompileDependency/pom.xml" );
- MavenProject project2 = getProject(
"jarWithDependency/project2/pom.xml" );
+ MavenProject project2 = getProject(
"jarWithCompileDependency/project2/pom.xml" );
ProjectDependencyAnalysis actualAnalysis = analyzer.analyze( project2
);
- Artifact project1 = createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests", "jarWithDependency1",
"jar", "1.0", "compile");
+ Artifact project1 = createArtifact(
"org.apache.maven.shared.dependency-analyzer.tests",
"jarWithCompileDependency1", "jar", "1.0", "compile");
Set usedDeclaredArtifacts = Collections.singleton( project1 );
ProjectDependencyAnalysis expectedAnalysis = new
ProjectDependencyAnalysis( usedDeclaredArtifacts, null, null );
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/pom.xml?rev=576317&r1=575740&r2=576317&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/pom.xml
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/pom.xml
Mon Sep 17 02:15:02 2007
@@ -26,7 +26,7 @@
>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.shared.dependency-analyzer.tests</groupId>
- <artifactId>jarWithDependency</artifactId>
+ <artifactId>jarWithCompileDependency</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project1/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project1/pom.xml?rev=576317&r1=575740&r2=576317&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project1/pom.xml
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project1/pom.xml
Mon Sep 17 02:15:02 2007
@@ -26,7 +26,7 @@
>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.shared.dependency-analyzer.tests</groupId>
- <artifactId>jarWithDependency1</artifactId>
+ <artifactId>jarWithCompileDependency1</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project2/pom.xml?rev=576317&r1=575740&r2=576317&view=diff
==============================================================================
---
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project2/pom.xml
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/resources/jarWithCompileDependency/project2/pom.xml
Mon Sep 17 02:15:02 2007
@@ -26,14 +26,14 @@
>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.shared.dependency-analyzer.tests</groupId>
- <artifactId>jarWithDependency2</artifactId>
+ <artifactId>jarWithCompileDependency2</artifactId>
<packaging>jar</packaging>
<version>1.0</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.shared.dependency-analyzer.tests</groupId>
- <artifactId>jarWithDependency1</artifactId>
+ <artifactId>jarWithCompileDependency1</artifactId>
<version>1.0</version>
</dependency>
</dependencies>