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 <[email protected]> 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>
