diff --git a/pom.xml b/pom.xml index 60117e620..bfa96b96f 100644 --- a/pom.xml +++ b/pom.xml @@ -183,27 +183,6 @@ test - - javax.el - el-api - ${el.version} - test - - - - org.hibernate - hibernate-validator - 5.2.4.Final - test - - - - org.apache.commons - commons-lang3 - 3.1 - test - - edu.umd.cs.mtc multithreadedtc diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml index c300b99aa..dcef90638 100644 --- a/spring-cql/pom.xml +++ b/spring-cql/pom.xml @@ -64,17 +64,6 @@ com.datastax.cassandra cassandra-driver-core - - javax.enterprise - cdi-api - provided - true - - - javax.el - el-api - test - org.apache.cassandra cassandra-all @@ -84,15 +73,9 @@ guava ${guava} - - org.apache.commons - commons-lang3 - test - edu.umd.cs.mtc multithreadedtc - test diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java index 90e4712d1..8e16bd333 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java @@ -15,26 +15,21 @@ */ package org.springframework.cassandra.test.integration.config.java; -import javax.inject.Inject; - -import org.junit.Before; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest; -import org.springframework.cassandra.test.integration.config.IntegrationTestUtils; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.datastax.driver.core.Session; /** + * Base class for Cassandra integration tests. + * * @author Matthew T. Adams + * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) public abstract class AbstractIntegrationTest extends AbstractEmbeddedCassandraIntegrationTest { - @Inject protected Session session; - - @Before - public void assertSession() { - IntegrationTestUtils.assertSession(session); - } + @Autowired protected Session session; } diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 11ff6906a..1a8300e4d 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -52,13 +52,6 @@ ${springdata.commons} - - javax.annotation - jsr250-api - 1.0 - true - - joda-time joda-time @@ -119,12 +112,6 @@ cassandra-all - - javax.el - el-api - test - - com.fasterxml.jackson.core jackson-core @@ -139,27 +126,6 @@ test - - - javax.validation - validation-api - ${validation} - true - - - - org.hibernate - hibernate-validator - test - - - - commons-io - commons-io - 2.4 - test - - org.apache.openwebbeans.test cditest-owb