From ded6a707db521a85daa7498051a3d5a7da81c8cb Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 2 May 2014 13:09:29 +0100
Subject: [PATCH] Drop starters for flyway and liquibase

They only add a single extra dependency, so not really
much value.

Fixes gh-770
---
 .../spring-boot-sample-flyway/pom.xml         |  4 +--
 .../spring-boot-sample-liquibase/pom.xml      |  4 +--
 spring-boot-starters/pom.xml                  |  2 --
 .../spring-boot-starter-flyway/pom.xml        | 31 -------------------
 .../main/resources/META-INF/spring.provides   |  1 -
 .../spring-boot-starter-liquibase/pom.xml     | 31 -------------------
 .../main/resources/META-INF/spring.provides   |  1 -
 .../spring-boot-starter-parent/pom.xml        | 10 ------
 8 files changed, 4 insertions(+), 80 deletions(-)
 delete mode 100644 spring-boot-starters/spring-boot-starter-flyway/pom.xml
 delete mode 100644 spring-boot-starters/spring-boot-starter-flyway/src/main/resources/META-INF/spring.provides
 delete mode 100644 spring-boot-starters/spring-boot-starter-liquibase/pom.xml
 delete mode 100644 spring-boot-starters/spring-boot-starter-liquibase/src/main/resources/META-INF/spring.provides

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 @@
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-flyway</artifactId>
+			<groupId>com.googlecode.flyway</groupId>
+			<artifactId>flyway-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
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 @@
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-liquibase</artifactId>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
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 @@
 		<module>spring-boot-starter-data-mongodb</module>
 		<module>spring-boot-starter-data-neo4j</module>
 		<module>spring-boot-starter-data-rest</module>
-		<module>spring-boot-starter-flyway</module>
 		<module>spring-boot-starter-freemarker</module>
 		<module>spring-boot-starter-integration</module>
 		<module>spring-boot-starter-jdbc</module>
 		<module>spring-boot-starter-jetty</module>
-		<module>spring-boot-starter-liquibase</module>
 		<module>spring-boot-starter-logging</module>
 		<module>spring-boot-starter-log4j</module>
 		<module>spring-boot-starter-mobile</module>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starters</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-boot-starter-flyway</artifactId>
-	<name>Spring Boot Flyway Starter</name>
-	<description>Spring Boot Flyway Starter</description>
-	<url>http://projects.spring.io/spring-boot/</url>
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>http://www.spring.io</url>
-	</organization>
-	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-starter-jdbc</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.googlecode.flyway</groupId>
-			<artifactId>flyway-core</artifactId>
-		</dependency>
-	</dependencies>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starters</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-boot-starter-liquibase</artifactId>
-	<name>Spring Boot Liquibase Starter</name>
-	<description>Spring Boot Liquibase Starter</description>
-	<url>http://projects.spring.io/spring-boot/</url>
-	<organization>
-		<name>Pivotal Software, Inc.</name>
-		<url>http://www.spring.io</url>
-	</organization>
-	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-starter-jdbc</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.liquibase</groupId>
-			<artifactId>liquibase-core</artifactId>
-		</dependency>
-	</dependencies>
-</project>
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 @@
 				<artifactId>spring-boot-starter-data-rest</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-flyway</artifactId>
-				<version>${spring-boot.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-freemarker</artifactId>
@@ -126,11 +121,6 @@
 				<artifactId>spring-boot-starter-jetty</artifactId>
 				<version>${spring-boot.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-liquibase</artifactId>
-				<version>${spring-boot.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-logging</artifactId>