Commit 41395d08 authored by Dave Syer's avatar Dave Syer

Upgrade flyway to 3.0

Fixes gh-771
parent 7e3614e6
......@@ -38,7 +38,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.googlecode.flyway</groupId>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<optional>true</optional>
</dependency>
......
......@@ -19,6 +19,7 @@ package org.springframework.boot.autoconfigure.flyway;
import javax.annotation.PostConstruct;
import javax.sql.DataSource;
import org.flywaydb.core.Flyway;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
......@@ -35,8 +36,6 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.util.Assert;
import com.googlecode.flyway.core.Flyway;
/**
* {@link EnableAutoConfiguration Auto-configuration} for Flyway database migrations.
*
......
......@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.flyway;
import java.util.Arrays;
import org.flywaydb.core.Flyway;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
......@@ -30,8 +31,6 @@ import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfigurati
import org.springframework.boot.test.EnvironmentTestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import com.googlecode.flyway.core.Flyway;
import static org.junit.Assert.assertEquals;
/**
......
......@@ -51,7 +51,7 @@
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-pool.version>1.6</commons-pool.version>
<crashub.version>1.3.0-beta14</crashub.version>
<flyway.version>2.2.1</flyway.version>
<flyway.version>3.0</flyway.version>
<freemarker.version>2.3.20</freemarker.version>
<gemfire.version>7.0.1</gemfire.version>
<gradle.version>1.6</gradle.version>
......@@ -148,7 +148,7 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.flyway</groupId>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>${flyway.version}</version>
</dependency>
......
<?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">
<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>
<!-- Your own application should inherit from spring-boot-starter-parent -->
......@@ -24,7 +25,7 @@
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>com.googlecode.flyway</groupId>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
</dependency>
<dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment