From 9c5e04b419cf6ee7003fe305331a618c818208a5 Mon Sep 17 00:00:00 2001
From: "Ealden Esto E. Escanan" <ealden@gmail.com>
Date: Sun, 18 Sep 2011 14:51:20 +0800
Subject: [PATCH 1/4] Explicitly set encoding to UTF-8 for Maven modules

It seems that it is not enough to set encoding on the root POM,
as Maven 3 complains that encoding is not set for the submodules.

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
---
 helloworld/pom.xml | 11 ++++++-----
 log4j/pom.xml      |  2 +-
 stocks/pom.xml     |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 7560936..178fa1d 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -18,6 +18,7 @@
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
 		<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
 		<profile>
@@ -39,7 +40,7 @@
   			<groupId>org.springframework.amqp</groupId>
   			<artifactId>spring-rabbit</artifactId>
   			<version>${spring.amqp.version}</version>
-		</dependency>	
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -70,15 +71,15 @@
 			<version>2.2</version>
 			<scope>runtime</scope>
 		</dependency>
-		
-		
+
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.8.1</version>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -102,7 +103,7 @@
 			<version>1.2.14</version>
 			<scope>runtime</scope>
 		</dependency>
-		
+
 	</dependencies>
 
 	<build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 5d10103..e48591d 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -18,6 +18,7 @@
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
 		<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
 		<profile>
@@ -208,4 +209,3 @@
 	</distributionManagement>
 
 </project>
-	
\ No newline at end of file
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 925e6d5..4423e1d 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -17,6 +17,7 @@
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
 		<spring.amqp.version>1.0.0.RELEASE</spring.amqp.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<profiles>
 		<profile>

From a5accdb862d0a869708365d422969415eb4a1034 Mon Sep 17 00:00:00 2001
From: "Ealden Esto E. Escanan" <ealden@gmail.com>
Date: Sun, 18 Sep 2011 14:53:37 +0800
Subject: [PATCH 2/4] Relocate AspectJ groupId to org.aspectj instead of
 aspectj

org.aspectj is the new groupId as per Maven 3.

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
---
 log4j/pom.xml  | 4 ++--
 stocks/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/log4j/pom.xml b/log4j/pom.xml
index e48591d..10d7098 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -94,12 +94,12 @@
 			<version>2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>aspectj</groupId>
+			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
 			<version>1.5.4</version>
 		</dependency>
 		<dependency>
-			<groupId>aspectj</groupId>
+			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.5.4</version>
 		</dependency>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 4423e1d..f0ece29 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -93,12 +93,12 @@
 			<version>2.2</version>
 		</dependency>
 		<dependency>
-			<groupId>aspectj</groupId>
+			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
 			<version>1.5.4</version>
 		</dependency>
 		<dependency>
-			<groupId>aspectj</groupId>
+			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.5.4</version>
 		</dependency>

From 2f1dd01bacfb19fddd130eb6d790e34311a4b94b Mon Sep 17 00:00:00 2001
From: "Ealden Esto E. Escanan" <ealden@gmail.com>
Date: Sun, 18 Sep 2011 14:55:36 +0800
Subject: [PATCH 3/4] Replaced deprecated pom.artifactId with
 project.artifactId

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
---
 helloworld/pom.xml | 2 +-
 log4j/pom.xml      | 2 +-
 stocks/pom.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 178fa1d..39eef12 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -163,7 +163,7 @@
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
 		<site>
 			<id>staging</id>
-			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url>
+			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
 		</site>
 		<repository>
 			<id>spring-release</id>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 10d7098..2e0ec8f 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -194,7 +194,7 @@
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
 		<site>
 			<id>staging</id>
-			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url>
+			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
 		</site>
 		<repository>
 			<id>spring-release</id>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index f0ece29..8e9b9ab 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -193,7 +193,7 @@
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
 		<site>
 			<id>staging</id>
-			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId}</url>
+			<url>file:///${user.dir}/target/staging/org.springframework.batch.archetype/${project.artifactId}</url>
 		</site>
 		<repository>
 			<id>spring-release</id>

From 033db3809ac550748a570f754b5db49e140f5716 Mon Sep 17 00:00:00 2001
From: "Ealden Esto E. Escanan" <ealden@gmail.com>
Date: Sun, 18 Sep 2011 15:16:03 +0800
Subject: [PATCH 4/4] Lock plugin versions to their latest version to remove
 warning from Maven

Signed-off-by: Ealden Esto E. Escanan <ealden@gmail.com>
---
 helloworld/pom.xml | 2 ++
 log4j/pom.xml      | 3 +++
 stocks/pom.xml     | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/helloworld/pom.xml b/helloworld/pom.xml
index 39eef12..46d8a41 100644
--- a/helloworld/pom.xml
+++ b/helloworld/pom.xml
@@ -129,6 +129,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -137,6 +138,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.9</version>
 				<configuration>
 					<!--forkMode>pertest</forkMode-->
 					<includes>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index 2e0ec8f..6eb405a 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -156,10 +156,12 @@
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.26</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -168,6 +170,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.9</version>
 				<configuration>
 					<!--forkMode>pertest</forkMode -->
 					<includes>
diff --git a/stocks/pom.xml b/stocks/pom.xml
index 8e9b9ab..3b7fcb5 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -155,10 +155,12 @@
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>maven-jetty-plugin</artifactId>
+				<version>6.1.26</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -167,6 +169,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.9</version>
 				<configuration>
 					<!--forkMode>pertest</forkMode -->
 					<includes>