Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get rid of included xercesImpl in the webapp WEB-INF/lib, java 8 has his own parser 

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2023-04-19 13:24:23 +10:00
parent 1808f64660
commit 7144b3a182
25 changed files with 32 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -140,11 +140,6 @@
<artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>

5
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
View File

@ -125,11 +125,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/archiva-base/archiva-converter/pom.xml
View File

@ -91,11 +91,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/archiva-base/archiva-indexer/pom.xml
View File

@ -163,11 +163,6 @@
<artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<pluginManagement>

5
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -199,11 +199,6 @@
<artifactId>redback-common-test-resources</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>

6
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
View File

@ -223,12 +223,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-mock</artifactId>

6
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
View File

@ -171,12 +171,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

6
archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
View File

@ -68,12 +68,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
View File

@ -121,11 +121,6 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -403,11 +403,6 @@
<artifactId>tomcat-jsp-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-metadata-consumer</artifactId>

5
archiva-modules/archiva-web/archiva-rss/pom.xml
View File

@ -72,11 +72,6 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/archiva-web/archiva-security/pom.xml
View File

@ -192,11 +192,6 @@
<artifactId>metadata-store-file</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

6
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -408,12 +408,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>

6
archiva-modules/archiva-web/archiva-webapp-test/pom.xml
View File

@ -106,12 +106,6 @@
<version>${fluentlenium.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.fluentlenium</groupId>
<artifactId>fluentlenium-core</artifactId>

5
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -271,11 +271,6 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<!-- to help was8 to find dom parser impl -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>

25
archiva-modules/archiva-web/archiva-webdav/pom.xml
View File

@ -39,6 +39,9 @@
<redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
<webdav.argLine>-Xmx512m -Xms512m -client</webdav.argLine>
<htmlunit.version>2.13</htmlunit.version>
<!-- TODO remove this once we've been able to upgrade htmlunit with removing xercesImpl.. -->
<enforcer.skip>true</enforcer.skip>
</properties>
<dependencies>
@ -164,6 +167,11 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
@ -183,13 +191,28 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
<version>2.13</version>
<version>${htmlunit.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<scope>test</scope>
</dependency>
<!-- only test because htmlunit really need it -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<scope>test</scope>
</dependency>

2
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
View File

@ -24,6 +24,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.repository.events.AuditListener;
import org.apache.archiva.common.filelock.FileLockManager;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavResourceFactory;
@ -117,6 +118,7 @@ public class DavResourceTest
public void testDeleteNonExistantResourceShould404()
throws Exception
{
File dir = new File( baseDir, "testdir" );
try
{

7
archiva-modules/plugins/maven2-repository/pom.xml
View File

@ -186,13 +186,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

7
archiva-modules/plugins/metadata-store-cassandra/pom.xml
View File

@ -156,13 +156,6 @@
<artifactId>disruptor</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testResources>

5
archiva-modules/plugins/metadata-store-file/pom.xml
View File

@ -86,11 +86,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/plugins/metadata-store-jcr/pom.xml
View File

@ -93,11 +93,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<testResources>

5
archiva-modules/plugins/problem-reports/pom.xml
View File

@ -69,11 +69,6 @@
<artifactId>test-repository</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/plugins/repository-statistics/pom.xml
View File

@ -75,11 +75,6 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

5
archiva-modules/plugins/stage-repository-merge/pom.xml
View File

@ -113,11 +113,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>

12
pom.xml
View File

@ -171,12 +171,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
@ -1370,6 +1364,11 @@
<artifactId>jetty-plus</artifactId>
<version>${jettyVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jettyVersion}</version>
</dependency>
<dependency>
@ -1612,6 +1611,7 @@
<exclude>xom:xom</exclude>
<exclude>struts:struts</exclude>
<exclude>stax:stax-api</exclude>
<exclude>xerces:xercesImpl</exclude>
<exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
<exclude>org.codehaus.plexus:plexus-component-api</exclude>
<exclude>org.codehaus.plexus:plexus-container-default</exclude>