diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java index fecf737d4f..10da311b81 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java @@ -980,10 +980,24 @@ public class GenerationTool { + "See https://github.com/jOOQ/jOOQ/issues/7419 for details"); } + else if (className.equals("org.jooq.meta.extensions.liquibase.LiquibaseDatabase")) { + log.warn("Type not found", message = + "Your configured database type was not found: " + className + ".\n" + + "- Please make sure the jooq-meta-extensions-liquibase dependency is on your classpath.\n" + + "- In jOOQ 3.14, the dependency name has changed, see https://github.com/jOOQ/jOOQ/issues/10331"); + } + + else if (className.equals("org.jooq.meta.extensions.jpa.JPADatabase")) { + log.warn("Type not found", message = + "Your configured database type was not found: " + className + ".\n" + + "- Please make sure the jooq-meta-extensions-hibernate dependency is on your classpath.\n" + + "- In jOOQ 3.14, the dependency name has changed, see https://github.com/jOOQ/jOOQ/issues/10331"); + } + // [#2801] [#4620] else if (className.startsWith("org.jooq.meta.") && className.endsWith("Database")) { log.warn("Type not found", message = - "Your configured database type was not found. This can have several reasons:\n" + "Your configured database type was not found: " + className + ". This can have several reasons:\n" + "- You want to use a commercial jOOQ Edition, but you pulled the Open Source Edition from Maven Central.\n" + "- You have mis-typed your class name."); } diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml b/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml index 3a3184a22e..7c80984e08 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/pom.xml @@ -30,6 +30,10 @@ org.jooq jooq + + org.jooq + jooq-meta-extensions + com.h2database h2 @@ -90,14 +94,6 @@ - - - - org.jooq - jooq-meta-extensions - ${project.version} - - diff --git a/jOOQ-examples/jOOQ-jpa-example/pom.xml b/jOOQ-examples/jOOQ-jpa-example/pom.xml index 6da9853d55..7347f2018d 100644 --- a/jOOQ-examples/jOOQ-jpa-example/pom.xml +++ b/jOOQ-examples/jOOQ-jpa-example/pom.xml @@ -39,9 +39,9 @@ ${project.version} - javax.persistence - javax.persistence-api - 2.2 + org.jooq + jooq-meta-extensions-hibernate + ${project.version} org.hibernate @@ -152,20 +152,6 @@ - - - - - org.jooq - jooq-meta-extensions - ${project.version} - - - javax.persistence - javax.persistence-api - 2.2 - - diff --git a/jOOQ-meta-extensions-hibernate/.gitignore b/jOOQ-meta-extensions-hibernate/.gitignore new file mode 100644 index 0000000000..4b664f2ce0 --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/.gitignore @@ -0,0 +1,3 @@ +/target +/.idea +/*.iml diff --git a/jOOQ-meta-extensions-hibernate/LICENSE.txt b/jOOQ-meta-extensions-hibernate/LICENSE.txt new file mode 100644 index 0000000000..d090694f44 --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/LICENSE.txt @@ -0,0 +1,19 @@ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Other licenses: +----------------------------------------------------------------------------- +Commercial licenses for this work are available. These replace the above +ASL 2.0 and offer limited warranties, support, maintenance, and commercial +database integrations. + +For more information, please visit: http://www.jooq.org/licenses \ No newline at end of file diff --git a/jOOQ-meta-extensions-hibernate/NOTICE.txt b/jOOQ-meta-extensions-hibernate/NOTICE.txt new file mode 100644 index 0000000000..698edf47ee --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/NOTICE.txt @@ -0,0 +1,10 @@ +Third party NOTICE.txt contents +=============================== + +Contents of https://github.com/apache/commons-lang/blob/master/NOTICE.txt +------------------------------------------------------------------------- +Apache Commons Lang +Copyright 2001-2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/jOOQ-meta-extensions-hibernate/pom.xml b/jOOQ-meta-extensions-hibernate/pom.xml new file mode 100644 index 0000000000..68202844aa --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + + org.jooq + jooq-parent + 3.14.0-SNAPSHOT + + + jooq-meta-extensions-hibernate + jOOQ Meta Extensions Hibernate + + + + Apache License, Version 2.0 + http://www.jooq.org/inc/LICENSE.txt + repo + + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.meta.extensions.hibernate + + + + + + + + + + org.jooq + jooq-meta-extensions + + + javax.persistence + javax.persistence-api + + + org.hibernate + hibernate-core + + + org.springframework + spring-context + + + + + + + + + + + + diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java b/jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java similarity index 100% rename from jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java rename to jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/AttributeConverterExtractor.java diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/JPADatabase.java b/jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/JPADatabase.java similarity index 100% rename from jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/JPADatabase.java rename to jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/JPADatabase.java diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/PersistenceUnitInfoImpl.java b/jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/PersistenceUnitInfoImpl.java similarity index 100% rename from jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/jpa/PersistenceUnitInfoImpl.java rename to jOOQ-meta-extensions-hibernate/src/main/java/org/jooq/meta/extensions/jpa/PersistenceUnitInfoImpl.java diff --git a/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/LICENSE.txt b/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000000..d090694f44 --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,19 @@ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Other licenses: +----------------------------------------------------------------------------- +Commercial licenses for this work are available. These replace the above +ASL 2.0 and offer limited warranties, support, maintenance, and commercial +database integrations. + +For more information, please visit: http://www.jooq.org/licenses \ No newline at end of file diff --git a/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/README.txt b/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/README.txt new file mode 100644 index 0000000000..3e6e227e05 --- /dev/null +++ b/jOOQ-meta-extensions-hibernate/src/main/resources/META-INF/README.txt @@ -0,0 +1,2 @@ +Thanks for downloading jOOQ. +Please visit http://www.jooq.org for more information. \ No newline at end of file diff --git a/jOOQ-meta-extensions-liquibase/.gitignore b/jOOQ-meta-extensions-liquibase/.gitignore new file mode 100644 index 0000000000..4b664f2ce0 --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/.gitignore @@ -0,0 +1,3 @@ +/target +/.idea +/*.iml diff --git a/jOOQ-meta-extensions-liquibase/LICENSE.txt b/jOOQ-meta-extensions-liquibase/LICENSE.txt new file mode 100644 index 0000000000..d090694f44 --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/LICENSE.txt @@ -0,0 +1,19 @@ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Other licenses: +----------------------------------------------------------------------------- +Commercial licenses for this work are available. These replace the above +ASL 2.0 and offer limited warranties, support, maintenance, and commercial +database integrations. + +For more information, please visit: http://www.jooq.org/licenses \ No newline at end of file diff --git a/jOOQ-meta-extensions-liquibase/NOTICE.txt b/jOOQ-meta-extensions-liquibase/NOTICE.txt new file mode 100644 index 0000000000..698edf47ee --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/NOTICE.txt @@ -0,0 +1,10 @@ +Third party NOTICE.txt contents +=============================== + +Contents of https://github.com/apache/commons-lang/blob/master/NOTICE.txt +------------------------------------------------------------------------- +Apache Commons Lang +Copyright 2001-2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/jOOQ-meta-extensions-liquibase/pom.xml b/jOOQ-meta-extensions-liquibase/pom.xml new file mode 100644 index 0000000000..2e0700107a --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + + org.jooq + jooq-parent + 3.14.0-SNAPSHOT + + + jooq-meta-extensions-liquibase + jOOQ Meta Extensions Liquibase + + + + Apache License, Version 2.0 + http://www.jooq.org/inc/LICENSE.txt + repo + + + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.jooq.meta.extensions.liquibase + + + + + + + + + + org.jooq + jooq-meta-extensions + + + org.liquibase + liquibase-core + + + + + + + + + + + + diff --git a/jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java b/jOOQ-meta-extensions-liquibase/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java similarity index 100% rename from jOOQ-meta-extensions/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java rename to jOOQ-meta-extensions-liquibase/src/main/java/org/jooq/meta/extensions/liquibase/LiquibaseDatabase.java diff --git a/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/LICENSE.txt b/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000000..d090694f44 --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,19 @@ +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Other licenses: +----------------------------------------------------------------------------- +Commercial licenses for this work are available. These replace the above +ASL 2.0 and offer limited warranties, support, maintenance, and commercial +database integrations. + +For more information, please visit: http://www.jooq.org/licenses \ No newline at end of file diff --git a/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/README.txt b/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/README.txt new file mode 100644 index 0000000000..3e6e227e05 --- /dev/null +++ b/jOOQ-meta-extensions-liquibase/src/main/resources/META-INF/README.txt @@ -0,0 +1,2 @@ +Thanks for downloading jOOQ. +Please visit http://www.jooq.org for more information. \ No newline at end of file diff --git a/jOOQ-meta-extensions/pom.xml b/jOOQ-meta-extensions/pom.xml index 6b707e0613..7d0763cd14 100644 --- a/jOOQ-meta-extensions/pom.xml +++ b/jOOQ-meta-extensions/pom.xml @@ -52,22 +52,6 @@ com.h2database h2 - - javax.persistence - javax.persistence-api - - - org.hibernate - hibernate-core - - - org.springframework - spring-context - - - org.liquibase - liquibase-core - diff --git a/pom.xml b/pom.xml index bd3946942f..25b89beee8 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,16 @@ jooq-meta-extensions ${project.version} + + org.jooq + jooq-meta-extensions-hibernate + ${project.version} + + + org.jooq + jooq-meta-extensions-liquibase + ${project.version} + org.jetbrains @@ -603,6 +613,8 @@ jOOQ-meta jOOQ-meta-extensions + jOOQ-meta-extensions-hibernate + jOOQ-meta-extensions-liquibase jOOQ-codegen jOOQ-codegen-maven jOOQ-kotlin