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 2019/09/01 20:03:06 UTC
[archiva] branch master updated (697bef3 -> 41af9ab)
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 697bef3 Updating maven dependencies
new 9a2f183 Optimized import
new ef60ef8 Cleaning up dependencies
new d07420a Fixing bad import
new d7c3dbe Removing maven-artifact-manager dependency
new 316c190 Replacing jsr250 dependency by javax.annotations
new 8dd880c Fixing enunciate configuration
new 0df75b7 Removing duplicate dependencies
new 41af9ab Removing unused dependency
The 8 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-base/archiva-configuration/pom.xml | 25 +++++++
.../resourcesstatic/archetype-resources/pom.xml | 4 +-
.../archiva-lucene-consumers/pom.xml | 6 ++
.../archiva-base/archiva-plexus-bridge/pom.xml | 41 +++++------
.../archiva-base/archiva-policies/pom.xml | 19 +++++
.../archiva/policies/CachedFailuresPolicyTest.java | 1 -
.../archiva-base/archiva-proxy-api/pom.xml | 17 +++++
.../archiva-repository-admin-default/pom.xml | 10 +--
.../archiva-base/archiva-storage-fs/pom.xml | 8 +++
.../archiva-maven/archiva-maven-proxy/pom.xml | 16 -----
.../archiva-maven/archiva-maven-repository/pom.xml | 8 ---
.../archiva-scheduler-api/pom.xml | 6 ++
.../archiva-rest/archiva-rest-services/pom.xml | 5 ++
.../archiva-web/archiva-web-common/pom.xml | 6 ++
.../archiva-web-common/src/enunciate/enunciate.xml | 1 +
.../apache/archiva/webdav/ArchivaDavResource.java | 2 +-
.../metadata/metadata-repository-api/pom.xml | 2 +-
pom.xml | 82 +++++++++++++++++-----
18 files changed, 186 insertions(+), 73 deletions(-)
[archiva] 03/08: Fixing bad import
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 d07420aa72981de873257e10f218d832e2b230b9
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 20:09:13 2019 +0200
Fixing bad import
---
.../src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index 26ef918..a4172fb 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -19,7 +19,6 @@ package org.apache.archiva.webdav;
* under the License.
*/
-import edu.emory.mathcs.backport.java.util.Collections;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.repository.LayoutException;
import org.apache.archiva.repository.storage.RepositoryStorage;
@@ -65,6 +64,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.time.format.DateTimeFormatter;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
[archiva] 06/08: Fixing enunciate configuration
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 8dd880c230c71204657b4ab81f53331d0e5e6505
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 21:06:21 2019 +0200
Fixing enunciate configuration
---
.../archiva-web/archiva-web-common/src/enunciate/enunciate.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
index b944852..69d589c 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
@@ -36,6 +36,7 @@
<jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/>
<jaxon1 disabled="true"/>
+ <jackson1 disabled="true"/>
<docs disabled="false"
docsSubdir=""
[archiva] 04/08: Removing maven-artifact-manager dependency
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 d7c3dbe771aed0a71c49d7ba29051b8ce3b6777e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 20:09:48 2019 +0200
Removing maven-artifact-manager dependency
---
.../archiva-maven/archiva-maven-repository/pom.xml | 4 ----
.../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 5 +++++
pom.xml | 12 ------------
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index b2bdcc8..214e9f4 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -99,10 +99,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
</dependency>
<dependency>
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 0ad5958..8cd80f2 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
@@ -62,6 +62,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-filelock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-indexing</artifactId>
<exclusions>
<exclusion>
@@ -420,6 +424,7 @@
<scope>provided</scope>
</dependency>
+
<!-- Needed for JDK >= 9 -->
<dependency>
<groupId>javax.annotation</groupId>
diff --git a/pom.xml b/pom.xml
index 6785065..f79014c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
<commons-lang.version>2.6</commons-lang.version>
<maven3x.version>3.5.4</maven3x.version>
- <maven.artifact-manager.version>2.2.1</maven.artifact-manager.version>
<maven.compat.version>3.0</maven.compat.version>
<maven.resolver.version>1.1.1</maven.resolver.version>
<sonatype.aether.version>1.13.1</sonatype.aether.version>
@@ -899,17 +898,6 @@
<artifactId>maven-artifact</artifactId>
<version>${maven3x.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact-manager</artifactId>
- <version>${maven.artifact-manager.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
[archiva] 01/08: Optimized import
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 9a2f183a4e8f4086e6b6bd18ab5c26d15b009c11
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 19:42:36 2019 +0200
Optimized import
---
.../test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
index d27c392..d9919a5 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/archiva/policies/CachedFailuresPolicyTest.java
@@ -32,7 +32,6 @@ import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.IOException;
-import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
[archiva] 05/08: Replacing jsr250 dependency by javax.annotations
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 316c190b1a1f2286400c882a37aaf27d2f970845
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 21:01:33 2019 +0200
Replacing jsr250 dependency by javax.annotations
---
.../archiva-base/archiva-configuration/pom.xml | 2 +-
.../resourcesstatic/archetype-resources/pom.xml | 4 +-
.../archiva-lucene-consumers/pom.xml | 6 +++
.../archiva-base/archiva-plexus-bridge/pom.xml | 2 +-
.../archiva-repository-admin-default/pom.xml | 6 +++
.../archiva-scheduler-api/pom.xml | 6 +++
.../archiva-web/archiva-web-common/pom.xml | 6 +++
.../metadata/metadata-repository-api/pom.xml | 2 +-
pom.xml | 47 +++++++++++++++++++---
9 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 9c93b60..5038d59 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -136,7 +136,7 @@
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
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 486a861..94881bc 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
@@ -117,8 +117,8 @@
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
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 1bf667e..eb11316 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
@@ -66,6 +66,12 @@
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index 529dc3b..96f4fce 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
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 9e3132c..a50cbbd 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
@@ -89,6 +89,12 @@
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.modelmapper</groupId>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
index 558749b..7da9c8b 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 24a4ec8..ec5f622 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -192,6 +192,12 @@
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index af1af19..72d3215 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git a/pom.xml b/pom.xml
index f79014c..010be99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,11 +147,7 @@
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
@@ -597,6 +593,10 @@
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -996,12 +996,23 @@
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-taskqueue</artifactId>
<version>${redback.taskqueue.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>spring-quartz</artifactId>
<version>${redback.quartz.version}</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions> </dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
@@ -1031,6 +1042,12 @@
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<version>${redback.cache.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
@@ -1133,6 +1150,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1268,6 +1289,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1277,6 +1302,12 @@
<groupId>org.apache.archiva.redback.components.registry</groupId>
<artifactId>spring-registry-api</artifactId>
<version>${redback.registry.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback.components.registry</groupId>
@@ -1299,6 +1330,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[archiva] 07/08: Removing duplicate dependencies
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 0df75b71b51982daef8fb83df364844f30d9304e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 21:11:47 2019 +0200
Removing duplicate dependencies
---
.../archiva-maven/archiva-maven-proxy/pom.xml | 16 ----------------
.../archiva-maven/archiva-maven-repository/pom.xml | 4 ----
2 files changed, 20 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index 1a1788a..edaa6f1 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -85,12 +85,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>test</scope>
@@ -101,16 +95,6 @@
<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.components.registry</groupId>
<artifactId>spring-registry-commons</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 214e9f4..89f19aa 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -45,10 +45,6 @@
<artifactId>metadata-repository-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.maven</groupId>
- <artifactId>archiva-maven-metadata</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-proxy-api</artifactId>
</dependency>
[archiva] 02/08: Cleaning up dependencies
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 ef60ef87540fafcc709037a79e31cd1be3fe596d
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 19:43:31 2019 +0200
Cleaning up dependencies
---
.../archiva-base/archiva-configuration/pom.xml | 25 +++++++++++++
.../archiva-base/archiva-plexus-bridge/pom.xml | 41 ++++++++++------------
.../archiva-base/archiva-policies/pom.xml | 19 ++++++++++
.../archiva-base/archiva-proxy-api/pom.xml | 17 +++++++++
.../archiva-base/archiva-storage-fs/pom.xml | 8 +++++
pom.xml | 23 ++++++++++++
6 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index a593d44..9c93b60 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -35,6 +35,10 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-policies</artifactId>
</dependency>
<dependency>
@@ -119,9 +123,25 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- Test scope -->
<dependency>
@@ -132,6 +152,11 @@
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index b6c2fe2..529dc3b 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -44,48 +44,45 @@
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<classifier>no_aop</classifier>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-utils</artifactId>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
+
+ <!-- Test scope -->
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
+ <scope>test</scope>
</dependency>
- <!--
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-digest</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.archiva.redback.components</groupId>
+ <artifactId>spring-utils</artifactId>
+ <scope>test</scope>
</dependency>
- -->
+
</dependencies>
</project>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 4669e7b..1a3380b 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -51,6 +51,18 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-api</artifactId>
<exclusions>
@@ -60,6 +72,8 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Test scope -->
<dependency>
<groupId>org.apache.archiva.redback.components.cache</groupId>
<artifactId>spring-cache-ehcache</artifactId>
@@ -107,6 +121,11 @@
<artifactId>log4j-jcl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-filelock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
index 2bc4084..1a1334f 100644
--- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
@@ -35,7 +35,24 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-storage-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-policies</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
index 64718fd..8817bd0 100644
--- a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
+++ b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
@@ -56,6 +56,14 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 27dcfd3..6785065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1806,6 +1806,7 @@
</execution>
</executions>
</plugin>
+
</plugins>
<pluginManagement>
<plugins>
@@ -1881,6 +1882,28 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <ignoredDependencies>
+ <ignoredDependency>org.easymock</ignoredDependency>
+ <ignoredDependency>junit:junit</ignoredDependency>
+ </ignoredDependencies>
+
+ <!-- ignore annotations for "used but undeclared" warnings
+ <ignoredUsedUndeclaredDependencies>
+ <ignoredUsedUndeclaredDependency>org.easymock</ignoredUsedUndeclaredDependency>
+ </ignoredUsedUndeclaredDependencies>
+
+ <ignoredUnusedDeclaredDependencies>
+ <ignoredUnusedDeclaredDependency>org.easymock</ignoredUnusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
+ -->
+ </configuration>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>
[archiva] 08/08: Removing unused dependency
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 41af9aba9dfe298389fbbfbb50d33737e491e7c2
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 1 22:02:51 2019 +0200
Removing unused dependency
---
.../archiva-repository-admin/archiva-repository-admin-default/pom.xml | 4 ----
1 file changed, 4 deletions(-)
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 a50cbbd..c54697e 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
@@ -51,10 +51,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-common</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository-api</artifactId>
</dependency>