diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
index 8d7fa803ec3..41177c04db9 100644
--- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml
@@ -24,8 +24,8 @@
spring-boot-starter
- org.springframework.boot
- spring-boot-starter-flyway
+ com.googlecode.flyway
+ flyway-core
org.hsqldb
diff --git a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
index 9bfe000ae06..0857f90fb12 100644
--- a/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-liquibase/pom.xml
@@ -24,8 +24,8 @@
spring-boot-starter
- org.springframework.boot
- spring-boot-starter-liquibase
+ org.liquibase
+ liquibase-core
org.hsqldb
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index a746bc6f721..5db4ec71f42 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -29,12 +29,10 @@
spring-boot-starter-data-mongodb
spring-boot-starter-data-neo4j
spring-boot-starter-data-rest
- spring-boot-starter-flyway
spring-boot-starter-freemarker
spring-boot-starter-integration
spring-boot-starter-jdbc
spring-boot-starter-jetty
- spring-boot-starter-liquibase
spring-boot-starter-logging
spring-boot-starter-log4j
spring-boot-starter-mobile
diff --git a/spring-boot-starters/spring-boot-starter-flyway/pom.xml b/spring-boot-starters/spring-boot-starter-flyway/pom.xml
deleted file mode 100644
index 3594fdfe5e4..00000000000
--- a/spring-boot-starters/spring-boot-starter-flyway/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.boot
- spring-boot-starters
- 1.1.0.BUILD-SNAPSHOT
-
- spring-boot-starter-flyway
- Spring Boot Flyway Starter
- Spring Boot Flyway Starter
- http://projects.spring.io/spring-boot/
-
- Pivotal Software, Inc.
- http://www.spring.io
-
-
- ${basedir}/../..
-
-
-
- ${project.groupId}
- spring-boot-starter-jdbc
- ${project.version}
-
-
- com.googlecode.flyway
- flyway-core
-
-
-
diff --git a/spring-boot-starters/spring-boot-starter-flyway/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-flyway/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index cec4231369a..00000000000
--- a/spring-boot-starters/spring-boot-starter-flyway/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: liquibase-core
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-liquibase/pom.xml b/spring-boot-starters/spring-boot-starter-liquibase/pom.xml
deleted file mode 100644
index d3eee22e2af..00000000000
--- a/spring-boot-starters/spring-boot-starter-liquibase/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.boot
- spring-boot-starters
- 1.1.0.BUILD-SNAPSHOT
-
- spring-boot-starter-liquibase
- Spring Boot Liquibase Starter
- Spring Boot Liquibase Starter
- http://projects.spring.io/spring-boot/
-
- Pivotal Software, Inc.
- http://www.spring.io
-
-
- ${basedir}/../..
-
-
-
- ${project.groupId}
- spring-boot-starter-jdbc
- ${project.version}
-
-
- org.liquibase
- liquibase-core
-
-
-
diff --git a/spring-boot-starters/spring-boot-starter-liquibase/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-liquibase/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index cec4231369a..00000000000
--- a/spring-boot-starters/spring-boot-starter-liquibase/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: liquibase-core
\ No newline at end of file
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 413456ed625..a18cfc637a8 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -101,11 +101,6 @@
spring-boot-starter-data-rest
${spring-boot.version}
-
- org.springframework.boot
- spring-boot-starter-flyway
- ${spring-boot.version}
-
org.springframework.boot
spring-boot-starter-freemarker
@@ -126,11 +121,6 @@
spring-boot-starter-jetty
${spring-boot.version}
-
- org.springframework.boot
- spring-boot-starter-liquibase
- ${spring-boot.version}
-
org.springframework.boot
spring-boot-starter-logging