diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 14:37:52 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-09-01 14:37:52 +0200 |
| commit | 697bef3066e846771cd2e56bfea98dddbc6ff6de (patch) | |
| tree | 2ff187d2f36c06b4575344b921a804f93df96a8e /archiva-modules/plugins | |
| parent | b8fe7825c4ebab7c86d799af7d1459da785f2a74 (diff) | |
| download | archiva-697bef3066e846771cd2e56bfea98dddbc6ff6de.tar.gz archiva-697bef3066e846771cd2e56bfea98dddbc6ff6de.zip | |
Updating maven dependencies
Diffstat (limited to 'archiva-modules/plugins')
4 files changed, 90 insertions, 43 deletions
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index d8ec3a995..f66f597b2 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml +++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml @@ -181,6 +181,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <testResources> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index c4fabc35e..9e11c1bdd 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -40,6 +40,13 @@ <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> </dependency> + + <!-- Test scope --> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 8a1a88d40..ac95d3485 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -46,24 +46,6 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>metadata-repository-api</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> </dependency> @@ -106,26 +88,6 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>generic-metadata-support</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.lucene</groupId> @@ -177,6 +139,55 @@ <artifactId>metrics-core</artifactId> </dependency> + + <!-- Test scope --> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-repository-api</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-test-utils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>generic-metadata-support</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + + + <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index bb1ced84a..376b34262 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -79,18 +79,18 @@ <scope>test</scope> </dependency> - <!-- Needed for JDK >= 9 --> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> <scope>test</scope> </dependency> + </dependencies> <build> <plugins> @@ -123,4 +123,27 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>jdk9+</id> + <activation> + <jdk>[1.9,)</jdk> + </activation> + <dependencies> + <!-- Needed for JDK >= 9 --> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + </project> |