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/02/02 16:32:44 UTC
[archiva] 01/02: Removing comments and moving versions to dep
management section
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 925601a263ec5a6add9c1e765a6d53f5e4d7bb1e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Feb 2 16:42:10 2020 +0100
Removing comments and moving versions to dep management section
---
.../archiva-repository-admin-default/pom.xml | 96 ++++------------------
pom.xml | 5 ++
2 files changed, 19 insertions(+), 82 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 7a2e4e3..a4b583e 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
@@ -70,8 +70,12 @@
<artifactId>archiva-common</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-api</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -98,6 +102,10 @@
<artifactId>redback-rbac-role-manager</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-api</artifactId>
</dependency>
@@ -105,6 +113,10 @@
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-taskqueue</artifactId>
+ </dependency>
<dependency>
@@ -130,13 +142,6 @@
<artifactId>spring-context</artifactId>
</dependency>
-
- <!--
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -145,33 +150,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-plexus-bridge</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-repository-api</artifactId>
- </dependency>
- <!--
-
- -->
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.components</groupId>
- <artifactId>archiva-components-spring-taskqueue</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -249,13 +227,11 @@
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-jpa</artifactId>
- <version>${redback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-jpa</artifactId>
- <version>${redback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -266,93 +242,49 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authentication-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- <!--
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-memory</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.logging.log4j</groupId>
<artifactId>log4j-jcl</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.archiva</groupId>
<artifactId>archiva-mock</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <scope>test</scope>
- </dependency>
- -->
-
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index a4417d7..74b83b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1119,6 +1119,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-common-jpa</artifactId>
+ <version>${redback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-keys-jpa</artifactId>
<version>${redback.version}</version>
<exclusions>