diff --git a/.travis.yml b/.travis.yml
index 8e5ceb8fc3..68c8f66165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,6 @@ after_failure:
 env:
  global:
    - "ARTIFACTS_AWS_REGION=us-east-1"
-   - "ARTIFACTS_S3_BUCKET=drogus-artifacts"
+   - "ARTIFACTS_S3_BUCKET=temp.springsource.com/spring-boot"
    - secure: "JCQ1uz/rfrtMiUAvxeMznVB2wTX/f7lrCBa6oOsskDPt1dMzxD4aEuOfq3QlROLPDhYyu3dnWh1+ABla3Dx4+dCVA9ASgFCq5ivO5Vkxr4c6g8tb7hp14EitGEnWfEpdn64K6mZ7e7a/yjaXU3Ry4AisvPSk7wCcbHisBbj1LzE="
    - secure: "Dcya9JSXSa9qXDBXUihYxfCBL8VKCoIj5SQARMshYGLrs1zN2C4EcO4lcMkePTHWrGjpSqNdgnChUeg9YphWqODCcy2XhaMlSxwBYBDTye3hLGwKNdMKnrl/4yE+GoBg6Zaj9bB46Ua/GwLgZpOgM/b/VuCqnp6JC+hYOZKBhdg="
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7f31e22ce8..7a5cbcea67 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -282,6 +282,12 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-webmvc</artifactId>
 				<version>${spring.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.batch</groupId>
diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
index f4fe91df0e..334fc3487a 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -17,26 +17,21 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
-			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 9731428170..4496c87848 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -46,7 +46,7 @@
 							</delimiters>
 							<resources>
 								<resource>
-									<directory>src/main/parent</directory>
+									<directory>${basedir}/spring-boot-starter-parent/src/main/maven</directory>
 									<filtering>true</filtering>
 								</resource>
 							</resources>
diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/src/main/maven/pom.xml
similarity index 100%
rename from spring-boot-starters/src/main/parent/pom.xml
rename to spring-boot-starters/spring-boot-starter-parent/src/main/maven/pom.xml