Updated spring and other libary projects

Author: jamesmorgan

README.md

@@ -91,15 +91,15 @@ A set of integration and unit tests can be found in _src/test/java_ (tests) & _s
 
 #### Core ####
 * Java 7 SDK
-* Spring (3.1.2-RELEASE)
-* Google Guava  (12.0)
+* Spring (3.2.5-RELEASE)
+* Google Guava  (14.0.1)
 
 #### Logging ####
-* logback (1.0.6)
-* slf4j (1.6.4)
+* logback (1.0.13)
+* slf4j (1.7.5)
 
 #### Testing ####
-* juint (4.10)
-* jmock (2.6.0-RC2)
+* juint (4.11)
+* jmock (2.6.0)
 * hamcrest-all (1.3)
-* spring-test (3.1.2-RELEASE)
+* spring-test (3.2.5-RELEASE)

pom.xml

@@ -6,35 +6,36 @@
 	<version>0.0.2-SNAPSHOT</version>
 
 	<properties>
-		<spring.version>3.1.2.RELEASE</spring.version>
+		<spring.version>3.2.5.RELEASE</spring.version>
+		<logback.version>1.0.13</logback.version>
 	</properties>
 
 	<dependencies>
 
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>12.0</version>
+			<version>14.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.1</version>
+			<version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.6.4</version>
+			<version>1.7.5</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.0.6</version>
+			<version>${logback.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.0.6</version>
+			<version>${logback.version}</version>
 		</dependency>
 
 		<!-- Spring Stuff -->
@@ -54,7 +55,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
-			<version>4.10</version>
+			<version>4.11</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
@@ -65,19 +66,19 @@
 		<dependency>
 			<groupId>org.jmock</groupId>
 			<artifactId>jmock</artifactId>
-			<version>2.6.0-RC2</version>
+			<version>2.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jmock</groupId>
 			<artifactId>jmock-legacy</artifactId>
-			<version>2.6.0-RC2</version>
+			<version>2.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jmock</groupId>
 			<artifactId>jmock-junit4</artifactId>
-			<version>2.6.0-RC2</version>
+			<version>2.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

src/test/java/com/morgan/design/properties/event/GuavaPropertyChangedEventNotifierUnitTest.java

@@ -2,21 +2,23 @@
 
 import org.jmock.Expectations;
 import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import com.google.common.eventbus.EventBus;
 import com.morgan.design.properties.bean.PropertyModifiedEvent;
 import com.morgan.design.properties.internal.ReloadablePropertyPostProcessor;
 
-@RunWith(JMock.class)
 @SuppressWarnings("unqualified-field-access")
 public class GuavaPropertyChangedEventNotifierUnitTest {
 
+	@Rule
+	public JUnitRuleMockery ruleMockery = new JUnitRuleMockery();
+	
 	Mockery context = new JUnit4Mockery() {
 		{
 			setImposteriser(ClassImposteriser.INSTANCE);

src/test/java/com/morgan/design/properties/internal/PropertiesWatcherUnitTest.java

@@ -1,7 +1,7 @@
 package com.morgan.design.properties.internal;
 
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;