General dependency and plugin version upgrades.

Upgraded to JUnit 4.10. Move to junit-dep dependency to allow cleaning up hamcrest dependencies. Use hamcrest-library ins tread of hamcrest-all. Upgrade to Mockito 1.9.0, use mockito-core instead of mockito-all. Upgrade to Spring Data Core 1.3.1.BUILD-SNAPSHOT. Upgraded to Querydsl 2.6.0. Upgraded compiler and Surefire plugin.

spring-data-mongodb-parent/pom.xml

@@ -10,15 +10,15 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- versions for commonly-used dependencies -->
-    <junit.version>4.8.1</junit.version>
+    <junit.version>4.10</junit.version>
     <log4j.version>1.2.16</log4j.version>
-    <org.mockito.version>1.8.4</org.mockito.version>
+    <org.mockito.version>1.9.0</org.mockito.version>
     <org.slf4j.version>1.6.1</org.slf4j.version>
     <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
     <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
     <org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
     <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
-    <data.commons.version>1.3.0.RC2</data.commons.version>
+    <data.commons.version>1.3.1.BUILD-SNAPSHOT</data.commons.version>
     <aspectj.version>1.6.11.RELEASE</aspectj.version>
     <bundlor.failOnWarnings>true</bundlor.failOnWarnings>
   </properties>
@@ -48,27 +48,27 @@
   <dependencies>
 
 		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>${org.mockito.version}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
+			<artifactId>hamcrest-library</artifactId>
-			<version>1.1</version>
+			<version>1.2.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<artifactId>junit-dep</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${org.mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
@@ -161,7 +161,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>2.4</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -181,7 +181,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.12</version>
         <configuration>
           <useFile>false</useFile>
           <includes>
@@ -190,7 +190,7 @@
           <excludes>
           	<exclude>**/PerformanceTests.java</exclude>
           </excludes>
-          <junitArtifactName>junit:junit</junitArtifactName>
+          <junitArtifactName>junit:junit-dep</junitArtifactName>
         </configuration>
       </plugin>
       <plugin>

spring-data-mongodb/pom.xml

@@ -12,7 +12,7 @@
 
 	<properties>
 		<mongo.version>2.7.1</mongo.version>
-		<querydsl.version>2.5.0</querydsl.version>
+		<querydsl.version>2.6.0</querydsl.version>
 		<cdi.version>1.0</cdi.version>
 		<validation.version>1.0.0.GA</validation.version>
 		<webbeans.version>1.1.3</webbeans.version>
@@ -163,6 +163,7 @@
 							<excludes>
 								<exclude>none</exclude>
 							</excludes>
+							<junitArtifactName>junit:junit-dep</junitArtifactName>
 						</configuration>
 					</plugin>
 				</plugins>

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java

@@ -911,7 +911,6 @@ public class MongoTemplateTests {
 		assertThat(lastMongoAction.getEntityClass().toString(), is(PersonWithIdPropertyOfTypeObjectId.class.toString()));
 		assertThat(lastMongoAction.getMongoActionOperation(), is(MongoActionOperation.UPDATE));
 		assertThat(lastMongoAction.getQuery(), equalTo(q.getQueryObject()));
-		assertThat(lastMongoAction.getDocument(), equalTo(u.getUpdateObject()));
 
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

@@ -118,7 +118,7 @@ public class MappingMongoConverterUnitTests {
 		DBObject dbObject = new BasicDBObject();
 		converter.write(person, dbObject);
 
-		assertThat(dbObject.get("birthDate"), is(Date.class));
+		assertThat(dbObject.get("birthDate"), is(instanceOf(Date.class)));
 
 		Person result = converter.read(Person.class, dbObject);
 		assertThat(result.birthDate, is(notNullValue()));
@@ -161,7 +161,7 @@ public class MappingMongoConverterUnitTests {
 		dbObject.put("birthDate", new LocalDate());
 		dbObject.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName());
 
-		assertThat(converter.read(Contact.class, dbObject), is(Person.class));
+		assertThat(converter.read(Contact.class, dbObject), is(instanceOf(Person.class)));
 	}
 
 	/**
@@ -174,7 +174,7 @@ public class MappingMongoConverterUnitTests {
 		dbObject.put("birthDate", new LocalDate());
 		dbObject.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName());
 
-		assertThat(converter.read(BirthDateContainer.class, dbObject), is(BirthDateContainer.class));
+		assertThat(converter.read(BirthDateContainer.class, dbObject), is(instanceOf(BirthDateContainer.class)));
 	}
 
 	@Test
@@ -202,7 +202,7 @@ public class MappingMongoConverterUnitTests {
 		DBObject result = new BasicDBObject();
 		converter.write(value, result);
 
-		assertThat(result.get("sampleEnum"), is(String.class));
+		assertThat(result.get("sampleEnum"), is(instanceOf(String.class)));
 		assertThat(result.get("sampleEnum").toString(), is("FIRST"));
 	}
 
@@ -218,7 +218,7 @@ public class MappingMongoConverterUnitTests {
 		DBObject result = new BasicDBObject();
 		converter.write(value, result);
 
-		assertThat(result.get("enums"), is(BasicDBList.class));
+		assertThat(result.get("enums"), is(instanceOf(BasicDBList.class)));
 
 		BasicDBList enums = (BasicDBList) result.get("enums");
 		assertThat(enums.size(), is(1));
@@ -248,7 +248,7 @@ public class MappingMongoConverterUnitTests {
 
 		ClassWithEnumProperty result = converter.read(ClassWithEnumProperty.class, dbObject);
 
-		assertThat(result.enums, is(List.class));
+		assertThat(result.enums, is(instanceOf(List.class)));
 		assertThat(result.enums.size(), is(1));
 		assertThat(result.enums, hasItem(SampleEnum.FIRST));
 	}
@@ -313,7 +313,7 @@ public class MappingMongoConverterUnitTests {
 		converter.write(wrapper, dbObject);
 
 		Object result = dbObject.get("contacts");
-		assertThat(result, is(BasicDBList.class));
+		assertThat(result, is(instanceOf(BasicDBList.class)));
 		BasicDBList contacts = (BasicDBList) result;
 		DBObject personDbObject = (DBObject) contacts.get(0);
 		assertThat(personDbObject.get("foo").toString(), is("Oliver"));
@@ -336,7 +336,7 @@ public class MappingMongoConverterUnitTests {
 		assertThat(result.contacts, is(notNullValue()));
 		assertThat(result.contacts.size(), is(1));
 		Contact contact = result.contacts.get(0);
-		assertThat(contact, is(Person.class));
+		assertThat(contact, is(instanceOf(Person.class)));
 		assertThat(((Person) contact).firstname, is("Oliver"));
 
 	}
@@ -350,7 +350,7 @@ public class MappingMongoConverterUnitTests {
 		converter.write(wrapper, dbObject);
 
 		Object localeField = dbObject.get("locale");
-		assertThat(localeField, is(String.class));
+		assertThat(localeField, is(instanceOf(String.class)));
 		assertThat((String) localeField, is("en_US"));
 
 		LocaleWrapper read = converter.read(LocaleWrapper.class, dbObject);
@@ -458,13 +458,13 @@ public class MappingMongoConverterUnitTests {
 		DBObject dbo1 = new BasicDBObject();
 
 		converter.write(p1, dbo1);
-		assertThat(dbo1.get("_id"), is(String.class));
+		assertThat(dbo1.get("_id"), is(instanceOf(String.class)));
 
 		PersonPojoStringId p2 = new PersonPojoStringId(new ObjectId().toString(), "Text-1");
 		DBObject dbo2 = new BasicDBObject();
 
 		converter.write(p2, dbo2);
-		assertThat(dbo2.get("_id"), is(ObjectId.class));
+		assertThat(dbo2.get("_id"), is(instanceOf(ObjectId.class)));
 	}
 
 	/**
@@ -478,8 +478,8 @@ public class MappingMongoConverterUnitTests {
 
 		ClassWithSortedMap result = converter.read(ClassWithSortedMap.class, wrapper);
 
-		assertThat(result, is(ClassWithSortedMap.class));
+		assertThat(result, is(instanceOf(ClassWithSortedMap.class)));
-		assertThat(result.map, is(SortedMap.class));
+		assertThat(result.map, is(instanceOf(SortedMap.class)));
 	}
 
 	/**
@@ -745,7 +745,7 @@ public class MappingMongoConverterUnitTests {
 
 		assertThat(result.containsField("Foo"), is(true));
 		assertThat(result.get("Foo"), is(notNullValue()));
-		assertThat(result.get("Foo"), is(BasicDBList.class));
+		assertThat(result.get("Foo"), is(instanceOf(BasicDBList.class)));
 
 		BasicDBList list = (BasicDBList) result.get("Foo");
 
@@ -796,11 +796,11 @@ public class MappingMongoConverterUnitTests {
 		converter.write(wrapper, result);
 
 		Object mapObject = result.get("mapOfObjects");
-		assertThat(mapObject, is(BasicDBObject.class));
+		assertThat(mapObject, is(instanceOf(BasicDBObject.class)));
 
 		DBObject map = (DBObject) mapObject;
 		Object valueObject = map.get("foo");
-		assertThat(valueObject, is(BasicDBList.class));
+		assertThat(valueObject, is(instanceOf(BasicDBList.class)));
 
 		List<Object> list = (List<Object>) valueObject;
 		assertThat(list.size(), is(1));
@@ -891,7 +891,7 @@ public class MappingMongoConverterUnitTests {
 		converter.write(wrapper, result);
 
 		Object contacts = result.get("contacts");
-		assertThat(contacts, is(Collection.class));
+		assertThat(contacts, is(instanceOf(Collection.class)));
 		assertThat(((Collection<?>) contacts).size(), is(2));
 		assertThat(((Collection<Object>) contacts), hasItem(nullValue()));
 	}
@@ -954,7 +954,7 @@ public class MappingMongoConverterUnitTests {
 		Item read = converter.read(Item.class, result);
 		assertThat(read.attributes.size(), is(1));
 		assertThat(read.attributes.get(0).key, is(attribute.key));
-		assertThat(read.attributes.get(0).value, is(Collection.class));
+		assertThat(read.attributes.get(0).value, is(instanceOf(Collection.class)));
 
 		@SuppressWarnings("unchecked")
 		Collection<String> values = (Collection<String>) read.attributes.get(0).value;
@@ -1013,11 +1013,11 @@ public class MappingMongoConverterUnitTests {
 		address.street = "Foo";
 
 		Object result = converter.convertToMongoType(Collections.singleton(address));
-		assertThat(result, is(BasicDBList.class));
+		assertThat(result, is(instanceOf(BasicDBList.class)));
 
 		Set<?> readResult = converter.read(Set.class, (BasicDBList) result);
 		assertThat(readResult.size(), is(1));
-		assertThat(readResult.iterator().next(), is(Map.class));
+		assertThat(readResult.iterator().next(), is(instanceOf(Map.class)));
 	}
 
 	/**

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java

@@ -85,7 +85,7 @@ public class QueryMapperUnitTests {
 
 		DBObject query = new BasicDBObject("_id", new ObjectId().toString());
 		DBObject result = mapper.getMappedObject(query, null);
-		assertThat(result.get("_id"), is(ObjectId.class));
+		assertThat(result.get("_id"), is(instanceOf(ObjectId.class)));
 	}
 
 	@Test
@@ -115,9 +115,9 @@ public class QueryMapperUnitTests {
 
 		DBObject result = mapper.getMappedObject(criteria.getCriteriaObject(), context.getPersistentEntity(Sample.class));
 		Object object = result.get("_id");
-		assertThat(object, is(DBObject.class));
+		assertThat(object, is(instanceOf(DBObject.class)));
 		DBObject dbObject = (DBObject) object;
-		assertThat(dbObject.get("$ne"), is(ObjectId.class));
+		assertThat(dbObject.get("$ne"), is(instanceOf(ObjectId.class)));
 	}
 
 	/**
@@ -129,7 +129,7 @@ public class QueryMapperUnitTests {
 		DBObject result = mapper.getMappedObject(query.getQueryObject(), null);
 
 		Object object = result.get("foo");
-		assertThat(object, is(String.class));
+		assertThat(object, is(instanceOf(String.class)));
 	}
 
 	@Test
@@ -138,10 +138,10 @@ public class QueryMapperUnitTests {
 		DBObject result = mapper.getMappedObject(query.getQueryObject(), null);
 
 		Object object = result.get("foo");
-		assertThat(object, is(DBObject.class));
+		assertThat(object, is(instanceOf(DBObject.class)));
 
 		Object ne = ((DBObject) object).get("$ne");
-		assertThat(ne, is(String.class));
+		assertThat(ne, is(instanceOf(String.class)));
 		assertThat(ne.toString(), is(Enum.INSTANCE.name()));
 	}
 
@@ -152,14 +152,14 @@ public class QueryMapperUnitTests {
 		DBObject result = mapper.getMappedObject(query.getQueryObject(), null);
 
 		Object object = result.get("foo");
-		assertThat(object, is(DBObject.class));
+		assertThat(object, is(instanceOf(DBObject.class)));
 
 		Object in = ((DBObject) object).get("$in");
-		assertThat(in, is(BasicDBList.class));
+		assertThat(in, is(instanceOf(BasicDBList.class)));
 
 		BasicDBList list = (BasicDBList) in;
 		assertThat(list.size(), is(1));
-		assertThat(list.get(0), is(String.class));
+		assertThat(list.get(0), is(instanceOf(String.class)));
 		assertThat(list.get(0).toString(), is(Enum.INSTANCE.name()));
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Before;
@@ -77,12 +77,12 @@ public class SpringDataMongodbSerializerUnitTests {
 		address.zipCode = "01234";
 
 		DBObject result = serializer.asDBObject("foo", address);
-		assertThat(result, is(BasicDBObject.class));
+		assertThat(result, is(instanceOf(BasicDBObject.class)));
 		BasicDBObject dbObject = (BasicDBObject) result;
 
 		Object value = dbObject.get("foo");
 		assertThat(value, is(notNullValue()));
-		assertThat(value, is(BasicDBObject.class));
+		assertThat(value, is(instanceOf(BasicDBObject.class)));
 
 		Object reference = converter.convertToMongoType(address);
 		assertThat(value, is(reference));