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 9d1cf5687f96b719b5aba3a8e6a5282b1f1205c8 Author: Martin Stockhammer <[email protected]> AuthorDate: Mon Sep 30 21:58:11 2019 +0200 Reorganizing dependencies for repository-layer --- .../archiva-base/archiva-repository-layer/pom.xml | 41 ++++++++++++++-------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index c7ac0bb..4768691 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -34,12 +34,12 @@ <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-model</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-model</artifactId> + <artifactId>archiva-storage-api</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -70,13 +70,12 @@ <artifactId>archiva-filelock</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-common</artifactId> </dependency> <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <scope>test</scope> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -89,18 +88,25 @@ <artifactId>metadata-model</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http</artifactId> - <scope>provided</scope> + <groupId>com.cronutils</groupId> + <artifactId>cron-utils</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>com.cronutils</groupId> - <artifactId>cron-utils</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> @@ -130,6 +136,11 @@ <artifactId>spring-cache-ehcache</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins>
