From 7144b3a182afecee0a599d88a8b4200a4f0fe80f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 19 Apr 2023 13:24:23 +1000 Subject: get rid of included xercesImpl in the webapp WEB-INF/lib, java 8 has his own parser Signed-off-by: Olivier Lamy --- .../archiva-core-consumers/pom.xml | 5 ----- .../archiva-lucene-consumers/pom.xml | 5 ----- .../archiva-base/archiva-converter/pom.xml | 5 ----- .../archiva-base/archiva-indexer/pom.xml | 5 ----- archiva-modules/archiva-base/archiva-proxy/pom.xml | 5 ----- .../archiva-repository-admin-default/pom.xml | 6 ------ .../archiva-scheduler-indexing/pom.xml | 6 ------ .../archiva-scheduler-repository-api/pom.xml | 6 ------ .../archiva-scheduler-repository/pom.xml | 5 ----- .../archiva-rest/archiva-rest-services/pom.xml | 5 ----- archiva-modules/archiva-web/archiva-rss/pom.xml | 5 ----- .../archiva-web/archiva-security/pom.xml | 5 ----- .../archiva-web/archiva-web-common/pom.xml | 6 ------ .../archiva-web/archiva-webapp-test/pom.xml | 6 ------ archiva-modules/archiva-web/archiva-webapp/pom.xml | 5 ----- archiva-modules/archiva-web/archiva-webdav/pom.xml | 25 +++++++++++++++++++++- .../org/apache/archiva/webdav/DavResourceTest.java | 2 ++ archiva-modules/plugins/maven2-repository/pom.xml | 7 ------ .../plugins/metadata-store-cassandra/pom.xml | 7 ------ .../plugins/metadata-store-file/pom.xml | 5 ----- archiva-modules/plugins/metadata-store-jcr/pom.xml | 5 ----- archiva-modules/plugins/problem-reports/pom.xml | 5 ----- .../plugins/repository-statistics/pom.xml | 5 ----- .../plugins/stage-repository-merge/pom.xml | 5 ----- pom.xml | 12 +++++------ 25 files changed, 32 insertions(+), 126 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 2d913d482..6d5a4e100 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -140,11 +140,6 @@ wagon-http-lightweight provided - - xerces - xercesImpl - test - org.assertj assertj-core diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 26d51b194..5fb4f7e72 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -125,11 +125,6 @@ - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 6835a6f22..9e3c8c646 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -91,11 +91,6 @@ ${project.version} test - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 2e82af1a5..7a2a9145a 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -163,11 +163,6 @@ wagon-http-lightweight provided - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 0bfe277d8..850504f03 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -199,11 +199,6 @@ redback-common-test-resources test - - xerces - xercesImpl - test - org.assertj assertj-core diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 07c541cd2..ed2aec81c 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -223,12 +223,6 @@ test - - xerces - xercesImpl - test - - org.apache.archiva archiva-mock diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 9f96bcafe..22ddcd35d 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -171,12 +171,6 @@ test - - xerces - xercesImpl - test - - diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml index eea580490..006543233 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml @@ -68,12 +68,6 @@ slf4j-api - - xerces - xercesImpl - test - - diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index f370a519c..11765cd81 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -121,11 +121,6 @@ mockito-all test - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 6213b038f..9dacb64f8 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -403,11 +403,6 @@ tomcat-jsp-api test - - xerces - xercesImpl - test - org.apache.archiva archiva-metadata-consumer diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 18129276a..b9e47ce08 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -72,11 +72,6 @@ spring-test test - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 87c0611f7..4594d564a 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -192,11 +192,6 @@ metadata-store-file test - - xerces - xercesImpl - test - diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index e6126425a..41d3cc5a8 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -408,12 +408,6 @@ assertj-core test - - xerces - xercesImpl - test - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index fa3ff9e26..b6881d402 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -106,12 +106,6 @@ ${fluentlenium.version} test - - - xerces - xercesImpl - - org.fluentlenium fluentlenium-core diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 303800c73..114b843d1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -271,11 +271,6 @@ org.codehaus.woodstox woodstox-core-asl - - - xerces - xercesImpl - org.apache.ant ant diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index c8894a460..fb2386e88 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -39,6 +39,9 @@ jdbc:hsqldb:mem:redback-test org.hsqldb.jdbcDriver -Xmx512m -Xms512m -client + 2.13 + + true @@ -164,6 +167,11 @@ jetty-server test + + org.eclipse.jetty + jetty-util + test + org.eclipse.jetty jetty-plus @@ -183,13 +191,28 @@ net.sourceforge.htmlunit htmlunit - 2.13 + ${htmlunit.version} + test + + + xerces + xercesImpl + + + + + + xml-apis + xml-apis + 1.4.01 test + xerces xercesImpl + 2.12.2 test diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java index 0d99709b6..a86e05d6d 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java @@ -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 { diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 1d870b3eb..e7f9bdd89 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -186,13 +186,6 @@ org.apache.logging.log4j log4j-1.2-api - - - xerces - xercesImpl - test - - diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index 1c076a453..f68d3e146 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml +++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml @@ -156,13 +156,6 @@ disruptor test - - - xerces - xercesImpl - test - - diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 8e408628a..084ba649d 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -86,11 +86,6 @@ assertj-core test - - xerces - xercesImpl - test - diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 2263d6d4f..a9fadd5b7 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -93,11 +93,6 @@ assertj-core test - - xerces - xercesImpl - test - diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 713d67a1e..b21330a3d 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -69,11 +69,6 @@ test-repository test - - xerces - xercesImpl - test - diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index 907091745..3fa38f554 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -75,11 +75,6 @@ mockito-all test - - xerces - xercesImpl - test - diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 20ab0d8d4..4c0109268 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -113,11 +113,6 @@ - - xerces - xercesImpl - test - diff --git a/pom.xml b/pom.xml index 2f619b07b..bf0084fd5 100644 --- a/pom.xml +++ b/pom.xml @@ -171,12 +171,6 @@ - - xerces - xercesImpl - 2.12.2 - - javax.inject javax.inject @@ -1370,6 +1364,11 @@ jetty-plus ${jettyVersion} + + org.eclipse.jetty + jetty-util + ${jettyVersion} + @@ -1612,6 +1611,7 @@ xom:xom struts:struts stax:stax-api + xerces:xercesImpl org.codehaus.plexus:plexus-xwork-integration org.codehaus.plexus:plexus-component-api org.codehaus.plexus:plexus-container-default -- cgit v1.2.3