From 0035e1142b0ea233a6fa560c9700b1dc291ee87f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 20 Oct 2020 17:23:41 +0200 Subject: [PATCH] [jOOQ/jOOQ#10762] Wrong XSD namespace in XSD file --- .../src/main/java/org/jooq/meta/jaxb/Configuration.java | 8 ++++---- .../src/main/java/org/jooq/meta/jaxb/MatcherRule.java | 2 +- .../java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java | 4 ++-- .../java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java | 2 +- .../java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java | 2 +- .../src/main/java/org/jooq/meta/jaxb/package-info.java | 2 +- jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.14.0.xsd | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java index cf18a562d1..77baea0982 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java @@ -24,10 +24,10 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> - * <element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Logging" minOccurs="0"/> - * <element name="onError" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}OnError" minOccurs="0"/> - * <element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Jdbc" minOccurs="0"/> - * <element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}Generator"/> + * <element name="logging" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}Logging" minOccurs="0"/> + * <element name="onError" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}OnError" minOccurs="0"/> + * <element name="jdbc" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}Jdbc" minOccurs="0"/> + * <element name="generator" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}Generator"/> * <element name="basedir" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </all> * </restriction> diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java index eb6f26ea87..34aa94f66a 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java @@ -23,7 +23,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <all> - * <element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}MatcherTransformType" minOccurs="0"/> + * <element name="transform" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}MatcherTransformType" minOccurs="0"/> * <element name="expression" type="{http://www.w3.org/2001/XMLSchema}string"/> * </all> * </restriction> diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java index 6e51eeb243..056627c23b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java @@ -28,9 +28,9 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <all> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="tables" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}SyntheticKeyFieldsType"/> + * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}SyntheticKeyFieldsType"/> * <element name="referencedTable" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="referencedFields" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}SyntheticKeyFieldsType" minOccurs="0"/> + * <element name="referencedFields" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}SyntheticKeyFieldsType" minOccurs="0"/> * <element name="referencedKey" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </all> * </restriction> diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java index 923f2d8460..62e83ff212 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <all> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="tables" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}SyntheticKeyFieldsType"/> + * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}SyntheticKeyFieldsType"/> * <element name="key" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </all> * </restriction> diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java index a94fa6edbf..06414d34fd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java @@ -28,7 +28,7 @@ import org.jooq.util.jaxb.tools.XMLBuilder; * <all> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="tables" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd}SyntheticKeyFieldsType"/> + * <element name="fields" type="{http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd}SyntheticKeyFieldsType"/> * </all> * </restriction> * </complexContent> diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java index 431ec42e37..fae4a6d391 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.13.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.14.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.jooq.meta.jaxb; diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.14.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.14.0.xsd index 46dff15b6f..14fa31f6cb 100644 --- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.14.0.xsd +++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.14.0.xsd @@ -1,9 +1,9 @@