mirrors
/
archiva
mirror da https://github.com/apache/archiva.git
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Rilasci 70 Wiki Attività
Sfoglia il codice sorgente

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>
archiva-2.x
Olivier Lamy 1 anno fa
parent
1808f64660
commit
7144b3a182
25 ha cambiato i file con 32 aggiunte e 126 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 0
    5
      archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
  2. 0
    5
      archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
  3. 0
    5
      archiva-modules/archiva-base/archiva-converter/pom.xml
  4. 0
    5
      archiva-modules/archiva-base/archiva-indexer/pom.xml
  5. 0
    5
      archiva-modules/archiva-base/archiva-proxy/pom.xml
  6. 0
    6
      archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
  7. 0
    6
      archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
  8. 0
    6
      archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
  9. 0
    5
      archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
  10. 0
    5
      archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
  11. 0
    5
      archiva-modules/archiva-web/archiva-rss/pom.xml
  12. 0
    5
      archiva-modules/archiva-web/archiva-security/pom.xml
  13. 0
    6
      archiva-modules/archiva-web/archiva-web-common/pom.xml
  14. 0
    6
      archiva-modules/archiva-web/archiva-webapp-test/pom.xml
  15. 0
    5
      archiva-modules/archiva-web/archiva-webapp/pom.xml
  16. 24
    1
      archiva-modules/archiva-web/archiva-webdav/pom.xml
  17. 2
    0
      archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java
  18. 0
    7
      archiva-modules/plugins/maven2-repository/pom.xml
  19. 0
    7
      archiva-modules/plugins/metadata-store-cassandra/pom.xml
  20. 0
    5
      archiva-modules/plugins/metadata-store-file/pom.xml
  21. 0
    5
      archiva-modules/plugins/metadata-store-jcr/pom.xml
  22. 0
    5
      archiva-modules/plugins/problem-reports/pom.xml
  23. 0
    5
      archiva-modules/plugins/repository-statistics/pom.xml
  24. 0
    5
      archiva-modules/plugins/stage-repository-merge/pom.xml
  25. 6
    6
      pom.xml

+ 0
- 5
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Vedi File

<artifactId>wagon-http-lightweight</artifactId> <artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>

+ 0
- 5
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Vedi File

</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/archiva-base/archiva-converter/pom.xml Vedi File

<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/archiva-base/archiva-indexer/pom.xml Vedi File

<artifactId>wagon-http-lightweight</artifactId> <artifactId>wagon-http-lightweight</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>

+ 0
- 5
archiva-modules/archiva-base/archiva-proxy/pom.xml Vedi File

<artifactId>redback-common-test-resources</artifactId> <artifactId>redback-common-test-resources</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>

+ 0
- 6
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml Vedi File

<scope>test</scope> <scope>test</scope>
</dependency> </dependency>


<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-mock</artifactId> <artifactId>archiva-mock</artifactId>

+ 0
- 6
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Vedi File

<scope>test</scope> <scope>test</scope>
</dependency> </dependency>


<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>


<build> <build>

+ 0
- 6
archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml Vedi File

<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>


<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Vedi File

<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Vedi File

<artifactId>tomcat-jsp-api</artifactId> <artifactId>tomcat-jsp-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.archiva</groupId> <groupId>org.apache.archiva</groupId>
<artifactId>archiva-metadata-consumer</artifactId> <artifactId>archiva-metadata-consumer</artifactId>

+ 0
- 5
archiva-modules/archiva-web/archiva-rss/pom.xml Vedi File

<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/archiva-web/archiva-security/pom.xml Vedi File

<artifactId>metadata-store-file</artifactId> <artifactId>metadata-store-file</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 6
archiva-modules/archiva-web/archiva-web-common/pom.xml Vedi File

<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>


<build> <build>

+ 0
- 6
archiva-modules/archiva-web/archiva-webapp-test/pom.xml Vedi File

<version>${fluentlenium.version}</version> <version>${fluentlenium.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>

<dependency> <dependency>
<groupId>org.fluentlenium</groupId> <groupId>org.fluentlenium</groupId>
<artifactId>fluentlenium-core</artifactId> <artifactId>fluentlenium-core</artifactId>

+ 0
- 5
archiva-modules/archiva-web/archiva-webapp/pom.xml Vedi File

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

+ 24
- 1
archiva-modules/archiva-web/archiva-webdav/pom.xml Vedi File

<redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl> <redbackTestJdbcUrl>jdbc:hsqldb:mem:redback-test</redbackTestJdbcUrl>
<redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver> <redbackTestJdbcDriver>org.hsqldb.jdbcDriver</redbackTestJdbcDriver>
<webdav.argLine>-Xmx512m -Xms512m -client</webdav.argLine> <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> </properties>


<dependencies> <dependencies>
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
<dependency> <dependency>
<groupId>net.sourceforge.htmlunit</groupId> <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId> <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> <scope>test</scope>
</dependency> </dependency>


<!-- only test because htmlunit really need it -->
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>



+ 2
- 0
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/DavResourceTest.java Vedi File

import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.repository.events.AuditListener;
import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.filelock.FileLockManager;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource; import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavResourceFactory; import org.apache.jackrabbit.webdav.DavResourceFactory;
public void testDeleteNonExistantResourceShould404() public void testDeleteNonExistantResourceShould404()
throws Exception throws Exception
{ {

File dir = new File( baseDir, "testdir" ); File dir = new File( baseDir, "testdir" );
try try
{ {

+ 0
- 7
archiva-modules/plugins/maven2-repository/pom.xml Vedi File

<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId> <artifactId>log4j-1.2-api</artifactId>
</dependency> </dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 7
archiva-modules/plugins/metadata-store-cassandra/pom.xml Vedi File

<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>

</dependencies> </dependencies>
<build> <build>
<testResources> <testResources>

+ 0
- 5
archiva-modules/plugins/metadata-store-file/pom.xml Vedi File

<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/plugins/metadata-store-jcr/pom.xml Vedi File

<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<testResources> <testResources>

+ 0
- 5
archiva-modules/plugins/problem-reports/pom.xml Vedi File

<artifactId>test-repository</artifactId> <artifactId>test-repository</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/plugins/repository-statistics/pom.xml Vedi File

<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 0
- 5
archiva-modules/plugins/stage-repository-merge/pom.xml Vedi File

</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

+ 6
- 6
pom.xml Vedi File

</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.12.2</version>
</dependency>

<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<artifactId>jetty-plus</artifactId> <artifactId>jetty-plus</artifactId>
<version>${jettyVersion}</version> <version>${jettyVersion}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jettyVersion}</version>
</dependency>




<dependency> <dependency>
<exclude>xom:xom</exclude> <exclude>xom:xom</exclude>
<exclude>struts:struts</exclude> <exclude>struts:struts</exclude>
<exclude>stax:stax-api</exclude> <exclude>stax:stax-api</exclude>
<exclude>xerces:xercesImpl</exclude>
<exclude>org.codehaus.plexus:plexus-xwork-integration</exclude> <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
<exclude>org.codehaus.plexus:plexus-component-api</exclude> <exclude>org.codehaus.plexus:plexus-component-api</exclude>
<exclude>org.codehaus.plexus:plexus-container-default</exclude> <exclude>org.codehaus.plexus:plexus-container-default</exclude>

Write Preview
Loading…
Annulla
Salva