diff --git a/jOOQ-checker/pom.xml b/jOOQ-checker/pom.xml index 72f9caac44..1c02d00b61 100644 --- a/jOOQ-checker/pom.xml +++ b/jOOQ-checker/pom.xml @@ -29,6 +29,22 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.checker + + + + + + + org.jooq @@ -41,5 +57,4 @@ 2.0.0 - \ No newline at end of file diff --git a/jOOQ-codegen-maven/pom.xml b/jOOQ-codegen-maven/pom.xml index c30ad4a058..a87a8a8fcd 100644 --- a/jOOQ-codegen-maven/pom.xml +++ b/jOOQ-codegen-maven/pom.xml @@ -39,7 +39,6 @@ org.apache.maven.plugins maven-plugin-plugin - 3.5 @@ -62,6 +61,18 @@ + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.codegen.maven + + + + diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 39993317c2..a29ea04881 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -29,6 +29,22 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.codegen + + + + + + + org.jooq diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java index 3eaf9ec9f4..b8f5c6146a 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java @@ -33,7 +33,7 @@ import org.jooq.impl.SchemaImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Public extends SchemaImpl { - private static final long serialVersionUID = 1858909872; + private static final long serialVersionUID = 763160494; /** * The reference instance of PUBLIC @@ -85,8 +85,6 @@ public class Public extends SchemaImpl { private final List> getSequences0() { return Arrays.>asList( - Sequences.SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD, - Sequences.SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824, Sequences.S_AUTHOR_ID, Sequences.S_BOOK_ID); } diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java index d7c9715cde..99e1a30107 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java @@ -23,16 +23,6 @@ import org.jooq.impl.SequenceImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Sequences { - /** - * The sequence PUBLIC.SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD - */ - public static final Sequence SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD = new SequenceImpl("SYSTEM_SEQUENCE_BAAE77DE_8E0A_4B04_8632_BA38E2536BFD", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); - - /** - * The sequence PUBLIC.SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824 - */ - public static final Sequence SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824 = new SequenceImpl("SYSTEM_SEQUENCE_C32829E3_148C_42AA_A816_FCC9E789E824", Public.PUBLIC, org.jooq.impl.SQLDataType.BIGINT); - /** * The sequence PUBLIC.S_AUTHOR_ID */ diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml index 814d33d95f..b18718dafb 100644 --- a/jOOQ-meta-extensions/pom.xml +++ b/jOOQ-meta-extensions/pom.xml @@ -28,6 +28,22 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.meta.extensions + + + + + + + org.jooq diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java index a95459a5e5..a14ae2d225 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/util/ddl/DDLDatabase.java @@ -40,11 +40,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Properties; import java.util.Scanner; import org.jooq.DSLContext; @@ -86,7 +86,10 @@ public class DDLDatabase extends H2Database { } try { - connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-extensions", "sa", ""); + Properties info = new Properties(); + info.put("user", "sa"); + info.put("password", ""); + connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info); InputStream in = null; try { diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java index a514b15449..4626c00952 100644 --- a/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java +++ b/jOOQ-meta-extensions/src/main/java/org/jooq/util/jpa/JPADatabase.java @@ -39,7 +39,6 @@ import static org.jooq.tools.StringUtils.isBlank; import java.lang.reflect.Method; import java.sql.Connection; -import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; @@ -47,6 +46,7 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; +import java.util.Properties; import javax.persistence.AttributeConverter; import javax.persistence.Entity; @@ -110,7 +110,10 @@ public class JPADatabase extends H2Database { boolean useAttributeConverters = Boolean.valueOf(getProperties().getProperty("use-attribute-converters", "true")); try { - connection = DriverManager.getConnection("jdbc:h2:mem:jooq-meta-extensions", "sa", ""); + Properties info = new Properties(); + info.put("user", "sa"); + info.put("password", ""); + connection = new org.h2.Driver().connect("jdbc:h2:mem:jooq-meta-extensions", info); MetadataSources metadata = new MetadataSources( new StandardServiceRegistryBuilder() diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index cce73c81b3..3ec52110f3 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -28,6 +28,22 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.meta + + + + + + + org.jooq diff --git a/jOOQ-scala_2.11/pom.xml b/jOOQ-scala_2.11/pom.xml index 705e5d37c7..6aa6aec522 100644 --- a/jOOQ-scala_2.11/pom.xml +++ b/jOOQ-scala_2.11/pom.xml @@ -16,7 +16,6 @@ 2.11.11 - 1.4.195 @@ -125,7 +124,6 @@ - @@ -134,7 +132,6 @@ org.scala-tools maven-scala-plugin - 2.15.2 @@ -149,7 +146,6 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 empty-javadoc-jar @@ -160,6 +156,11 @@ javadoc ${basedir}/javadoc + + + org.jooq.scala_2_11 + + @@ -203,12 +204,6 @@ - - - - - - diff --git a/jOOQ-scala_2.12/pom.xml b/jOOQ-scala_2.12/pom.xml index 2d660001e1..26d744589e 100644 --- a/jOOQ-scala_2.12/pom.xml +++ b/jOOQ-scala_2.12/pom.xml @@ -16,7 +16,6 @@ 2.12.3 - 1.4.195 @@ -125,7 +124,6 @@ - @@ -134,7 +132,6 @@ org.scala-tools maven-scala-plugin - 2.15.2 @@ -149,7 +146,6 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 empty-javadoc-jar @@ -160,6 +156,11 @@ javadoc ${basedir}/javadoc + + + org.jooq.scala_2_11 + + @@ -203,12 +204,6 @@ - - - - - - diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 60d883e849..825617083e 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -34,7 +34,6 @@ org.apache.felix maven-bundle-plugin - 2.5.4 true @@ -65,11 +64,12 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + org.jooq + diff --git a/pom.xml b/pom.xml index 4f43d61bfa..d8b407d0fd 100644 --- a/pom.xml +++ b/pom.xml @@ -94,16 +94,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.h2database + h2 + 1.4.196 + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + + + org.apache.felix + maven-bundle-plugin + 3.3.0 + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5 + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + org.scala-tools + maven-scala-plugin + 2.15.2 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + + Data Geekery GmbH + + + + + + org.apache.maven.plugins maven-compiler-plugin - 3.7.0 @@ -132,12 +212,6 @@ UTF-8 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 -