Upgrade jooq

billoneil · billoneil · commit 7006c16bbe02 · 2018-06-28T04:36:52.000-04:00
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -17,7 +17,7 @@ ext {
         aws               : '1.11.221',    // AWS Java SDK
         flyway            : '4.2.0',       // DB migrations
         connectorj        : '5.1.44',      // JDBC MYSQL driver
-        jooq              : '3.10.7',      // jOOQ
+        jooq              : '3.11.2',      // jOOQ
         hashids           : '1.0.3',       // Id hashing
         failsafe          : '1.0.4',       // retry and circuit breakers
         jsoup             : '1.10.3',      // DOM parsing library
diff --git a/stubbornjava-cms-server/src/main/java/com/stubbornjava/cms/server/CMSMigrations.java b/stubbornjava-cms-server/src/main/java/com/stubbornjava/cms/server/CMSMigrations.java
@@ -3,17 +3,17 @@
 import java.util.List;
 
 import org.flywaydb.core.Flyway;
+import org.jooq.codegen.GenerationTool;
 import org.jooq.lambda.Unchecked;
-import org.jooq.util.GenerationTool;
-import org.jooq.util.jaxb.Configuration;
-import org.jooq.util.jaxb.Database;
-import org.jooq.util.jaxb.ForcedType;
-import org.jooq.util.jaxb.Generate;
-import org.jooq.util.jaxb.Generator;
-import org.jooq.util.jaxb.Jdbc;
-import org.jooq.util.jaxb.Strategy;
-import org.jooq.util.jaxb.Target;
-import org.jooq.util.mysql.MySQLDatabase;
+import org.jooq.meta.jaxb.Configuration;
+import org.jooq.meta.jaxb.Database;
+import org.jooq.meta.jaxb.ForcedType;
+import org.jooq.meta.jaxb.Generate;
+import org.jooq.meta.jaxb.Generator;
+import org.jooq.meta.jaxb.Jdbc;
+import org.jooq.meta.jaxb.Strategy;
+import org.jooq.meta.jaxb.Target;
+import org.jooq.meta.mysql.MySQLDatabase;
 
 import com.mysql.jdbc.Driver;
 import com.stubbornjava.common.db.CustomGeneratorStrategy;
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/db/CustomGeneratorStrategy.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/db/CustomGeneratorStrategy.java
@@ -1,7 +1,7 @@
 package com.stubbornjava.common.db;
 
-import org.jooq.util.DefaultGeneratorStrategy;
-import org.jooq.util.Definition;
+import org.jooq.codegen.DefaultGeneratorStrategy;
+import org.jooq.meta.Definition;
 
 public class CustomGeneratorStrategy extends DefaultGeneratorStrategy {
 
diff --git a/stubbornjava-common/src/main/java/com/stubbornjava/common/db/JooqConfig.java b/stubbornjava-common/src/main/java/com/stubbornjava/common/db/JooqConfig.java
@@ -9,7 +9,7 @@
 import org.jooq.SQLDialect;
 import org.jooq.impl.DataSourceConnectionProvider;
 import org.jooq.impl.DefaultConfiguration;
-import org.jooq.util.jaxb.ForcedType;
+import org.jooq.meta.jaxb.ForcedType;
 
 import com.google.common.collect.Lists;
 
