Renamed spring-boot-ups -> spring-boot-starter

pom.xml

@@ -45,7 +45,7 @@
 		<module>spring-boot-maven-plugin</module>
 		<module>spring-boot-gradle-plugin</module>
 		<module>spring-boot-ops</module>
-		<module>spring-boot-ups</module>
+		<module>spring-boot-starters</module>
 		<module>spring-boot-cli</module>
 		<module>spring-boot-integration-tests</module>
 	</modules>

spring-boot-cli/samples/ops.groovy

@@ -1,6 +1,6 @@
 package org.test
 
-@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-ops:0.5.0.BUILD-SNAPSHOT")
 
 @Controller
 class SampleController {

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java

@@ -39,7 +39,7 @@ public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfigurati
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies) {
 		dependencies.ifAnyMissingClasses("org.springframework.boot.SpringApplication")
-				.add("org.springframework.boot", "spring-boot-up",
+				.add("org.springframework.boot", "spring-boot-starter",
 						dependencies.getProperty("spring.boot.version"));
 	}
 

spring-boot-integration-tests/pom.xml

@@ -46,58 +46,58 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-batch</artifactId>
+			<artifactId>spring-boot-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-data-jpa</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-integration</artifactId>
+			<artifactId>spring-boot-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-jetty</artifactId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-logging</artifactId>
+			<artifactId>spring-boot-starter-logging</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-parent</artifactId>
+			<artifactId>spring-boot-starter-parent</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-security</artifactId>
+			<artifactId>spring-boot-starter-security</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-loader-tools/src/test/resources/META-INF/maven/org.springframework.boot/spring-boot-sample-tomcat/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-batch/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-batch</artifactId>
+			<artifactId>spring-boot-starter-batch</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-samples/spring-boot-sample-data-jpa/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-data-jpa</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-integration/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-up-integration</artifactId>
+			<artifactId>spring-boot-starter-integration</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-samples/spring-boot-sample-jetty/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-jetty</artifactId>
+			<artifactId>spring-boot-starter-jetty</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-ops-ui/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-ops/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-ops</artifactId>
+			<artifactId>spring-boot-starter-ops</artifactId>
 			<version>${project.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-up-logging</artifactId>
+					<artifactId>spring-boot-starter-logging</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>

spring-boot-samples/spring-boot-sample-ops/start.groovy

@@ -1,5 +1,5 @@
-@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
-@Grab("org.springframework.boot:spring-boot-up-web:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-ops:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-starter-web:0.5.0.BUILD-SNAPSHOT")
 @ComponentScan("org.springframework.boot.sample.service")
 class Start {
 }

spring-boot-samples/spring-boot-sample-profile/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-simple/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-samples/spring-boot-sample-tomcat/build.gradle

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-	compile("org.springframework.boot:spring-boot-up-web:0.5.0.BUILD-SNAPSHOT")
+	compile("org.springframework.boot:spring-boot-starter-web:0.5.0.BUILD-SNAPSHOT")
 	testCompile("junit:junit:4.11")
 }
 

spring-boot-samples/spring-boot-sample-tomcat/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-traditional/build.gradle

@@ -17,9 +17,9 @@ repositories {
 }
 
 dependencies {
-	compile("org.springframework.boot:spring-boot-up:0.5.0.BUILD-SNAPSHOT")
+	compile("org.springframework.boot:spring-boot-starter:0.5.0.BUILD-SNAPSHOT")
 	compile("org.springframework:spring-webmvc:4.0.0.BUILD-SNAPSHOT")
-	providedRuntime("org.springframework.boot:spring-boot-up-tomcat:0.5.0.BUILD-SNAPSHOT")
+	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat:0.5.0.BUILD-SNAPSHOT")
 	providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper:7.0.42")
 	testCompile("junit:junit:4.11")
 }

spring-boot-samples/spring-boot-sample-traditional/pom.xml

@@ -16,7 +16,7 @@
 		<!-- Compile -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -26,7 +26,7 @@
 		<!-- Provided (for embedded war support) -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-web-static/pom.xml

@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>

spring-boot-samples/spring-boot-sample-web-ui/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-web</artifactId>
+			<artifactId>spring-boot-starter-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-samples/spring-boot-sample-xml/pom.xml

@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-starters/pom.xml

@@ -7,23 +7,23 @@
 		<artifactId>spring-boot-parent</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-ups</artifactId>
+	<artifactId>spring-boot-starters</artifactId>
 	<packaging>pom</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
-		<module>spring-boot-up</module>
-		<module>spring-boot-up-batch</module>
-		<module>spring-boot-up-data-jpa</module>
-		<module>spring-boot-up-integration</module>
-		<module>spring-boot-up-jetty</module>
-		<module>spring-boot-up-logging</module>
-		<module>spring-boot-up-ops</module>
-		<module>spring-boot-up-parent</module>
-		<module>spring-boot-up-security</module>
-		<module>spring-boot-up-tomcat</module>
-		<module>spring-boot-up-web</module>
+		<module>spring-boot-starter</module>
+		<module>spring-boot-starter-batch</module>
+		<module>spring-boot-starter-data-jpa</module>
+		<module>spring-boot-starter-integration</module>
+		<module>spring-boot-starter-jetty</module>
+		<module>spring-boot-starter-logging</module>
+		<module>spring-boot-starter-ops</module>
+		<module>spring-boot-starter-parent</module>
+		<module>spring-boot-starter-security</module>
+		<module>spring-boot-starter-tomcat</module>
+		<module>spring-boot-starter-web</module>
 	</modules>
 	<build>
 		<plugins>
@@ -48,7 +48,7 @@
 									<filtering>true</filtering>
 								</resource>
 							</resources>
-							<outputDirectory>${basedir}/spring-boot-up-parent</outputDirectory>
+							<outputDirectory>${basedir}/spring-boot-starter-parent</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>

spring-boot-starters/spring-boot-starter-batch/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-batch</artifactId>
+	<artifactId>spring-boot-starter-batch</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter-data-jpa/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-data-jpa</artifactId>
+	<artifactId>spring-boot-starter-data-jpa</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter-integration/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-integration</artifactId>
+	<artifactId>spring-boot-starter-integration</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter-jetty/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-jetty</artifactId>
+	<artifactId>spring-boot-starter-jetty</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>

spring-boot-starters/spring-boot-starter-logging/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-logging</artifactId>
+	<artifactId>spring-boot-starter-logging</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>

spring-boot-starters/spring-boot-starter-ops/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-ops</artifactId>
+	<artifactId>spring-boot-starter-ops</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter-parent/pom.xml

@@ -6,7 +6,7 @@ This POM file that can be used as a parent for your own builds. It provides gene
 useful dependencies and plugins.
 
 NOTE: If you are editing a local checkout of this file, be sure to modify
-'spring-boot-ups/src/main/parent/pom.xml'.
+'spring-boot-starters/src/main/parent/pom.xml'.
 
 -->
 
@@ -18,7 +18,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot-up-parent</artifactId>
+	<artifactId>spring-boot-starter-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
@@ -56,47 +56,47 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up</artifactId>
+				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-ops</artifactId>
+				<artifactId>spring-boot-starter-ops</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-web</artifactId>
+				<artifactId>spring-boot-starter-web</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-tomcat</artifactId>
+				<artifactId>spring-boot-starter-tomcat</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-jetty</artifactId>
+				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-data-jpa</artifactId>
+				<artifactId>spring-boot-starter-data-jpa</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-batch</artifactId>
+				<artifactId>spring-boot-starter-batch</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-integration</artifactId>
+				<artifactId>spring-boot-starter-integration</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-security</artifactId>
+				<artifactId>spring-boot-starter-security</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 		</dependencies>

spring-boot-starters/spring-boot-starter-security/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-security</artifactId>
+	<artifactId>spring-boot-starter-security</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,7 +15,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter-tomcat/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-tomcat</artifactId>
+	<artifactId>spring-boot-starter-tomcat</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>

spring-boot-starters/spring-boot-starter-web/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up-web</artifactId>
+	<artifactId>spring-boot-starter-web</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -15,12 +15,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up</artifactId>
+			<artifactId>spring-boot-starter</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-tomcat</artifactId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

spring-boot-starters/spring-boot-starter/pom.xml

@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-ups</artifactId>
+		<artifactId>spring-boot-starters</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-up</artifactId>
+	<artifactId>spring-boot-starter</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
@@ -25,7 +25,7 @@
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-up-logging</artifactId>
+			<artifactId>spring-boot-starter-logging</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

spring-boot-starters/src/main/parent/pom.xml

@@ -6,7 +6,7 @@ This POM file that can be used as a parent for your own builds. It provides gene
 useful dependencies and plugins.
 
 NOTE: If you are editing a local checkout of this file, be sure to modify
-'spring-boot-ups/src/main/parent/pom.xml'.
+'spring-boot-starters/src/main/parent/pom.xml'.
 
 -->
 
@@ -18,7 +18,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 
 	<!-- Intentionally do not inherit from boot-parent -->
 	<groupId>org.springframework.boot</groupId>
-	<artifactId>spring-boot-up-parent</artifactId>
+	<artifactId>spring-boot-starter-parent</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
@@ -56,47 +56,47 @@ NOTE: If you are editing a local checkout of this file, be sure to modify
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up</artifactId>
+				<artifactId>spring-boot-starter</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-ops</artifactId>
+				<artifactId>spring-boot-starter-ops</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-web</artifactId>
+				<artifactId>spring-boot-starter-web</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-tomcat</artifactId>
+				<artifactId>spring-boot-starter-tomcat</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-jetty</artifactId>
+				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-data-jpa</artifactId>
+				<artifactId>spring-boot-starter-data-jpa</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-batch</artifactId>
+				<artifactId>spring-boot-starter-batch</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-integration</artifactId>
+				<artifactId>spring-boot-starter-integration</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-up-security</artifactId>
+				<artifactId>spring-boot-starter-security</artifactId>
 				<version>${spring.boot.version}</version>
 			</dependency>
 		</dependencies>