From 27b8103f6d4957bb0237ac5dae662de4e55ac0c5 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 16 Apr 2018 11:56:00 +0200 Subject: [PATCH] [#7419] Rename jooq-meta and jooq-codegen packages to avoid conflicts in JPMS --- .../codegen/DefaultGeneratorStrategy.java | 2 +- .../java/org/jooq/codegen/GenerationTool.java | 2 +- .../java/org/jooq/codegen/JavaGenerator.java | 8 ++++---- .../java/org/jooq/meta/AbstractDatabase.java | 2 +- .../main/java/org/jooq/meta/Databases.java | 20 +++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java index e4785d1ce3..674f0bebc3 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java @@ -57,7 +57,7 @@ import org.jooq.meta.RoutineDefinition; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.TableDefinition; import org.jooq.meta.UDTDefinition; -import org.jooq.meta.oracle.OracleQueueDefinition; +// ... import org.jooq.tools.StringUtils; /** 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 c9c1139d89..96300dc5a4 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java @@ -84,7 +84,7 @@ import org.jooq.meta.jaxb.Property; import org.jooq.meta.jaxb.Schema; import org.jooq.meta.jaxb.Strategy; import org.jooq.meta.jaxb.Target; -import org.jooq.meta.oracle.OracleDatabase; +// ... import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; import org.jooq.tools.jdbc.JDBCUtils; diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index 1557e6fa10..59e5ae5b5d 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -144,10 +144,10 @@ import org.jooq.meta.TableDefinition; import org.jooq.meta.TypedElementDefinition; import org.jooq.meta.UDTDefinition; import org.jooq.meta.UniqueKeyDefinition; -import org.jooq.meta.oracle.OracleDatabase; -import org.jooq.meta.oracle.OracleLinkDefinition; -import org.jooq.meta.oracle.OracleQueueDefinition; -import org.jooq.meta.oracle.OracleRoutineDefinition; +// ... +// ... +// ... +// ... import org.jooq.meta.postgres.PostgresDatabase; import org.jooq.tools.JooqLogger; import org.jooq.tools.StopWatch; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 53067f6859..2429505095 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -80,7 +80,7 @@ import org.jooq.meta.jaxb.ForcedType; import org.jooq.meta.jaxb.Nullability; import org.jooq.meta.jaxb.RegexFlag; import org.jooq.meta.jaxb.Schema; -import org.jooq.meta.oracle.OracleDatabase; +// ... import org.jooq.tools.JooqLogger; import org.jooq.tools.StopWatch; import org.jooq.tools.StringUtils; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java index 6d039c49de..b1a6cf27dd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java @@ -38,26 +38,26 @@ package org.jooq.meta; import org.jooq.SQLDialect; -import org.jooq.meta.ase.ASEDatabase; +// ... import org.jooq.meta.cubrid.CUBRIDDatabase; -import org.jooq.meta.db2.DB2Database; +// ... import org.jooq.meta.derby.DerbyDatabase; import org.jooq.meta.firebird.FirebirdDatabase; import org.jooq.meta.h2.H2Database; -import org.jooq.meta.hana.HanaDatabase; +// ... import org.jooq.meta.hsqldb.HSQLDBDatabase; -import org.jooq.meta.informix.InformixDatabase; -import org.jooq.meta.ingres.IngresDatabase; +// ... +// ... import org.jooq.meta.jdbc.JDBCDatabase; import org.jooq.meta.mariadb.MariaDBDatabase; import org.jooq.meta.mysql.MySQLDatabase; -import org.jooq.meta.oracle.OracleDatabase; +// ... import org.jooq.meta.postgres.PostgresDatabase; -import org.jooq.meta.redshift.RedshiftDatabase; +// ... import org.jooq.meta.sqlite.SQLiteDatabase; -import org.jooq.meta.sqlserver.SQLServerDatabase; -import org.jooq.meta.sybase.SybaseDatabase; -import org.jooq.meta.vertica.VerticaDatabase; +// ... +// ... +// ... /** * A common utility class that provides access to various {@link Database}