You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/06/26 21:46:34 UTC
[archiva] branch master updated (e39a15a -> f24edc2)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from e39a15a Dependency cleanup archiva-webdav
new 4aefd78 Dependency cleanup archiva-test-mocks
new 7bcdbc3 Dependency cleanup archiva-webapp
new 92555ff Dependency cleanup archiva-cli
new f24edc2 Cleanup of central dependency declarations
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archiva-cli/pom.xml | 12 +-
.../java/org/apache/archiva/cli/ArchivaCli.java | 36 +--
archiva-jetty/pom.xml | 5 -
.../archiva-web/archiva-test-mocks/pom.xml | 4 +
.../archiva-web/archiva-webapp-test/pom.xml | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 114 +-------
pom.xml | 325 +--------------------
status-dep.txt | 4 +
8 files changed, 30 insertions(+), 472 deletions(-)
[archiva] 01/04: Dependency cleanup archiva-test-mocks
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 4aefd78cd872c5060ff9c276e521f00440bb66f1
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Jun 26 22:56:23 2020 +0200
Dependency cleanup archiva-test-mocks
---
archiva-modules/archiva-web/archiva-test-mocks/pom.xml | 4 ++++
status-dep.txt | 2 ++
2 files changed, 6 insertions(+)
diff --git a/archiva-modules/archiva-web/archiva-test-mocks/pom.xml b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
index 845cb19..6e70c23 100644
--- a/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
+++ b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
@@ -38,6 +38,10 @@
<artifactId>archiva-consumer-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
diff --git a/status-dep.txt b/status-dep.txt
index 4ea8c53..e4f9df6 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -65,6 +65,8 @@ archiva-modules
archiva-web-common
archiva-rss
archiva-security
+ archiva-webdav
+ archiva-test-mocks
[archiva] 04/04: Cleanup of central dependency declarations
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit f24edc23979aff3ea46c171b8a18b3915ca33d54
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Jun 26 23:44:24 2020 +0200
Cleanup of central dependency declarations
---
.../java/org/apache/archiva/cli/ArchivaCli.java | 36 +--
archiva-jetty/pom.xml | 5 -
.../archiva-web/archiva-webapp-test/pom.xml | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 +-
pom.xml | 325 +--------------------
5 files changed, 14 insertions(+), 356 deletions(-)
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
index 60b1c65..9204b4c 100644
--- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
@@ -25,8 +25,6 @@ import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.consumers.RepositoryContentConsumer;
-import org.apache.archiva.converter.RepositoryConversionException;
-import org.apache.archiva.converter.legacy.LegacyRepositoryConverter;
import org.apache.archiva.repository.base.BasicManagedRepository;
import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
import org.apache.archiva.repository.scanner.RepositoryScanner;
@@ -139,7 +137,7 @@ public class ArchivaCli
}
else if ( command.convert )
{
- doConversion( command.properties );
+ LOGGER.error( "Conversion is not available anymore" );
}
else if ( command.scan )
{
@@ -247,38 +245,6 @@ public class ArchivaCli
return smallNames;
}
- private void doConversion( String properties )
- throws IOException, RepositoryConversionException
- {
- LegacyRepositoryConverter legacyRepositoryConverter =
- applicationContext.getBean( LegacyRepositoryConverter.class );
-
- Properties p = new Properties();
-
- try (InputStream fis = Files.newInputStream( Paths.get( properties ) ))
- {
- p.load( fis );
- }
-
- Path oldRepositoryPath = Paths.get( p.getProperty( SOURCE_REPO_PATH ) );
-
- Path newRepositoryPath = Paths.get( p.getProperty( TARGET_REPO_PATH ) );
-
- LOGGER.info( "Converting {} to {}", oldRepositoryPath, newRepositoryPath );
-
- List<String> fileExclusionPatterns = null;
-
- String s = p.getProperty( BLACKLISTED_PATTERNS );
-
- if ( s != null )
- {
- fileExclusionPatterns = Arrays.asList( StringUtils.split( s, "," ) );
- }
-
- legacyRepositoryConverter.convertLegacyRepository( oldRepositoryPath, newRepositoryPath,
- fileExclusionPatterns );
- }
-
private static class Commands
{
@Argument( description = "Display help information", value = "help", alias = "h" )
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 031ac12..21b7797 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -80,11 +80,6 @@
<artifactId>mail</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 6aa386c..a0d738e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -572,7 +572,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${javaxMailVersion}</version>
+ <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ac49d62..ca71b12 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -743,7 +743,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${javaxMailVersion}</version>
+ <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/pom.xml b/pom.xml
index 46a9840..55477dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,8 @@
<!-- Java Enterprise APIs -->
<javax.servlet.version>4.0.1</javax.servlet.version>
<javax.activation.version>1.1.1</javax.activation.version>
-
+ <javax.mail.version>1.4</javax.mail.version>
+ <jaxrs.version>2.0</jaxrs.version>
<commons-codec.version>1.13</commons-codec.version>
<commons-collections.version>4.4</commons-collections.version>
@@ -89,13 +90,9 @@
<derbyVersion>10.13.1.1</derbyVersion>
<httpclient.version>4.5.2</httpclient.version>
<httpclient.core.version>4.4.4</httpclient.core.version>
- <javaxMailVersion>1.4</javaxMailVersion>
- <guava.version>15.0</guava.version>
<openjpaVersion>2.4.1</openjpaVersion>
- <asm.version>5.0.4</asm.version>
-
<modelmapper.version>2.3.5</modelmapper.version>
<!-- restore when we will be able to use a derby in memory database -->
@@ -123,6 +120,10 @@
<jacocoproperty/>
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
+
+ <joda.time.version>1.5.2</joda.time.version>
+
+ <cglib.version>2.2.2</cglib.version>
</properties>
<dependencyManagement>
@@ -167,7 +168,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0</version>
+ <version>${jaxrs.version}</version>
</dependency>
@@ -644,12 +645,6 @@
<dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <version>3.3.6</version>
- </dependency>
-
- <dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.6.3</version>
@@ -675,31 +670,8 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>4.1.0</version>
- <classifier>no_aop</classifier>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- normally not needed as we are 1.6 required
- but due to http://jira.codehaus.org/browse/MODELLO-266
- and we use stax reader produced by modello
- ibm jdk stax impl won't work with
- -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </dependency>
<!-- START SNIPPET: rest-dependencies -->
<dependency>
@@ -740,26 +712,12 @@
<version>${project.version}</version>
</dependency>
<!-- END SNIPPET: rest-dependencies -->
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-rest-services</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0-2</version>
- </dependency>
<dependency>
<groupId>org.modelmapper</groupId>
@@ -848,11 +806,6 @@
<version>${commons.text.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derbyVersion}</version>
@@ -863,52 +816,12 @@
<version>${derbyVersion}</version>
</dependency>
<dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox</artifactId>
- <version>1.1.9-1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jpox</groupId>
- <artifactId>jpox-ehcache</artifactId>
- <version>1.1.9</version>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-lucene-consumers</artifactId>
<version>${project.version}</version>
@@ -936,7 +849,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${javaxMailVersion}</version>
+ <version>${javax.mail.version}</version>
</dependency>
@@ -1056,25 +969,6 @@
<artifactId>archiva-components-expression-evaluator</artifactId>
<version>${archiva.comp.version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-slf4j-logging</artifactId>
- <version>${plexus-slf4j-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.archiva.components</groupId>
@@ -1108,11 +1002,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.3</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${plexus-utils.version}</version>
@@ -1121,12 +1010,6 @@
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
<version>${archiva.comp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.cache</groupId>
@@ -1151,46 +1034,22 @@
<artifactId>redback-rbac-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<version>${redback.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-memory</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -1201,12 +1060,6 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-jpa</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -1217,132 +1070,42 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-model</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authorization-rbac</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-role-manager</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-system</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-integrations</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-integrations-security</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- </exclusion>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-cached</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-ldap</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -1355,12 +1118,6 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rest-services</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -1378,16 +1135,6 @@
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-authentication-api</artifactId>
<version>${redback.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -1442,26 +1189,6 @@
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
<version>${archiva.comp.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -1546,11 +1273,6 @@
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<version>${wagon.version}</version>
@@ -1622,7 +1344,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.5.2</version>
+ <version>${joda.time.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -1641,19 +1363,6 @@
</dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.6</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-
<!-- JCR -->
<dependency>
<groupId>javax.jcr</groupId>
@@ -1742,7 +1451,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.2.2</version>
+ <version>${cglib.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -1782,18 +1491,6 @@
<!-- Dependencies for JDK >=9 update -->
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>${rome.version}</version>
[archiva] 02/04: Dependency cleanup archiva-webapp
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 7bcdbc357367e43daef93a11cf8edca55f10c5c2
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Jun 26 23:04:04 2020 +0200
Dependency cleanup archiva-webapp
---
archiva-modules/archiva-web/archiva-webapp/pom.xml | 112 ---------------------
status-dep.txt | 1 +
2 files changed, 1 insertion(+), 112 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 628996f..ac49d62 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -81,32 +81,6 @@
</dependency>
<dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <classifier>no_aop</classifier>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-admin-default</artifactId>
</dependency>
@@ -174,18 +148,7 @@
<dependency>
<groupId>org.apache.archiva.maven</groupId>
- <!-- FIXME: temporary coupling to plugin, should be runtime -->
<artifactId>archiva-maven-repository</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -198,14 +161,6 @@
ibm jdk stax impl won't work with
-->
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
@@ -380,22 +335,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -406,16 +345,6 @@
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -446,22 +375,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -484,19 +397,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-ehcache</artifactId>
<exclusions>
@@ -544,12 +448,6 @@
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-integrations</artifactId>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -590,11 +488,6 @@
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</dependency>
@@ -657,11 +550,6 @@
<version>${spring.version}</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-slf4j-logging</artifactId>
- </dependency>
-
</dependencies>
<build>
diff --git a/status-dep.txt b/status-dep.txt
index e4f9df6..eef6435 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -67,6 +67,7 @@ archiva-modules
archiva-security
archiva-webdav
archiva-test-mocks
+ archiva-webapp
[archiva] 03/04: Dependency cleanup archiva-cli
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 92555ff5869621482fe9087830247e28b61add2a
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Jun 26 23:17:56 2020 +0200
Dependency cleanup archiva-cli
---
archiva-cli/pom.xml | 12 ++++++++----
status-dep.txt | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 79cf930..9359d81 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -45,6 +45,14 @@
<artifactId>archiva-consumer-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.code.cli-parser</groupId>
<artifactId>cli</artifactId>
<version>7</version>
@@ -61,10 +69,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.archiva.maven</groupId>
- <artifactId>archiva-maven-converter</artifactId>
- </dependency>
<!-- Consumers to include -->
<!--
This will require some additional configuration now to point to an appropriate metadata repository storage, which is not in the CLI yet
diff --git a/status-dep.txt b/status-dep.txt
index eef6435..cf5f7ad 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -69,6 +69,7 @@ archiva-modules
archiva-test-mocks
archiva-webapp
+ archiva-cli