diff --git a/pom.xml b/pom.xml
index 41d541836b..afb8d88d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
 		<dependency.security.javaconfig.version>1.0.0.CI-SNAPSHOT</dependency.security.javaconfig.version>
 		<dependency.spring.integration.version>2.2.3.RELEASE</dependency.spring.integration.version>
 		<dependency.spring.batch.version>2.2.0.RC1</dependency.spring.batch.version>
-		<main.basedir>${project.basedir}</main.basedir>
 	</properties>
 	<repositories>
 		<repository>
@@ -126,11 +125,11 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<url>http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.ui.prefs</url>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<url>http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.core.prefs</url>
 						</file>
 					</additionalConfig>
 				</configuration>
@@ -289,6 +288,11 @@
               <groupId>org.eclipse.jetty</groupId>
               <artifactId>jetty-jsp</artifactId>
               <version>8.1.9.v20130131</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>jetty-annotations</artifactId>
+              <version>8.1.9.v20130131</version>
             </dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
diff --git a/spring-bootstrap-applications/spring-bootstrap-application/pom.xml b/spring-bootstrap-applications/spring-bootstrap-application/pom.xml
index ded6613357..b174ceec57 100644
--- a/spring-bootstrap-applications/spring-bootstrap-application/pom.xml
+++ b/spring-bootstrap-applications/spring-bootstrap-application/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-application</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-applications/spring-bootstrap-batch-application/pom.xml b/spring-bootstrap-applications/spring-bootstrap-batch-application/pom.xml
index d928b43c37..e727ddd4a4 100644
--- a/spring-bootstrap-applications/spring-bootstrap-batch-application/pom.xml
+++ b/spring-bootstrap-applications/spring-bootstrap-batch-application/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-batch-application</artifactId>
 	<packaging>pom</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-applications/spring-bootstrap-integration-application/pom.xml b/spring-bootstrap-applications/spring-bootstrap-integration-application/pom.xml
index b1c3ed41e6..3dd7e4f845 100644
--- a/spring-bootstrap-applications/spring-bootstrap-integration-application/pom.xml
+++ b/spring-bootstrap-applications/spring-bootstrap-integration-application/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-integration-application</artifactId>
 	<packaging>pom</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-applications/spring-bootstrap-jpa-application/pom.xml b/spring-bootstrap-applications/spring-bootstrap-jpa-application/pom.xml
index 7d45568e47..a56eff4c1a 100644
--- a/spring-bootstrap-applications/spring-bootstrap-jpa-application/pom.xml
+++ b/spring-bootstrap-applications/spring-bootstrap-jpa-application/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-jpa-application</artifactId>
 	<packaging>pom</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-applications/spring-bootstrap-web-application/pom.xml b/spring-bootstrap-applications/spring-bootstrap-web-application/pom.xml
index 0d212d8a7f..b9ad9f5898 100644
--- a/spring-bootstrap-applications/spring-bootstrap-web-application/pom.xml
+++ b/spring-bootstrap-applications/spring-bootstrap-web-application/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-web-application</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-cli/dependency-reduced-pom.xml b/spring-bootstrap-cli/dependency-reduced-pom.xml
index 52d703aacb..92cbc1a857 100644
--- a/spring-bootstrap-cli/dependency-reduced-pom.xml
+++ b/spring-bootstrap-cli/dependency-reduced-pom.xml
@@ -120,7 +120,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <main.basedir>${project.basedir}/..</main.basedir>
     <start-class>org.springframework.bootstrap.cli.SpringBootstrapCli</start-class>
   </properties>
 </project>
diff --git a/spring-bootstrap-cli/pom.xml b/spring-bootstrap-cli/pom.xml
index cb502a93f0..3ef40f5e66 100644
--- a/spring-bootstrap-cli/pom.xml
+++ b/spring-bootstrap-cli/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-cli</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/..</main.basedir>
 		<start-class>org.springframework.bootstrap.cli.SpringBootstrapCli</start-class>
 	</properties>
 	<build>
diff --git a/spring-bootstrap-launcher/pom.xml b/spring-bootstrap-launcher/pom.xml
index 25650cd829..2342fb2543 100644
--- a/spring-bootstrap-launcher/pom.xml
+++ b/spring-bootstrap-launcher/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-launcher</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml
index 960280b581..946fc8968b 100644
--- a/spring-bootstrap-samples/pom.xml
+++ b/spring-bootstrap-samples/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-samples</artifactId>
 	<packaging>pom</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/..</main.basedir>
-	</properties>
 	<modules>
 		<module>spring-bootstrap-sample</module>
 		<module>spring-bootstrap-data-sample</module>
diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
index f95d95c4da..6af2f6764c 100644
--- a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-batch-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
index 63262b3e40..9d3d1b3ba9 100644
--- a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-data-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.data.DataBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml
index b77d23a207..1d196d6020 100644
--- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-integration-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.service.IntegrationBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
index ab1dccbb64..6aaa1f7703 100644
--- a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-jetty-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.jetty.JettyBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
index 651a33d254..1920c6ff6e 100644
--- a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-profile-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
index 2fb26a7b49..eb24b9ca05 100644
--- a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-sample</artifactId>
 	<packaging>pom</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml b/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml
index 84fbc0f02f..fc9516c2db 100644
--- a/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-service-sample/dependency-reduced-pom.xml
@@ -128,7 +128,6 @@
     </dependency>
   </dependencies>
   <properties>
-    <main.basedir>${project.basedir}/../..</main.basedir>
     <start-class>org.springframework.bootstrap.sample.service.ServiceBootstrapApplication</start-class>
   </properties>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml
index f728796133..5840df99c3 100644
--- a/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-service-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-service-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.service.ServiceBootstrapApplication</start-class>
 	</properties>
 	<profiles>
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
index 54a7daf35b..02969f349f 100644
--- a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
@@ -10,7 +10,6 @@
 	<artifactId>spring-bootstrap-simple-sample</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
 	</properties>
 	<dependencies>
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
index 50cccb7b72..41cf080fec 100644
--- a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
@@ -11,7 +11,6 @@
 	<packaging>jar</packaging>
 	<properties>
 		<start-class>org.springframework.bootstrap.sample.tomcat.TomcatBootstrapApplication</start-class>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml
index d2100cf255..338b5c2266 100644
--- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml
@@ -12,7 +12,6 @@
 
 	<properties>
 		<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-		<main.basedir>${project.basedir}/../..</main.basedir>
 	</properties>
 
 	<profiles>
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
index 0ed3bbbf2b..58302ac220 100644
--- a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-xml-sample</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/../..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-service/pom.xml b/spring-bootstrap-service/pom.xml
index 1efca15fc0..45bf00b006 100644
--- a/spring-bootstrap-service/pom.xml
+++ b/spring-bootstrap-service/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap-service</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap/pom.xml b/spring-bootstrap/pom.xml
index 6ce5ea4ebc..4d18fdfdbf 100644
--- a/spring-bootstrap/pom.xml
+++ b/spring-bootstrap/pom.xml
@@ -9,9 +9,6 @@
 	</parent>
 	<artifactId>spring-bootstrap</artifactId>
 	<packaging>jar</packaging>
-	<properties>
-		<main.basedir>${project.basedir}/..</main.basedir>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>