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 e95c1cd27dce8c161e08b16fd865a95f8316cf63 Author: Martin Stockhammer <[email protected]> AuthorDate: Wed Jun 17 23:11:52 2020 +0200 Cleanup dependencies of maven-repository --- .../resourcesstatic/archetype-resources/pom.xml | 12 +++ .../archiva-core-consumers/pom.xml | 10 +++ .../archiva-indexer-consumers/pom.xml | 10 +++ .../archiva-repository-admin-default/pom.xml | 10 +++ .../src/main/resources/META-INF/spring-context.xml | 33 +++++++++ .../archiva-maven/archiva-maven-indexer/pom.xml | 10 +++ .../archiva-maven/archiva-maven-repository/pom.xml | 85 +++++++--------------- .../archiva-web/archiva-security/pom.xml | 10 +++ 8 files changed, 123 insertions(+), 57 deletions(-) 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 3224bb4..dec0cfd 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 @@ -72,6 +72,18 @@ <!-- Test scope --> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <version>${archiva.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <version>${archiva.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.components</groupId> <artifactId>archiva-components-spring-quartz</artifactId> <version>${archiva.comp.version}</version> 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 c362ca7..fdf9efd 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 @@ -117,6 +117,16 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-repository</artifactId> <scope>test</scope> </dependency> 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 2039955..5d707f0 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 @@ -95,6 +95,16 @@ <!-- Test scope --> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-repository</artifactId> <scope>test</scope> </dependency> 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 405335f..02ed04e 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 @@ -167,6 +167,16 @@ <!-- Test scope --> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-maven/archiva-maven-common/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-common/src/main/resources/META-INF/spring-context.xml new file mode 100644 index 0000000..2549359 --- /dev/null +++ b/archiva-modules/archiva-maven/archiva-maven-common/src/main/resources/META-INF/spring-context.xml @@ -0,0 +1,33 @@ +<?xml version="1.0"?> + +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:context="http://www.springframework.org/schema/context"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; + default-lazy-init="true"> + + <context:annotation-config/> + <context:component-scan base-package="org.apache.archiva.proxy.maven"/> + +</beans> \ No newline at end of file diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml index 82eac7f..0ff3243 100644 --- a/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-indexer/pom.xml @@ -139,6 +139,16 @@ <!-- TEST Scope --> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</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 594727d..383cb95 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -105,15 +105,12 @@ <artifactId>archiva-components-spring-taskqueue</artifactId> </dependency> <dependency> - <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>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> @@ -126,6 +123,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -141,10 +144,6 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-repository-metadata</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> <dependency> @@ -163,10 +162,7 @@ <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-spi</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-transport-file</artifactId> - </dependency> + <dependency> <groupId>org.apache.maven.resolver</groupId> <artifactId>maven-resolver-connector-basic</artifactId> @@ -175,6 +171,10 @@ <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http-shared</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> <dependency> <groupId>org.springframework</groupId> @@ -192,23 +192,10 @@ <dependency> - <groupId>org.eclipse.sisu</groupId> - <artifactId>org.eclipse.sisu.plexus</artifactId> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <classifier>no_aop</classifier> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-plexus-bridge</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.apache.archiva</groupId> @@ -230,6 +217,10 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> <dependency> @@ -246,6 +237,16 @@ <!-- Test scope --> <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.components</groupId> <artifactId>archiva-components-spring-quartz</artifactId> <scope>test</scope> @@ -271,11 +272,7 @@ <artifactId>easymock</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> @@ -288,11 +285,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-mock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -307,29 +299,8 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>metadata-store-jcr</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva.components.cache</groupId> - <artifactId>archiva-components-spring-cache-ehcache</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index b212b0f..7f6dd61 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -112,6 +112,16 @@ <!-- Test Scoped --> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.maven</groupId> <artifactId>archiva-maven-repository</artifactId> <scope>test</scope>
