From 5a99d6da223241f96c7161e232144455d08fb9d6 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 17 Nov 2021 15:48:27 +0100 Subject: [PATCH] [jOOQ/jOOQ#12633] Move XSDs from jOOQ and jOOQ-meta to subpackages to avoid split xsd packages --- .../src/main/java/org/jooq/codegen/Constants.java | 10 +++++----- jOOQ-meta/src/main/java/org/jooq/meta/Constants.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java index 80abeb0909..24152abb2f 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java @@ -84,7 +84,7 @@ public final class Constants { /** * The current jooq-runtime XSD classpath location. */ - public static final String CP_RUNTIME = "/xsd/" + XSD_RUNTIME; + public static final String CP_RUNTIME = "/org/jooq/xsd/" + XSD_RUNTIME; /** * The current jooq-export XSD file name. @@ -99,7 +99,7 @@ public final class Constants { /** * The current jooq-export XSD classpath location. */ - public static final String CP_EXPORT = "/xsd/" + XSD_EXPORT; + public static final String CP_EXPORT = "/org/jooq/xsd/" + XSD_EXPORT; /** * The current jooq-meta XSD file name. @@ -114,7 +114,7 @@ public final class Constants { /** * The current jooq-meta XSD classpath location. */ - public static final String CP_META = "/xsd/" + XSD_META; + public static final String CP_META = "/org/jooq/xsd/" + XSD_META; /** * The current jooq-migrations XSD file name. @@ -129,7 +129,7 @@ public final class Constants { /** * The current jooq-migrations XSD classpath location. */ - public static final String CP_MIGRATIONS = "/xsd/" + XSD_META; + public static final String CP_MIGRATIONS = "/org/jooq/xsd/" + XSD_META; /** * The current jooq-codegen XSD file name. @@ -144,7 +144,7 @@ public final class Constants { /** * The current jooq-codegen XSD classpath location. */ - public static final String CP_CODEGEN = "/xsd/" + XSD_CODEGEN; + public static final String CP_CODEGEN = "/org/jooq/meta/xsd/" + XSD_CODEGEN; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java index 0afc8c7a04..4353151604 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java @@ -84,7 +84,7 @@ public final class Constants { /** * The current jooq-runtime XSD classpath location. */ - public static final String CP_RUNTIME = "/xsd/" + XSD_RUNTIME; + public static final String CP_RUNTIME = "/org/jooq/xsd/" + XSD_RUNTIME; /** * The current jooq-export XSD file name. @@ -99,7 +99,7 @@ public final class Constants { /** * The current jooq-export XSD classpath location. */ - public static final String CP_EXPORT = "/xsd/" + XSD_EXPORT; + public static final String CP_EXPORT = "/org/jooq/xsd/" + XSD_EXPORT; /** * The current jooq-meta XSD file name. @@ -114,7 +114,7 @@ public final class Constants { /** * The current jooq-meta XSD classpath location. */ - public static final String CP_META = "/xsd/" + XSD_META; + public static final String CP_META = "/org/jooq/xsd/" + XSD_META; /** * The current jooq-migrations XSD file name. @@ -129,7 +129,7 @@ public final class Constants { /** * The current jooq-migrations XSD classpath location. */ - public static final String CP_MIGRATIONS = "/xsd/" + XSD_META; + public static final String CP_MIGRATIONS = "/org/jooq/xsd/" + XSD_META; /** * The current jooq-codegen XSD file name. @@ -144,7 +144,7 @@ public final class Constants { /** * The current jooq-codegen XSD classpath location. */ - public static final String CP_CODEGEN = "/xsd/" + XSD_CODEGEN; + public static final String CP_CODEGEN = "/org/jooq/meta/xsd/" + XSD_CODEGEN;