mirror of https://github.com/apache/archiva.git
MRM-2051: Remove dom4j (#112)
* remove unused dom4j dependency * remove dom4j * Update Maven2RepositoryMetadataResolverTest.java * Update Maven2RepositoryMetadataResolverTest.java fix MRM-2051
This commit is contained in:
parent
30273c43c5
commit
c9c0fca8d4
|
@ -33,11 +33,6 @@
|
||||||
<groupId>org.apache.maven.archiva</groupId>
|
<groupId>org.apache.maven.archiva</groupId>
|
||||||
<artifactId>archiva-common</artifactId>
|
<artifactId>archiva-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jaxen</groupId>
|
<groupId>jaxen</groupId>
|
||||||
<artifactId>jaxen</artifactId>
|
<artifactId>jaxen</artifactId>
|
||||||
|
|
|
@ -218,17 +218,16 @@ public class Maven2RepositoryMetadataResolverTest
|
||||||
"http://www.nabble.com/Archiva---Issues-f29617.html" );
|
"http://www.nabble.com/Archiva---Issues-f29617.html" );
|
||||||
|
|
||||||
List<Dependency> dependencies = metadata.getDependencies();
|
List<Dependency> dependencies = metadata.getDependencies();
|
||||||
assertEquals( 10, dependencies.size() );
|
assertEquals( 9, dependencies.size() );
|
||||||
assertDependency( dependencies.get( 0 ), "commons-lang", "commons-lang", "2.2" );
|
assertDependency( dependencies.get( 0 ), "commons-lang", "commons-lang", "2.2" );
|
||||||
assertDependency( dependencies.get( 1 ), "commons-io", "commons-io", "1.4" );
|
assertDependency( dependencies.get( 1 ), "commons-io", "commons-io", "1.4" );
|
||||||
assertDependency( dependencies.get( 2 ), "org.slf4j", "slf4j-api", "1.5.0" );
|
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( 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( 4 ), "org.codehaus.plexus", "plexus-spring", "1.2", "test" );
|
||||||
assertDependency( dependencies.get( 5 ), "xalan", "xalan", "2.7.0" );
|
assertDependency( dependencies.get( 5 ), "xalan", "xalan", "2.7.0" );
|
||||||
assertDependency( dependencies.get( 6 ), "org.dom4j", "dom4j", "${dom4j.version}", "test" );
|
assertDependency( dependencies.get( 6 ), "junit", "junit", "3.8.1", "test" );
|
||||||
assertDependency( dependencies.get( 7 ), "junit", "junit", "3.8.1", "test" );
|
assertDependency( dependencies.get( 7 ), "easymock", "easymock", "1.2_Java1.3", "test" );
|
||||||
assertDependency( dependencies.get( 8 ), "easymock", "easymock", "1.2_Java1.3", "test" );
|
assertDependency( dependencies.get( 8 ), "easymock", "easymockclassextension", "1.2", "test" );
|
||||||
assertDependency( dependencies.get( 9 ), "easymock", "easymockclassextension", "1.2", "test" );
|
|
||||||
|
|
||||||
assertEquals( 8, metadata.getProperties().size() );
|
assertEquals( 8, metadata.getProperties().size() );
|
||||||
assertEquals( "http://www.apache.org/images/asf_logo_wide.gif", metadata.getProperties().get("organization.logo") );
|
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( 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( 1 ), "plexus-spring-1.2.jar", 0, EMPTY_SHA1, EMPTY_MD5 );
|
||||||
assertArtifact( artifacts.get( 2 ), "plexus-spring-1.2.pom", 7422, "28e86d3e2723e4894587e4b758231f76febce942",
|
assertArtifact( artifacts.get( 2 ), "plexus-spring-1.2.pom", 7273, "ac54312a724733a2eb7a9db1a5b8a0ec7671a814",
|
||||||
"9f663d8e7adf6adff4133653b59d1e28" );
|
"38aa7a946d1ee14fae9bf6a17c603eb8" );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -33,11 +33,6 @@
|
||||||
<groupId>org.apache.maven.archiva</groupId>
|
<groupId>org.apache.maven.archiva</groupId>
|
||||||
<artifactId>archiva-common</artifactId>
|
<artifactId>archiva-common</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jaxen</groupId>
|
<groupId>jaxen</groupId>
|
||||||
<artifactId>jaxen</artifactId>
|
<artifactId>jaxen</artifactId>
|
||||||
|
|
|
@ -500,11 +500,6 @@
|
||||||
<artifactId>derbytools</artifactId>
|
<artifactId>derbytools</artifactId>
|
||||||
<version>10.1.3.1</version>
|
<version>10.1.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>hsqldb</groupId>
|
<groupId>hsqldb</groupId>
|
||||||
<artifactId>hsqldb</artifactId>
|
<artifactId>hsqldb</artifactId>
|
||||||
|
|
|
@ -60,12 +60,6 @@
|
||||||
<artifactId>xalan</artifactId>
|
<artifactId>xalan</artifactId>
|
||||||
<version>2.7.0</version>
|
<version>2.7.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
|
@ -500,11 +500,6 @@
|
||||||
<artifactId>derbytools</artifactId>
|
<artifactId>derbytools</artifactId>
|
||||||
<version>10.1.3.1</version>
|
<version>10.1.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>hsqldb</groupId>
|
<groupId>hsqldb</groupId>
|
||||||
<artifactId>hsqldb</artifactId>
|
<artifactId>hsqldb</artifactId>
|
||||||
|
|
|
@ -500,11 +500,6 @@
|
||||||
<artifactId>derbytools</artifactId>
|
<artifactId>derbytools</artifactId>
|
||||||
<version>10.1.3.1</version>
|
<version>10.1.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>hsqldb</groupId>
|
<groupId>hsqldb</groupId>
|
||||||
<artifactId>hsqldb</artifactId>
|
<artifactId>hsqldb</artifactId>
|
||||||
|
|
|
@ -56,11 +56,6 @@
|
||||||
<artifactId>plexus-component-api</artifactId>
|
<artifactId>plexus-component-api</artifactId>
|
||||||
<version>1.0-alpha-22</version>
|
<version>1.0-alpha-22</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.dom4j</groupId>
|
|
||||||
<artifactId>dom4j</artifactId>
|
|
||||||
<version>${dom4j.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.opensymphony</groupId>
|
<groupId>com.opensymphony</groupId>
|
||||||
<artifactId>webwork</artifactId>
|
<artifactId>webwork</artifactId>
|
||||||
|
|
1
pom.xml
1
pom.xml
|
@ -102,7 +102,6 @@
|
||||||
<jsoup.version>1.14.2</jsoup.version>
|
<jsoup.version>1.14.2</jsoup.version>
|
||||||
<rome.version>1.16.0</rome.version>
|
<rome.version>1.16.0</rome.version>
|
||||||
<cronutils.version>9.1.6</cronutils.version>
|
<cronutils.version>9.1.6</cronutils.version>
|
||||||
<dom4j.version>2.1.3</dom4j.version>
|
|
||||||
|
|
||||||
<!-- JCR modules -->
|
<!-- JCR modules -->
|
||||||
<javax.jcr.version>2.0</javax.jcr.version>
|
<javax.jcr.version>2.0</javax.jcr.version>
|
||||||
|
|
Loading…
Reference in New Issue