From 939e1087b7525a0f7fe09f009bd13b066fcfdea8 Mon Sep 17 00:00:00 2001 From: John Blum Date: Sat, 22 Apr 2017 16:31:12 -0700 Subject: [PATCH] SGF-620 - Fix GemfireSimpleTypeHolderTest due to API changes in SDC SimpleTypeHolder. --- build.gradle | 15 +++++---- pom.xml | 33 +++++++++---------- ... => GemfireSimpleTypeHolderUnitTests.java} | 9 ++--- src/test/resources/logback.xml | 6 ++-- 4 files changed, 29 insertions(+), 34 deletions(-) rename src/test/java/org/springframework/data/gemfire/mapping/model/{GemfireSimpleTypeHolderTest.java => GemfireSimpleTypeHolderUnitTests.java} (79%) diff --git a/build.gradle b/build.gradle index 57633dec..7d18fe94 100644 --- a/build.gradle +++ b/build.gradle @@ -81,6 +81,9 @@ repositories { } dependencies { + // Java EE + optional "javax.enterprise:cdi-api:$cdiVersion" + // Spring Framework compile("org.springframework:spring-context-support:$springVersion") { exclude group: "commons-logging", module: "commons-logging" @@ -89,23 +92,23 @@ dependencies { exclude group: "commons-logging", module: "commons-logging" } - // Spring Data + // Spring Data Commons compile("org.springframework.data:spring-data-commons:${springDataCommonsVersion}") { exclude group: "commons-logging", module: "commons-logging" } - // GemFire + // Pivotal GemFire compile("io.pivotal.gemfire:geode-core:$gemfireVersion") compile("io.pivotal.gemfire:geode-cq:$gemfireVersion") compile("io.pivotal.gemfire:geode-lucene:$gemfireVersion") compile("io.pivotal.gemfire:geode-wan:$gemfireVersion") - optional("org.apache.shiro:shiro-spring:$shiroVersion") runtime("antlr:antlr:$antlrVersion") + optional("org.apache.shiro:shiro-spring:$shiroVersion") - optional "javax.enterprise:cdi-api:$cdiVersion" + // 3rd Party Dependencies + compile "org.aspectj:aspectjweaver:$aspectjVersion" compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" - compile "org.aspectj:aspectjweaver:$aspectjVersion" // Testing testCompile("org.springframework:spring-test:$springVersion") { @@ -117,8 +120,8 @@ dependencies { testCompile "org.assertj:assertj-core:$assertjVersion" testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion" testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" - testCompile "org.projectlombok:lombok:$lombokVersion" testCompile "org.mockito:mockito-core:$mockitoVersion" + testCompile "org.projectlombok:lombok:$lombokVersion" testCompile "edu.umd.cs.mtc:multithreadedtc:$multiThreadedtcVersion" testRuntime "javax.el:el-api:$cdiVersion" diff --git a/pom.xml b/pom.xml index f5160c6d..f9496f7b 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ + javax.enterprise cdi-api @@ -51,6 +52,7 @@ true + org.springframework spring-context-support @@ -61,12 +63,14 @@ spring-tx + org.springframework.data spring-data-commons ${springdata.commons} + io.pivotal.gemfire geode-core @@ -98,13 +102,6 @@ runtime - - com.google.code.findbugs - annotations - ${google-code-findbugs.version} - true - - org.apache.shiro shiro-spring @@ -112,6 +109,7 @@ true + org.aspectj aspectjweaver @@ -131,8 +129,6 @@ - - org.slf4j jcl-over-slf4j @@ -140,7 +136,6 @@ - javax.el el-api @@ -188,6 +183,11 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + org.apache.maven.plugins maven-surefire-plugin @@ -204,14 +204,6 @@ - - org.apache.maven.plugins - maven-assembly-plugin - - - org.codehaus.mojo - wagon-maven-plugin - org.asciidoctor asciidoctor-maven-plugin @@ -225,6 +217,11 @@ + + org.codehaus.mojo + wagon-maven-plugin + + diff --git a/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderTest.java b/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java similarity index 79% rename from src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderTest.java rename to src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java index 48f8ee0e..e2f18095 100644 --- a/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderTest.java +++ b/src/test/java/org/springframework/data/gemfire/mapping/model/GemfireSimpleTypeHolderUnitTests.java @@ -23,21 +23,18 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.junit.Test; -import org.springframework.data.mapping.model.SimpleTypeHolder; /** - * The GemfireSimpleTypeHolderTest class is a test suite of test cases testing the contract and functionality - * of the GemfireSimpleTypeHolder class. + * Unit tests for {@link GemfireSimpleTypeHolder}. * * @author John Blum * @see org.junit.Test * @see org.springframework.data.gemfire.mapping.model.GemfireSimpleTypeHolder - * @see org.springframework.data.mapping.model.SimpleTypeHolder * @since 1.6.3 */ -public class GemfireSimpleTypeHolderTest { +public class GemfireSimpleTypeHolderUnitTests { - private final GemfireSimpleTypeHolder holder = new GemfireSimpleTypeHolder(new SimpleTypeHolder()); + private final GemfireSimpleTypeHolder holder = new GemfireSimpleTypeHolder(); @Test public void bigDecimalAndBigIntegerAreSimpleTypes() { diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index 9c7903ae..2db6ee44 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -1,16 +1,14 @@ - %d %5p %40.40c:%4L - %m%n - + - + -