SGF-620 - Fix GemfireSimpleTypeHolderTest due to API changes in SDC SimpleTypeHolder.

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"

pom.xml

@@ -43,6 +43,7 @@
 
 	<dependencies>
 
+		<!-- Java EE -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
@@ -51,6 +52,7 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Core Spring Framework -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
@@ -61,12 +63,14 @@
 			<artifactId>spring-tx</artifactId>
 		</dependency>
 
+		<!-- Spring Data Commons -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${springdata.commons}</version>
 		</dependency>
 
+		<!-- Pivotal GemFire -->
 		<dependency>
 			<groupId>io.pivotal.gemfire</groupId>
 			<artifactId>geode-core</artifactId>
@@ -98,13 +102,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>${google-code-findbugs.version}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-spring</artifactId>
@@ -112,6 +109,7 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- 3rd Party Depenendencies -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -131,8 +129,6 @@
 		</dependency>
 
 		<!-- Logging -->
-		<!-- Slf4j JCL bridge redeclared to be available in compile scope -->
-		<!-- TODO Remove -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
@@ -140,7 +136,6 @@
 		</dependency>
 
 		<!-- Test -->
-
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
@@ -188,6 +183,11 @@
 	<build>
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -204,14 +204,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>wagon-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -225,6 +217,11 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
 	</build>
 

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() {

src/test/resources/logback.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
         </encoder>
     </appender>
 
-    <logger name="org.springframework.data" level="error" />
+    <logger name="org.springframework" level="${logback.log.level:-error}"/>
 
-    <root level="warn">
+    <root level="${logback.log.level:-error}">
         <appender-ref ref="console" />
     </root>
-
 </configuration>