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
The following commit(s) were added to refs/heads/master by this push:
new e9eb36e Dependency cleanup for maven-proxy
e9eb36e is described below
commit e9eb36e6ded14e63ccd981a6b7c0472bc7c40f2c
Author: Martin Stockhammer <[email protected]>
AuthorDate: Fri Jun 5 20:09:53 2020 +0200
Dependency cleanup for maven-proxy
---
.../META-INF/maven/archetype-metadata.xml | 4 +
.../resourcesstatic/archetype-resources/pom.xml | 21 +--
.../projects/compile/archetype.properties | 3 +-
.../archiva-core-consumers/pom.xml | 15 ++
.../archiva-indexer-consumers/pom.xml | 10 ++
.../archiva-repository-admin-default/pom.xml | 11 ++
.../archiva-maven/archiva-maven-proxy/pom.xml | 158 ++++++++++++---------
.../archiva/proxy/HttpProxyTransferTest.java | 10 +-
.../archiva-maven/archiva-maven-repository/pom.xml | 4 +
.../archiva-maven/archiva-maven-scheduler/pom.xml | 4 +
.../archiva-scheduler-repository/pom.xml | 10 ++
archiva-modules/archiva-web/archiva-rss/pom.xml | 10 ++
archiva-modules/plugins/problem-reports/pom.xml | 11 ++
status-dep.txt | 1 +
14 files changed, 193 insertions(+), 79 deletions(-)
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 98f379e..c817006 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -61,5 +61,9 @@
<requiredProperty key="httpcoreVersion">
<defaultValue>${httpclient.core.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="mavenWagonVersion">
+ <defaultValue>${wagon.version}</defaultValue>
+ </requiredProperty>
+
</requiredProperties>
</archetype-descriptor>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 851d789..00d8bf6 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -40,6 +40,7 @@
<httpclient.core.version>${httpcoreVersion}</httpclient.core.version>
<archiva.comp.version>${archivaCompVersion}</archiva.comp.version>
<commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version>
+ <maven.wagon.version>${mavenWagonVersion}</maven.wagon.version>
</properties>
<dependencies>
<dependency>
@@ -70,6 +71,18 @@
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${maven.wagon.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>${maven.wagon.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>repository-statistics</artifactId>
<version>${archiva.version}</version>
@@ -223,14 +236,6 @@
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <scope>test</scope>
- </dependency>
-
- -->
</dependencies>
<!-- match up with those used by Archiva -->
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
index dbb350a..d9b8f3c 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
@@ -32,4 +32,5 @@ mockitoVersion=${mockito.version}
httpclientVersion=${httpclient.version}
httpcoreVersion=${httpclient.core.version}
archivaCompVersion=${archiva.comp.version}
-beanUtilsVersion=${commons.beanutils.version}
\ No newline at end of file
+beanUtilsVersion=${commons.beanutils.version}
+mavenWagonVersion=${wagon.version}
\ No newline at end of file
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 f8ccd16..9a4fe65 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
@@ -130,6 +130,21 @@
<artifactId>javax.transaction-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml
index 2a9678a..4502c1d 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-indexer-consumers/pom.xml
@@ -94,6 +94,16 @@
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>repository-statistics</artifactId>
<scope>test</scope>
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 eaa26bb..405335f 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
@@ -164,8 +164,19 @@
</dependency>
+
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index bae0d27..d22e1d6 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -39,21 +39,109 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-plexus-bridge</artifactId>
+ <artifactId>archiva-proxy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-admin-api</artifactId>
+ <artifactId>archiva-storage-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-proxy</artifactId>
+ <artifactId>archiva-storage-fs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-policies</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-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>org.apache.archiva</groupId>
+ <artifactId>archiva-proxy-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-scheduler-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-filelock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-taskqueue</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
@@ -63,12 +151,12 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -111,30 +199,11 @@
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-jpa</artifactId>
- <version>${redback.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${openjpaVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -143,51 +212,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.registry</groupId>
- <artifactId>archiva-components-spring-registry-commons</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-cached</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-common-test-resources</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
index c48586f..2189614 100644
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
@@ -36,9 +36,9 @@ import
org.apache.archiva.repository.base.BasicManagedRepository;
import org.apache.archiva.repository.storage.StorageAsset;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.providers.http.HttpWagon;
-import org.assertj.core.api.Assertions;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Request;
@@ -209,8 +209,8 @@ public class HttpProxyTransferTest
public void testGetOverHttpProxy()
throws Exception
{
- Assertions.assertThat( System.getProperty( "http.proxyHost", "" )
).isEmpty();
- Assertions.assertThat( System.getProperty( "http.proxyPort", "" )
).isEmpty();
+ assertTrue( StringUtils.isEmpty( System.getProperty( "http.proxyHost"
, "" ) ));
+ assertTrue( StringUtils.isEmpty( System.getProperty( "http.proxyPort",
"" ) ) );
String path =
"org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
@@ -239,8 +239,8 @@ public class HttpProxyTransferTest
String actualContents = FileUtils.readFileToString(
downloadedFile.getFilePath().toFile(), Charset.defaultCharset() );
assertEquals( "Check file contents.", expectedContents, actualContents
);
- Assertions.assertThat( System.getProperty( "http.proxyHost" , "")
).isEmpty();
- Assertions.assertThat( System.getProperty( "http.proxyPort" , "")
).isEmpty();
+ assertTrue( StringUtils.isEmpty( System.getProperty( "http.proxyHost",
"" ) ) );
+ assertTrue( StringUtils.isEmpty( System.getProperty( "http.proxyPort"
, "") ) );
}
private void addConnector()
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 4f1ceb6..594727d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -108,6 +108,10 @@
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-proxy</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-api</artifactId>
+ </dependency>
<dependency>
diff --git a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
index 059e6dd..d08e854 100644
--- a/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-scheduler/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-proxy</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-admin-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven.indexer</groupId>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 6c8246e..a106971 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -126,6 +126,16 @@
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-admin-api</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml
b/archiva-modules/archiva-web/archiva-rss/pom.xml
index 17d580b..4c84df1 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -56,6 +56,16 @@
<!-- TEST Scope -->
<dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-repository</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml
b/archiva-modules/plugins/problem-reports/pom.xml
index 9a9d3eb..cfea4e1 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -96,6 +96,17 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
diff --git a/status-dep.txt b/status-dep.txt
index d49898b..3170d6e 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -43,6 +43,7 @@ archiva-modules
archiva-maven-model
archiva-maven-metadata
archiva-maven-model
+ archiva-maven-proxy
