Cleaning up dependencies for spring-cache
diff --git a/pom.xml b/pom.xml index 8e4bbd0..cfdfdf5 100644 --- a/pom.xml +++ b/pom.xml
@@ -26,7 +26,7 @@ </parent> <groupId>org.apache.archiva.redback.components.cache</groupId> <artifactId>spring-cache</artifactId> - <name>Spring Cache Component</name> + <name>Redback Components :: Spring Cache Component</name> <version>2.3-SNAPSHOT</version> <packaging>pom</packaging>
diff --git a/spring-cache-api/pom.xml b/spring-cache-api/pom.xml index 9838cf2..963db84 100644 --- a/spring-cache-api/pom.xml +++ b/spring-cache-api/pom.xml
@@ -29,7 +29,7 @@ <artifactId>spring-cache-api</artifactId> - <name>Spring Cache API</name> + <name>Redback Components :: Spring Cache API</name> <properties> <site.staging.base>${project.parent.basedir}/../site</site.staging.base> </properties> @@ -57,29 +57,12 @@ </dependency> <dependency> <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <artifactId>javax.annotation-api</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> </dependencies>
diff --git a/spring-cache-providers/pom.xml b/spring-cache-providers/pom.xml index d5d1b2b..6e31def 100644 --- a/spring-cache-providers/pom.xml +++ b/spring-cache-providers/pom.xml
@@ -25,7 +25,7 @@ <version>2.3-SNAPSHOT</version> </parent> <artifactId>spring-cache-providers</artifactId> - <name>Spring Cache Providers</name> + <name>Redback Components :: Spring Cache Providers</name> <packaging>pom</packaging> <description>Commons Cache API Providers Parent Pom.</description> <properties>
diff --git a/spring-cache-providers/spring-cache-ehcache/pom.xml b/spring-cache-providers/spring-cache-ehcache/pom.xml index 3104422..ae0af52 100644 --- a/spring-cache-providers/spring-cache-ehcache/pom.xml +++ b/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -28,7 +28,7 @@ </parent> <artifactId>spring-cache-ehcache</artifactId> - <name>Spring Cache Provider :: ehcache</name> + <name>Redback Components :: Spring Cache Provider :: ehcache</name> <description>Commons Cache API : ehcache implementation.</description> <properties> @@ -50,9 +50,21 @@ </exclusions> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <scope>test</scope> </dependency> </dependencies>
diff --git a/spring-cache-providers/spring-cache-hashmap/pom.xml b/spring-cache-providers/spring-cache-hashmap/pom.xml index f6a7a9a..757ceae 100644 --- a/spring-cache-providers/spring-cache-hashmap/pom.xml +++ b/spring-cache-providers/spring-cache-hashmap/pom.xml
@@ -29,7 +29,7 @@ <artifactId>spring-cache-hashmap</artifactId> - <name>Spring Cache Provider :: hashmap</name> + <name>Redback Components :: Spring Cache Provider :: hashmap</name> <description>Commons Cache API : simple in memory HashMap implementation.</description> <properties> @@ -39,10 +39,24 @@ <url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url> <dependencies> +<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> </dependency> +--> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> </dependencies> </project>
diff --git a/spring-cache-providers/spring-cache-oscache/pom.xml b/spring-cache-providers/spring-cache-oscache/pom.xml index 437b363..f594eef 100644 --- a/spring-cache-providers/spring-cache-oscache/pom.xml +++ b/spring-cache-providers/spring-cache-oscache/pom.xml
@@ -24,7 +24,7 @@ <artifactId>spring-cache-oscache</artifactId> - <name>Spring Cache Provider :: oscache</name> + <name>Redback Components :: Spring Cache Provider :: oscache</name> <description>Commons Cache API : oscache implementation.</description> <properties> @@ -46,10 +46,18 @@ </exclusions> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + </dependencies> </project>
diff --git a/spring-cache-test/pom.xml b/spring-cache-test/pom.xml index f279c84..8c8912b 100644 --- a/spring-cache-test/pom.xml +++ b/spring-cache-test/pom.xml
@@ -25,7 +25,7 @@ <version>2.3-SNAPSHOT</version> </parent> <artifactId>spring-cache-test</artifactId> - <name>Spring Cache Tests</name> + <name>Redback Components :: Spring Cache Tests</name> <packaging>jar</packaging> <description>Commons Test Cache API.</description> @@ -50,9 +50,30 @@ <artifactId>spring-test</artifactId> <scope>compile</scope> </dependency> + + <!-- JUNIT 5 --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit.platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-console-standalone</artifactId> + <version>${junit.platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.jupiter.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit.jupiter.version}</version> <scope>compile</scope> </dependency> </dependencies>