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 697bef3066e846771cd2e56bfea98dddbc6ff6de Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Sep 1 14:37:52 2019 +0200 Updating maven dependencies --- .../archiva-base/archiva-checksum/pom.xml | 35 ++++++--- .../archiva-base/archiva-configuration/pom.xml | 31 ++++---- .../apache/archiva/configuration/FileTypes.java | 6 +- .../META-INF/maven/archetype-metadata.xml | 3 + .../resourcesstatic/archetype-resources/pom.xml | 9 +++ .../projects/compile/archetype.properties | 1 + .../archiva-lucene-consumers/pom.xml | 9 +++ .../archiva-base/archiva-filelock/pom.xml | 1 + .../archiva-base/archiva-policies/pom.xml | 41 ++++++---- .../archiva-base/archiva-repository-layer/pom.xml | 6 ++ .../archiva-repository-scanner/pom.xml | 17 ++++- .../archiva-maven/archiva-maven-converter/pom.xml | 37 ++++++--- .../archiva-maven/archiva-maven-repository/pom.xml | 45 ++++++++--- .../archiva-scheduler-repository/pom.xml | 21 ++++-- archiva-modules/archiva-web/archiva-rss/pom.xml | 5 ++ .../archiva-web/archiva-security/pom.xml | 6 ++ .../plugins/metadata-store-cassandra/pom.xml | 6 ++ .../plugins/metadata-store-file/pom.xml | 7 ++ archiva-modules/plugins/metadata-store-jcr/pom.xml | 87 ++++++++++++---------- archiva-modules/plugins/problem-reports/pom.xml | 33 ++++++-- 20 files changed, 285 insertions(+), 121 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 4b8bb25..43fe3e5 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -55,18 +55,6 @@ <artifactId>commons-io</artifactId> </dependency> - <!-- 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> <build> @@ -84,4 +72,27 @@ </plugins> </pluginManagement> </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> diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 5961fd2..a593d44 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -111,25 +111,9 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> - <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-utils</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.apache.archiva.redback.components</groupId> - <artifactId>expression-evaluator</artifactId> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - </exclusions> - </dependency> - --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -138,12 +122,25 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> + + <!-- Test scope --> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version> <scope>test</scope> - </dependency> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java index 1b263ed..c7a9d49 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java @@ -22,6 +22,7 @@ package org.apache.archiva.configuration; import org.apache.archiva.common.FileTypeUtils; import org.apache.archiva.configuration.functors.FiletypeSelectionPredicate; import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader; +import org.apache.archiva.configuration.util.PathMatcher; import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.components.registry.RegistryException; import org.apache.archiva.redback.components.registry.RegistryListener; @@ -30,7 +31,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.configuration.CombinedConfiguration; -import org.apache.tools.ant.types.selectors.SelectorUtils; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -137,7 +137,7 @@ public class FileTypes for ( String pattern : artifactPatterns ) { - if ( SelectorUtils.matchPath( pattern, relativePath, false ) ) + if ( PathMatcher.matchPath( pattern, relativePath, false ) ) { // Found match return true; @@ -155,7 +155,7 @@ public class FileTypes for ( String pattern : DEFAULT_EXCLUSIONS ) { - if ( SelectorUtils.matchPath( pattern, relativePath, false ) ) + if ( PathMatcher.matchPath( pattern, relativePath, false ) ) { // Found match return true; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index dc45733..109b638 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -55,6 +55,9 @@ <requiredProperty key="redbackRegistryVersion"> <defaultValue>${redback.registry.version}</defaultValue> </requiredProperty> + <requiredProperty key="redbackCacheVersion"> + <defaultValue>${redback.cache.version}</defaultValue> + </requiredProperty> <requiredProperty key="springockitoVersion"> <defaultValue>${springockito.version}</defaultValue> </requiredProperty> 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 4bf1e16..486a861 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 @@ -35,6 +35,7 @@ <log4j.version>${log4jVersion}</log4j.version> <spring.version>${springVersion}</spring.version> <redback.registry.version>${redbackRegistryVersion}</redback.registry.version> + <redback.cache.version>${redbackCacheVersion}</redback.cache.version> <guava.version>${guavaVersion}</guava.version> <springockito.version>${springockitoVersion}</springockito.version> <mockito.version>${mockitoVersion}</mockito.version> @@ -73,6 +74,14 @@ <artifactId>metadata-repository-api</artifactId> <version>${archiva.version}</version> </dependency> + + <!-- Test scope --> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <version>${redbackCacheVersion}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-mock</artifactId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties index 001c75d..59ca7c9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties @@ -27,6 +27,7 @@ slf4jVersion=${slf4j.version} springVersion=${spring.version} guavaVersion=${guava.version} redbackRegistryVersion=${redback.registry.version} +redbackCacheVersion=${redback.cache.version} springockitoVersion=${springockito.version} mockitoVersion=${mockito.version} httpclientVersion=${httpclient.version} diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 9711c1d..1bf667e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -104,6 +104,8 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-admin-api</artifactId> </dependency> + + <!-- Test scope --> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> @@ -151,6 +153,13 @@ <artifactId>asm</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <pluginManagement> diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml index fb369c6..c683caa 100644 --- a/archiva-modules/archiva-base/archiva-filelock/pom.xml +++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml @@ -60,6 +60,7 @@ <artifactId>slf4j-api</artifactId> </dependency> + <!-- Test scope --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index ab5f640..4669e7b 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -69,6 +69,7 @@ <artifactId>commons-logging</artifactId> </exclusion> </exclusions> + <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -97,28 +98,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <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> - <scope>test</scope> - </dependency> </dependencies> <build> @@ -147,4 +136,28 @@ </plugins> </pluginManagement> </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> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 3e93356..15bd385 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -103,6 +103,7 @@ <artifactId>cron-utils</artifactId> </dependency> + <!-- Test scope --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> @@ -123,6 +124,11 @@ <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index e7e3172..11eff99 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -39,23 +39,27 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-configuration</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-admin-api</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> + + <!-- Test scope --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-configuration</artifactId> - <!-- FIXME olamy : should be scope test but it depends on FileTypes + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> - --> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -63,6 +67,11 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml index d0c937f..edd0b99 100644 --- a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml @@ -123,20 +123,11 @@ <scope>test</scope> </dependency> - <!-- START Needed for JDK >= 9 --> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> <scope>test</scope> </dependency> - - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> - <!-- STOP Needed for JDK >= 9 --> - <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> @@ -171,4 +162,28 @@ </plugins> </pluginManagement> </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> diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index 07d979a..b2bdcc8 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -156,6 +156,9 @@ <artifactId>wagon-http-lightweight</artifactId> <scope>provided</scope> </dependency> + + + <!-- Test scope --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> @@ -190,6 +193,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> </dependency> <dependency> @@ -198,30 +202,24 @@ <scope>test</scope> </dependency> - <!-- Needed for JDK >= 9 --> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>javax.annotation-api</artifactId> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-store-jcr</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> + <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-store-jcr</artifactId> - </dependency> - </dependencies> <build> <plugins> @@ -277,4 +275,27 @@ </plugins> </pluginManagement> </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> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index fce3ed5..80659c3 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -75,11 +75,7 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-scanner</artifactId> </dependency> - <dependency> - <groupId>org.apache.archiva.maven</groupId> - <artifactId>archiva-maven-repository</artifactId> - <scope>test</scope> - </dependency> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-layer</artifactId> @@ -98,6 +94,14 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> + + + <!-- Test scope --> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-repository</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> @@ -125,6 +129,13 @@ <artifactId>asm</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <pluginManagement> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index ec536bc..6a64ba6 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -80,5 +80,10 @@ <artifactId>xercesImpl</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.archiva.redback.components.cache</groupId> + <artifactId>spring-cache-ehcache</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index 4a1a5d1..8196c39 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -211,6 +211,12 @@ <artifactId>asm</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index d8ec3a9..f66f597 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 c4fabc3..9e11c1b 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 8a1a88d..ac95d34 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 bb1ced8..376b342 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>
