flyway changes

+ flyway: 4.2.0 fix #914
+ flyway module shouldnt create a new datasource fix #913

Author: jknack

doc/doc/flyway/flyway.md

@@ -4,6 +4,8 @@ Evolve your Database Schema easily and reliably across all your instances.
 
 This module run {{flyway}} on startup and apply database migration.
 
+> NOTE: This module depends on [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module so all the services provided by the [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module.
+
 ## dependency
 
 ```xml
@@ -16,12 +18,6 @@ This module run {{flyway}} on startup and apply database migration.
 
 ## usage
 
-```properties
-flyway.url = ...
-flyway.user = ...
-flyway.password = ...
-```
-
 ```java
 {
   use(new Jdbc());
@@ -32,18 +28,13 @@ flyway.password = ...
 
 If for any reason you need to maintain two or more databases:
 
-```properties
-flyway.db1.url = "..."
-flyway.db1.locations = db1/migration
-
-flyway.db2.url = "..."
-flyway.db2.locations = db2/migration
-```
-
 ```java
 {
-  use(new Flywaydb("flyway.db1"));
-  use(new Flywaydb("flyway.db2"));
+  use(new Jdbc("db1"));
+  use(new Flywaydb("db1"));
+
+  use(new Jdbc("db2"));
+  use(new Flywaydb("db2"));
 }
 ```
 

doc/doc/jdbi3/jdbi3.md

@@ -2,7 +2,7 @@
 
 <a href="https://jdbi.github.io">Jdbi</a> provides a convenience interface for SQL operations in Java.
 
-This module depends on [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module so all the services provided by the [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module.
+> NOTE: This module depends on [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module so all the services provided by the [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module.
 
 ## dependency
 

modules/coverage-report/src/test/java/org/jooby/flyway/FlywayFeature.java

@@ -3,6 +3,7 @@
 import java.util.Arrays;
 
 import org.flywaydb.core.Flyway;
+import org.jooby.jdbc.Jdbc;
 import org.jooby.test.ServerFeature;
 import org.junit.Test;
 
@@ -13,12 +14,12 @@ public class FlywayFeature extends ServerFeature {
 
   {
     use(ConfigFactory.empty()
-        .withValue("flyway.url",
-            ConfigValueFactory.fromAnyRef("jdbc:h2:mem:1436458102203;DB_CLOSE_DELAY=-1"))
         .withValue("flyway.locations", ConfigValueFactory
             .fromAnyRef(Arrays.asList("org/jooby/flyway"))));
 
-    use(new Flywaydb());
+    use(new Jdbc("jdbc:h2:mem:foo;DB_CLOSE_DELAY=-1"));
+
+    use(new Flywaydb("foo"));
 
     get("/flyway/info", req -> req.require(Flyway.class).info().current().getDescription());
   }

modules/jooby-flyway/pom.xml

@@ -35,8 +35,7 @@
     <!-- Jooby -->
     <dependency>
       <groupId>org.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${project.version}</version>
+      <artifactId>jooby-jdbc</artifactId>
     </dependency>
 
     <!-- Flyway -->