diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
index b45a5f3a5..07bee6aa4 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
@@ -33,11 +33,6 @@
org.apache.maven.archiva
archiva-common
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
jaxen
jaxen
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java
index ea46c624a..85110dc4a 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/maven/repository/metadata/storage/Maven2RepositoryMetadataResolverTest.java
@@ -218,17 +218,16 @@ public class Maven2RepositoryMetadataResolverTest
"http://www.nabble.com/Archiva---Issues-f29617.html" );
List dependencies = metadata.getDependencies();
- assertEquals( 10, dependencies.size() );
+ assertEquals( 9, dependencies.size() );
assertDependency( dependencies.get( 0 ), "commons-lang", "commons-lang", "2.2" );
assertDependency( dependencies.get( 1 ), "commons-io", "commons-io", "1.4" );
assertDependency( dependencies.get( 2 ), "org.slf4j", "slf4j-api", "1.5.0" );
assertDependency( dependencies.get( 3 ), "org.codehaus.plexus", "plexus-component-api", "1.0-alpha-22" );
assertDependency( dependencies.get( 4 ), "org.codehaus.plexus", "plexus-spring", "1.2", "test" );
assertDependency( dependencies.get( 5 ), "xalan", "xalan", "2.7.0" );
- assertDependency( dependencies.get( 6 ), "org.dom4j", "dom4j", "${dom4j.version}", "test" );
- assertDependency( dependencies.get( 7 ), "junit", "junit", "3.8.1", "test" );
- assertDependency( dependencies.get( 8 ), "easymock", "easymock", "1.2_Java1.3", "test" );
- assertDependency( dependencies.get( 9 ), "easymock", "easymockclassextension", "1.2", "test" );
+ assertDependency( dependencies.get( 6 ), "junit", "junit", "3.8.1", "test" );
+ assertDependency( dependencies.get( 7 ), "easymock", "easymock", "1.2_Java1.3", "test" );
+ assertDependency( dependencies.get( 8 ), "easymock", "easymockclassextension", "1.2", "test" );
assertEquals( 8, metadata.getProperties().size() );
assertEquals( "http://www.apache.org/images/asf_logo_wide.gif", metadata.getProperties().get("organization.logo") );
@@ -682,8 +681,8 @@ public class Maven2RepositoryMetadataResolverTest
assertArtifact( artifacts.get( 0 ), "plexus-spring-1.2-sources.jar", 0, EMPTY_SHA1, EMPTY_MD5 );
assertArtifact( artifacts.get( 1 ), "plexus-spring-1.2.jar", 0, EMPTY_SHA1, EMPTY_MD5 );
- assertArtifact( artifacts.get( 2 ), "plexus-spring-1.2.pom", 7422, "28e86d3e2723e4894587e4b758231f76febce942",
- "9f663d8e7adf6adff4133653b59d1e28" );
+ assertArtifact( artifacts.get( 2 ), "plexus-spring-1.2.pom", 7273, "ac54312a724733a2eb7a9db1a5b8a0ec7671a814",
+ "38aa7a946d1ee14fae9bf6a17c603eb8" );
}
@Test
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
index b45a5f3a5..07bee6aa4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/apache/maven/archiva/archiva-xml-tools/1.0-SNAPSHOT/archiva-xml-tools-1.0-SNAPSHOT.pom
@@ -33,11 +33,6 @@
org.apache.maven.archiva
archiva-common
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
jaxen
jaxen
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
index 0bf4b0f6c..04a1dc4ac 100755
--- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/target-repo/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
@@ -500,11 +500,6 @@
derbytools
10.1.3.1
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
hsqldb
hsqldb
diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva-common/1.2.1/archiva-common-1.2.1.pom b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva-common/1.2.1/archiva-common-1.2.1.pom
index 360cc46f9..1ec340805 100644
--- a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva-common/1.2.1/archiva-common-1.2.1.pom
+++ b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva-common/1.2.1/archiva-common-1.2.1.pom
@@ -60,12 +60,6 @@
xalan
2.7.0
-
- org.dom4j
- dom4j
- ${dom4j.version}
- test
-
diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
index 0bf4b0f6c..04a1dc4ac 100644
--- a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
+++ b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.1/archiva-1.2.1.pom
@@ -500,11 +500,6 @@
derbytools
10.1.3.1
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
hsqldb
hsqldb
diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.pom b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.pom
index 0bf4b0f6c..04a1dc4ac 100644
--- a/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.pom
+++ b/archiva-modules/metadata/test-repository/src/main/resources/org/apache/archiva/archiva/1.2.2/archiva-1.2.2.pom
@@ -500,11 +500,6 @@
derbytools
10.1.3.1
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
hsqldb
hsqldb
diff --git a/archiva-modules/metadata/test-repository/src/main/resources/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom b/archiva-modules/metadata/test-repository/src/main/resources/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom
index cc7397558..d6b5956eb 100644
--- a/archiva-modules/metadata/test-repository/src/main/resources/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom
+++ b/archiva-modules/metadata/test-repository/src/main/resources/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom
@@ -56,11 +56,6 @@
plexus-component-api
1.0-alpha-22
-
- org.dom4j
- dom4j
- ${dom4j.version}
-
com.opensymphony
webwork
diff --git a/pom.xml b/pom.xml
index 9aec66e68..bf8b343be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
1.14.2
1.16.0
9.1.6
- 2.1.3
2.0