diff options
Diffstat (limited to 'archiva-modules/archiva-base')
11 files changed, 109 insertions, 50 deletions
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 4b8bb255f..43fe3e5e7 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 5961fd259..a593d446e 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 1b263edb9..c7a9d4935 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 dc457332d..109b638c7 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 4bf1e1683..486a861de 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 001c75db7..59ca7c984 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 9711c1d59..1bf667e45 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 fb369c652..c683caa1f 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 ab5f64081..4669e7b13 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 3e9335650..15bd3854a 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 e7e317225..11eff993c 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> |