Renamed testJarWithDependency to testJarWithCompileDependency
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@576317 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 7756c5d..bdcab68 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index 6df4660..9f62017 100644
--- a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -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 );
diff --git a/src/test/resources/jarWithDependency/pom.xml b/src/test/resources/jarWithCompileDependency/pom.xml
similarity index 96%
rename from src/test/resources/jarWithDependency/pom.xml
rename to src/test/resources/jarWithCompileDependency/pom.xml
index e9f4799..0d4f178 100644
--- a/src/test/resources/jarWithDependency/pom.xml
+++ b/src/test/resources/jarWithCompileDependency/pom.xml
@@ -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>
diff --git a/src/test/resources/jarWithDependency/project1/pom.xml b/src/test/resources/jarWithCompileDependency/project1/pom.xml
similarity index 95%
rename from src/test/resources/jarWithDependency/project1/pom.xml
rename to src/test/resources/jarWithCompileDependency/project1/pom.xml
index 090642d..214de65 100644
--- a/src/test/resources/jarWithDependency/project1/pom.xml
+++ b/src/test/resources/jarWithCompileDependency/project1/pom.xml
@@ -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>
diff --git a/src/test/resources/jarWithDependency/project1/src/main/java/jarWithDependency/project1/Project1.java b/src/test/resources/jarWithCompileDependency/project1/src/main/java/jarWithDependency/project1/Project1.java
similarity index 100%
rename from src/test/resources/jarWithDependency/project1/src/main/java/jarWithDependency/project1/Project1.java
rename to src/test/resources/jarWithCompileDependency/project1/src/main/java/jarWithDependency/project1/Project1.java
diff --git a/src/test/resources/jarWithDependency/project2/pom.xml b/src/test/resources/jarWithCompileDependency/project2/pom.xml
similarity index 92%
rename from src/test/resources/jarWithDependency/project2/pom.xml
rename to src/test/resources/jarWithCompileDependency/project2/pom.xml
index 96e5478..7e0eea1 100644
--- a/src/test/resources/jarWithDependency/project2/pom.xml
+++ b/src/test/resources/jarWithCompileDependency/project2/pom.xml
@@ -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>
diff --git a/src/test/resources/jarWithDependency/project2/src/main/java/jarWithDependency/project2/Project2.java b/src/test/resources/jarWithCompileDependency/project2/src/main/java/jarWithDependency/project2/Project2.java
similarity index 100%
rename from src/test/resources/jarWithDependency/project2/src/main/java/jarWithDependency/project2/Project2.java
rename to src/test/resources/jarWithCompileDependency/project2/src/main/java/jarWithDependency/project2/Project2.java
