Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
41395d08
Commit
41395d08
authored
May 02, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade flyway to 3.0
Fixes gh-771
parent
7e3614e6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
pom.xml
spring-boot-autoconfigure/pom.xml
+1
-1
FlywayAutoConfiguration.java
...rk/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+1
-2
FlywayAutoConfigurationTests.java
...ot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+1
-2
pom.xml
spring-boot-dependencies/pom.xml
+2
-2
pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
+3
-2
No files found.
spring-boot-autoconfigure/pom.xml
View file @
41395d08
...
...
@@ -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>
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View file @
41395d08
...
...
@@ -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.
*
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View file @
41395d08
...
...
@@ -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
;
/**
...
...
spring-boot-dependencies/pom.xml
View file @
41395d08
...
...
@@ -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>
...
...
spring-boot-samples/spring-boot-sample-flyway/pom.xml
View file @
41395d08
<?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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment