From 43564883c804c3b49c26fd68a5934f8bff56a155 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Sun, 7 Apr 2013 13:40:56 +0200
Subject: [PATCH 1/4] Updated plugin dependencies in booking-mvc example.

- Compiler plugin 2.3.2 -> 3.0
- Tomcat plugin 2.0-SNAPSHOT -> 2.1
- Surefire plugin 2.12 -> 2.14
---
 booking-mvc/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 3c17ea0..38eaef5 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -280,7 +280,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
+				<version>3.0</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -289,7 +289,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.12</version>
+				<version>2.14</version>
 				<configuration>
 					<junitArtifactName>junit:junit</junitArtifactName>
 					<includes>
@@ -300,7 +300,7 @@
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>2.0-SNAPSHOT</version>
+				<version>2.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

From d76d897fb6558d0222d7a1efaa90b56acb504427 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Sun, 7 Apr 2013 13:44:40 +0200
Subject: [PATCH 2/4] Upgraded dependency versions.

- Spring 3.2.1 -> 3.2.2
- Slf4j 1.6.1 -> 1.7.5
- Log4j 1.2.15 -> 1.2.16 (allows getting rid of exclusions)
- HSQLDB 1.8.0.10 -> 2.2.9
- Hibernate 3.5.0 -> 4.2.0
- JodaTime 1.6 -> 2.2
- JodaTime JPS Tags 1.0.2 -> 1.1.1
- Easymock 2.5.2 -> 3.1
- JUnit 3.8.2 -> 4.11
---
 booking-mvc/pom.xml | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 38eaef5..794ed22 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -9,10 +9,10 @@
   <version>1.0.0.BUILD-SNAPSHOT</version>
 
 	<properties>
-		<springframework-version>3.2.1.RELEASE</springframework-version>
+		<springframework-version>3.2.2.RELEASE</springframework-version>
 		<springsecurity-version>3.1.3.RELEASE</springsecurity-version>
 		<webflow-version>2.4.0.M1</webflow-version>
-		<slf4j-version>1.6.1</slf4j-version>
+		<slf4j-version>1.7.5</slf4j-version>
 		<thymeleaf-version>2.0.15</thymeleaf-version>
 		<thymeleaf-extras-tiles2-version>2.0.0</thymeleaf-extras-tiles2-version>
 		<thymeleaf-extras-springsecurity3-version>2.0.0</thymeleaf-extras-springsecurity3-version>
@@ -142,25 +142,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>1.2.16</version>
 			<scope>runtime</scope>
 		</dependency>
 		
@@ -168,13 +150,13 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.10</version>
+			<version>2.2.9</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.5.0-Final</version>
+			<version>4.2.0.Final</version>
 		</dependency>
 		
 		<!-- Servlet -->
@@ -244,12 +226,12 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>1.6</version>
+			<version>2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time-jsptags</artifactId>
-			<version>1.0.2</version>
+			<version>1.1.1</version>
 			<scope>runtime</scope>
 		</dependency>		
 
@@ -257,13 +239,13 @@
 		<dependency>
 			<groupId>org.easymock</groupId>
 			<artifactId>easymock</artifactId>
-			<version>2.5.2</version>
+			<version>3.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

From 5782d44467ec9db0045314f9cf3f5f0bc8374df0 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Sun, 7 Apr 2013 13:52:10 +0200
Subject: [PATCH 3/4] Added current Jetty plugin to enable mvn jetty:run.

---
 booking-mvc/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 794ed22..1178a3a 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -284,6 +284,11 @@
 				<artifactId>tomcat7-maven-plugin</artifactId>
 				<version>2.1</version>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>9.0.0.v20130308</version>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>

From 0495da665ca6a78e83466d4035ac5861627502f0 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Sun, 7 Apr 2013 14:01:35 +0200
Subject: [PATCH 4/4] Polished dependency declaration.

Explicitly declare spring-sop to avoid unnecessary exclusions. Excluded Commons Logging explicitly to make sure the Slf4j bridge kicks in.
---
 booking-mvc/pom.xml | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/booking-mvc/pom.xml b/booking-mvc/pom.xml
index 1178a3a..a323fea 100644
--- a/booking-mvc/pom.xml
+++ b/booking-mvc/pom.xml
@@ -62,6 +62,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 			<version>${springframework-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -78,48 +84,47 @@
 			<artifactId>spring-orm</artifactId>
 			<version>${springframework-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${springframework-version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
 			<artifactId>spring-webflow</artifactId>
 			<version>${webflow-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.webflow</groupId>
 			<artifactId>spring-js</artifactId>
 			<version>${webflow-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-web</artifactId>
 			<version>${springsecurity-version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				 </exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-taglibs</artifactId>
 			<version>${springsecurity-version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				 </exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
-			<version>${springsecurity-version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-aop</artifactId>
-				 </exclusion>
-			</exclusions>						
+			<version>${springsecurity-version}</version>					
         </dependency>	
 
 		<!-- Logging -->