From 2f34d886724564326e982a07df8af24b536752f7 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Sat, 22 Apr 2017 15:56:16 -0700
Subject: [PATCH] DATAGEODE-3 - Fix GemfireSimpleTypeHolderTest due to API
 changes in SDC SimpleTypeHolder.

---
 pom.xml                                       | 37 +++++++++++++------
 ... => GemfireSimpleTypeHolderUnitTests.java} |  5 +--
 2 files changed, 28 insertions(+), 14 deletions(-)
 rename src/test/java/org/springframework/data/gemfire/mapping/model/{GemfireSimpleTypeHolderTest.java => GemfireSimpleTypeHolderUnitTests.java} (91%)

diff --git a/pom.xml b/pom.xml
index 34ffcc106..f5bf49ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,7 @@
 
 	<dependencies>
 
+		<!-- Java EE -->
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
@@ -58,6 +59,7 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- Core Spring Framework -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
@@ -68,12 +70,14 @@
 			<artifactId>spring-tx</artifactId>
 		</dependency>
 
+		<!-- Spring Data Commons -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
 			<version>${spring-data-commons.version}</version>
 		</dependency>
 
+		<!-- Apache Geode -->
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-core</artifactId>
@@ -93,16 +97,19 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-cq</artifactId>
 			<version>${geode.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-lucene</artifactId>
 			<version>${geode.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-wan</artifactId>
@@ -122,6 +129,7 @@
 			<version>${apache-shiro.version}</version>
 		</dependency>
 
+		<!-- 3rd Party Dependencies -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -141,16 +149,21 @@
 		</dependency>
 
 		<!-- Logging -->
-		<!-- Slf4j JCL bridge redeclared to be available in compile scope -->
-		<!-- TODO Remove -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${slf4j}</version>
+			<scope>test</scope>
 		</dependency>
 
-		<!-- Test -->
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback}</version>
+			<scope>test</scope>
+		</dependency>
 
+		<!-- Test -->
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>el-api</artifactId>
@@ -211,6 +224,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>
@@ -228,14 +246,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>
@@ -249,6 +259,11 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+			</plugin>
+
 		</plugins>
 	</build>
 
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 91%
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 b713cec0d..ad67fc494 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,7 +23,6 @@
 import java.math.BigInteger;
 
 import org.junit.Test;
-import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**
  * Unit tests for {@link GemfireSimpleTypeHolder} class.
@@ -34,9 +33,9 @@
  * @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() {