From 743da1197d5a3521a97b2e1a9f85fb311cf52b30 Mon Sep 17 00:00:00 2001 From: Mariano Rean Date: Thu, 12 Dec 2024 11:11:47 -0300 Subject: [PATCH] Revert "W-17281517: Upgrade jakarta dependencies (#13915)" This reverts commit 92d00c7e3bf8aa187b054ba4d579f719dbabdc05. --- .../simple/ParseTemplateProcessor.java | 2 +- modules/extensions-spring-support/pom.xml | 5 ----- .../src/main/java/module-info.java | 5 ++--- .../DefaultExtensionSchemaGenerator.java | 6 ++--- .../xml/schema/builder/SchemaBuilder.java | 2 +- .../capability/xml/schema/model/All.java | 6 ++--- .../xml/schema/model/Annotated.java | 18 +++++++-------- .../xml/schema/model/Annotation.java | 22 +++++++++---------- .../capability/xml/schema/model/Any.java | 12 +++++----- .../capability/xml/schema/model/Appinfo.java | 18 +++++++-------- .../xml/schema/model/Attribute.java | 16 +++++++------- .../xml/schema/model/AttributeGroup.java | 20 ++++++++--------- .../xml/schema/model/AttributeGroupRef.java | 6 ++--- .../capability/xml/schema/model/BuiltBy.java | 6 ++--- .../xml/schema/model/ComplexContent.java | 10 ++++----- .../schema/model/ComplexRestrictionType.java | 6 ++--- .../xml/schema/model/ComplexType.java | 20 ++++++++--------- .../xml/schema/model/DerivationControl.java | 6 ++--- .../xml/schema/model/Documentation.java | 18 +++++++-------- .../capability/xml/schema/model/Element.java | 22 +++++++++---------- .../xml/schema/model/ExplicitGroup.java | 8 +++---- .../xml/schema/model/ExtensionType.java | 14 ++++++------ .../capability/xml/schema/model/Facet.java | 12 +++++----- .../capability/xml/schema/model/Field.java | 14 ++++++------ .../xml/schema/model/FormChoice.java | 6 ++--- .../capability/xml/schema/model/Group.java | 22 +++++++++---------- .../capability/xml/schema/model/GroupRef.java | 6 ++--- .../capability/xml/schema/model/Import.java | 12 +++++----- .../capability/xml/schema/model/Include.java | 12 +++++----- .../capability/xml/schema/model/Keybase.java | 18 +++++++-------- .../capability/xml/schema/model/Keyref.java | 10 ++++----- .../capability/xml/schema/model/List.java | 10 ++++----- .../xml/schema/model/LocalComplexType.java | 6 ++--- .../xml/schema/model/LocalElement.java | 8 +++---- .../xml/schema/model/LocalSimpleType.java | 6 ++--- .../xml/schema/model/NamedAttributeGroup.java | 6 ++--- .../xml/schema/model/NamedGroup.java | 6 ++--- .../xml/schema/model/NarrowMaxMin.java | 6 ++--- .../xml/schema/model/NoFixedFacet.java | 8 +++---- .../capability/xml/schema/model/Notation.java | 16 +++++++------- .../capability/xml/schema/model/NumFacet.java | 8 +++---- .../xml/schema/model/ObjectFactory.java | 6 ++--- .../xml/schema/model/OpenAttrs.java | 10 ++++----- .../capability/xml/schema/model/Pattern.java | 8 +++---- .../xml/schema/model/RealGroup.java | 8 +++---- .../capability/xml/schema/model/Redefine.java | 22 +++++++++---------- .../model/ReducedDerivationControl.java | 6 ++--- .../xml/schema/model/Restriction.java | 16 +++++++------- .../xml/schema/model/RestrictionType.java | 20 ++++++++--------- .../capability/xml/schema/model/Schema.java | 22 +++++++++---------- .../capability/xml/schema/model/Selector.java | 14 ++++++------ .../xml/schema/model/SimpleContent.java | 8 +++---- .../xml/schema/model/SimpleExplicitGroup.java | 6 ++--- .../xml/schema/model/SimpleExtensionType.java | 6 ++--- .../schema/model/SimpleRestrictionType.java | 6 ++--- .../xml/schema/model/SimpleType.java | 16 +++++++------- .../xml/schema/model/TopLevelAttribute.java | 6 ++--- .../xml/schema/model/TopLevelComplexType.java | 6 ++--- .../xml/schema/model/TopLevelElement.java | 6 ++--- .../xml/schema/model/TopLevelSimpleType.java | 6 ++--- .../xml/schema/model/TotalDigits.java | 8 +++---- .../schema/model/TypeDerivationControl.java | 6 ++--- .../capability/xml/schema/model/Union.java | 10 ++++----- .../xml/schema/model/WhiteSpace.java | 8 +++---- .../capability/xml/schema/model/Wildcard.java | 16 +++++++------- .../xml/schema/model/package-info.java | 6 ++--- ...onnectionWithDynamicParameterTestCase.java | 2 +- modules/extensions-support/pom.xml | 11 +++++----- .../src/main/java/module-info.java | 4 ++-- ...efaultExtensionDescriptionsSerializer.java | 6 ++--- .../DefaultXmlExtensionDocumentation.java | 6 ++--- ...faultXmlExtensionElementDocumentation.java | 6 ++--- ...ultXmlExtensionParameterDocumentation.java | 4 ++-- .../infrastructure/process/Controller.java | 2 +- .../process/UnixController.java | 9 +------- ...tAddVariablePropertyProcessorTestCase.java | 2 +- 76 files changed, 365 insertions(+), 379 deletions(-) diff --git a/modules/core-components/src/main/java/org/mule/runtime/core/internal/processor/simple/ParseTemplateProcessor.java b/modules/core-components/src/main/java/org/mule/runtime/core/internal/processor/simple/ParseTemplateProcessor.java index 16040c4964bf..8cded11a48b3 100755 --- a/modules/core-components/src/main/java/org/mule/runtime/core/internal/processor/simple/ParseTemplateProcessor.java +++ b/modules/core-components/src/main/java/org/mule/runtime/core/internal/processor/simple/ParseTemplateProcessor.java @@ -35,7 +35,7 @@ import java.io.InputStream; import java.nio.charset.Charset; -import jakarta.activation.MimetypesFileTypeMap; +import javax.activation.MimetypesFileTypeMap; import javax.inject.Inject; diff --git a/modules/extensions-spring-support/pom.xml b/modules/extensions-spring-support/pom.xml index 4a3594576124..d9efd2fbf066 100644 --- a/modules/extensions-spring-support/pom.xml +++ b/modules/extensions-spring-support/pom.xml @@ -441,10 +441,5 @@ mule-plugin test - - com.sun.xml.bind - jaxb-impl - test - diff --git a/modules/extensions-spring-support/src/main/java/module-info.java b/modules/extensions-spring-support/src/main/java/module-info.java index 70d4290e5df0..6cd2afb786b7 100644 --- a/modules/extensions-spring-support/src/main/java/module-info.java +++ b/modules/extensions-spring-support/src/main/java/module-info.java @@ -30,8 +30,7 @@ requires java.compiler; requires java.inject; - - requires jakarta.xml.bind; + requires java.xml.bind; requires com.google.common; requires org.apache.commons.lang3; @@ -79,7 +78,7 @@ org.mule.runtime.ast.extension; opens org.mule.runtime.module.extension.internal.capability.xml.schema.model to - jakarta.xml.bind; + java.xml.bind; opens org.mule.runtime.module.extension.internal.config.dsl to spring.core; opens org.mule.runtime.module.extension.internal.config.dsl.config to diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/DefaultExtensionSchemaGenerator.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/DefaultExtensionSchemaGenerator.java index 44aba6f4b28c..8090bdc94460 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/DefaultExtensionSchemaGenerator.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/DefaultExtensionSchemaGenerator.java @@ -30,9 +30,9 @@ import java.io.StringWriter; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; import org.apache.commons.lang3.StringUtils; import org.dom4j.io.OutputFormat; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/builder/SchemaBuilder.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/builder/SchemaBuilder.java index 5dd232a0831b..72aa83d364c1 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/builder/SchemaBuilder.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/builder/SchemaBuilder.java @@ -118,7 +118,7 @@ import java.util.Optional; import java.util.Set; -import jakarta.xml.bind.JAXBElement; +import javax.xml.bind.JAXBElement; import javax.xml.namespace.QName; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/All.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/All.java index 7ef37d4225df..0aba863640f6 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/All.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/All.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotated.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotated.java index d86318366c48..666bd3cd8b1f 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotated.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotated.java @@ -14,15 +14,15 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotation.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotation.java index 5ae140a518bb..4fc87394ae67 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotation.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Annotation.java @@ -17,17 +17,17 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Any.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Any.java index ea0cc4927a83..853ecc43a111 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Any.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Any.java @@ -16,12 +16,12 @@ import java.math.BigInteger; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Appinfo.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Appinfo.java index 0118d12a60a1..2285004797cc 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Appinfo.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Appinfo.java @@ -19,15 +19,15 @@ import java.util.List; import java.util.Map; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAnyAttribute; -import jakarta.xml.bind.annotation.XmlAnyElement; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlMixed; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Attribute.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Attribute.java index 5922aa25e5c9..c85f1a7fb943 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Attribute.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Attribute.java @@ -14,14 +14,14 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroup.java index 8d61164f40c8..175ef36c0386 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroup.java @@ -17,16 +17,16 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroupRef.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroupRef.java index e2ae813adf19..bfae66e6cbd4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroupRef.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/AttributeGroupRef.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/BuiltBy.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/BuiltBy.java index 925fed96e07f..fe1d9020f481 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/BuiltBy.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/BuiltBy.java @@ -6,9 +6,9 @@ */ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; @XmlAccessorType(XmlAccessType.FIELD) public class BuiltBy { diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexContent.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexContent.java index bf40a5222f39..43593c2b53fc 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexContent.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexContent.java @@ -14,11 +14,11 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexRestrictionType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexRestrictionType.java index 1ab3a3626496..dc5b598eef16 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexRestrictionType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexRestrictionType.java @@ -13,9 +13,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexType.java index bd50effd0658..7703918092bf 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ComplexType.java @@ -17,16 +17,16 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/DerivationControl.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/DerivationControl.java index a0272541e8fd..4f95bd5b8fc8 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/DerivationControl.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/DerivationControl.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlEnum; -import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Documentation.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Documentation.java index 6dd5284b48ea..f21ad5dace5f 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Documentation.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Documentation.java @@ -19,15 +19,15 @@ import java.util.List; import java.util.Map; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAnyAttribute; -import jakarta.xml.bind.annotation.XmlAnyElement; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlMixed; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlMixed; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Element.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Element.java index 88d3901b91ab..727fb52620d4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Element.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Element.java @@ -18,17 +18,17 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExplicitGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExplicitGroup.java index 1dc22790f2d9..71198995d534 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExplicitGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExplicitGroup.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExtensionType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExtensionType.java index d85e01c1eb19..7ab5e89457d6 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExtensionType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ExtensionType.java @@ -17,13 +17,13 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Facet.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Facet.java index 637441a33466..e90e74f87ce4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Facet.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Facet.java @@ -14,12 +14,12 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Field.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Field.java index 18fde16d213e..935d8ca88fc4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Field.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Field.java @@ -14,13 +14,13 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/FormChoice.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/FormChoice.java index 95a04b00f25b..f434c156e020 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/FormChoice.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/FormChoice.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlEnum; -import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Group.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Group.java index 65dc7451e392..9650d552ab5a 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Group.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Group.java @@ -18,17 +18,17 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/GroupRef.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/GroupRef.java index 82774fcd3ae7..3089b3e7c4c3 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/GroupRef.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/GroupRef.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Import.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Import.java index f4e9de086416..33141515313a 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Import.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Import.java @@ -14,12 +14,12 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Include.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Include.java index 95af6950e554..3ef4d5c27025 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Include.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Include.java @@ -14,12 +14,12 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keybase.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keybase.java index da0863feeb3d..aa9417acff17 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keybase.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keybase.java @@ -17,15 +17,15 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keyref.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keyref.java index 316c24a39c63..fda4139b80d5 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keyref.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Keyref.java @@ -14,11 +14,11 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/List.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/List.java index cfe548020cdc..555050d382a4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/List.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/List.java @@ -14,11 +14,11 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalComplexType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalComplexType.java index 72ab4a13c6b8..d564e5e7eb0a 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalComplexType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalComplexType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalElement.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalElement.java index 154216f7834c..05c90bb5ac22 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalElement.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalElement.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalSimpleType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalSimpleType.java index 7d0ab43d92d4..63ef62f319a4 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalSimpleType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/LocalSimpleType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedAttributeGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedAttributeGroup.java index 4b3480ba72f1..c67cb18f44a2 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedAttributeGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedAttributeGroup.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedGroup.java index 87182373410d..121312a99901 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NamedGroup.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NarrowMaxMin.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NarrowMaxMin.java index 38ab31a57ea5..a560ad0fa7ac 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NarrowMaxMin.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NarrowMaxMin.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NoFixedFacet.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NoFixedFacet.java index fbacd4e96b1e..6e0db9d29ff8 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NoFixedFacet.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NoFixedFacet.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Notation.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Notation.java index 5d02bf839a26..7179573553f0 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Notation.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Notation.java @@ -14,14 +14,14 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NumFacet.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NumFacet.java index aba995b6dd43..6c9105557eda 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NumFacet.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/NumFacet.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ObjectFactory.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ObjectFactory.java index 70ebbf6161e8..1f7e7a2cbd2c 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ObjectFactory.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ObjectFactory.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlElementDecl; -import jakarta.xml.bind.annotation.XmlRegistry; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/OpenAttrs.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/OpenAttrs.java index d5e80288b2dc..72e2fd24adec 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/OpenAttrs.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/OpenAttrs.java @@ -17,11 +17,11 @@ import java.util.HashMap; import java.util.Map; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAnyAttribute; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyAttribute; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Pattern.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Pattern.java index b5e9266631c6..bdceb4cc225f 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Pattern.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Pattern.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RealGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RealGroup.java index 92eda0bc29f5..eb7df463ebcb 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RealGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RealGroup.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Redefine.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Redefine.java index 754126e66f09..ded17ba5f5c9 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Redefine.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Redefine.java @@ -17,17 +17,17 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ReducedDerivationControl.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ReducedDerivationControl.java index b9ad50bc08a8..1fc1d2fe348f 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ReducedDerivationControl.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/ReducedDerivationControl.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlEnum; -import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Restriction.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Restriction.java index dd160c268d26..e7d70b1c4006 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Restriction.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Restriction.java @@ -17,14 +17,14 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RestrictionType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RestrictionType.java index 034f0ee38e75..ea2aa1ece1dc 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RestrictionType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/RestrictionType.java @@ -17,16 +17,16 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementRef; +import javax.xml.bind.annotation.XmlElementRefs; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Schema.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Schema.java index b7c60057bab2..db4586703b33 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Schema.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Schema.java @@ -18,17 +18,17 @@ import java.util.LinkedList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Selector.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Selector.java index 2e5eeb7fa428..8d613d99c564 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Selector.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Selector.java @@ -14,13 +14,13 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleContent.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleContent.java index 4c98adcef20b..8cd5847b27c7 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleContent.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleContent.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExplicitGroup.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExplicitGroup.java index faae0a1a4fac..2b202a41596c 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExplicitGroup.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExplicitGroup.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExtensionType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExtensionType.java index 87b872853fec..16a1342cd79d 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExtensionType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleExtensionType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleRestrictionType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleRestrictionType.java index c7c679e88e10..2373e53c875a 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleRestrictionType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleRestrictionType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleType.java index 314e8a38a41d..4381d320094e 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/SimpleType.java @@ -16,14 +16,14 @@ import java.util.ArrayList; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelAttribute.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelAttribute.java index a5d131b35815..5ba304ae007b 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelAttribute.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelAttribute.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelComplexType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelComplexType.java index eeb1280494ef..d24280a1c472 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelComplexType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelComplexType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelElement.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelElement.java index ad4b64f3a3db..65cf03815d72 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelElement.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelElement.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelSimpleType.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelSimpleType.java index 39ffbfd540da..3d0fe568e72d 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelSimpleType.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TopLevelSimpleType.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TotalDigits.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TotalDigits.java index cdb270bdb31a..e2f2d0469390 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TotalDigits.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TotalDigits.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TypeDerivationControl.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TypeDerivationControl.java index 1a63b699ab86..2f6bcd38cd2c 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TypeDerivationControl.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/TypeDerivationControl.java @@ -14,9 +14,9 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlEnum; -import jakarta.xml.bind.annotation.XmlEnumValue; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Union.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Union.java index de8681a20df6..b7f43883e4ce 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Union.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Union.java @@ -17,11 +17,11 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/WhiteSpace.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/WhiteSpace.java index b11a71534c42..aa23936b8d46 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/WhiteSpace.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/WhiteSpace.java @@ -14,10 +14,10 @@ package org.mule.runtime.module.extension.internal.capability.xml.schema.model; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Wildcard.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Wildcard.java index 4ee2d8aaabca..750cff61eb1c 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Wildcard.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/Wildcard.java @@ -17,14 +17,14 @@ import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** diff --git a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/package-info.java b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/package-info.java index 451b8f1e5896..3828ed107346 100644 --- a/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/package-info.java +++ b/modules/extensions-spring-support/src/main/java/org/mule/runtime/module/extension/internal/capability/xml/schema/model/package-info.java @@ -11,8 +11,6 @@ // Generated on: 2011.06.14 at 03:58:12 PM GMT-03:00 // -@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2001/XMLSchema", - elementFormDefault = QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2001/XMLSchema", + elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.mule.runtime.module.extension.internal.capability.xml.schema.model; - -import static jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED; diff --git a/modules/extensions-spring-support/src/test/java/org/mule/test/module/extension/connector/PetStoreCachedConnectionWithDynamicParameterTestCase.java b/modules/extensions-spring-support/src/test/java/org/mule/test/module/extension/connector/PetStoreCachedConnectionWithDynamicParameterTestCase.java index 04b42e647423..ca599d713ce1 100644 --- a/modules/extensions-spring-support/src/test/java/org/mule/test/module/extension/connector/PetStoreCachedConnectionWithDynamicParameterTestCase.java +++ b/modules/extensions-spring-support/src/test/java/org/mule/test/module/extension/connector/PetStoreCachedConnectionWithDynamicParameterTestCase.java @@ -6,7 +6,7 @@ */ package org.mule.test.module.extension.connector; -import static jakarta.xml.bind.DatatypeConverter.parseDateTime; +import static javax.xml.bind.DatatypeConverter.parseDateTime; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; diff --git a/modules/extensions-support/pom.xml b/modules/extensions-support/pom.xml index cc7129c7f803..da6dcd236348 100644 --- a/modules/extensions-support/pom.xml +++ b/modules/extensions-support/pom.xml @@ -27,7 +27,6 @@ --add-exports=org.mule.runtime.extensions.api/org.mule.runtime.extension.internal.property=org.mule.runtime.extensions.support --add-reads=org.mule.runtime.extensions.support=com.google.gson --add-opens=org.mule.runtime.extensions.support/org.mule.runtime.module.extension.internal.loader.validation=org.mule.runtime.core - --add-opens=org.mule.runtime.extensions.support/org.mule.runtime.module.extension.internal.resources.documentation=jakarta.xml.bind --add-opens=org.mule.runtime.extensions.support/org.mule.runtime.module.extension.internal.runtime=org.mule.runtime.core --add-opens=org.mule.runtime.extensions.support/org.mule.runtime.module.extension.internal.runtime.client=org.mule.runtime.core --add-opens=org.mule.runtime.extensions.support/org.mule.runtime.module.extension.internal.runtime.config=org.mule.runtime.core @@ -159,10 +158,6 @@ jakarta.inject jakarta.inject-api - - com.sun.xml.bind - jaxb-impl - @@ -330,6 +325,12 @@ ${project.version} test + + + com.sun.xml.bind + jaxb-impl + test + diff --git a/modules/extensions-support/src/main/java/module-info.java b/modules/extensions-support/src/main/java/module-info.java index 2e8327cde5d5..76b6fd4adc94 100644 --- a/modules/extensions-support/src/main/java/module-info.java +++ b/modules/extensions-support/src/main/java/module-info.java @@ -58,7 +58,7 @@ // Usage of TypeElement, VariableElement and other requires java.compiler; // XML documentation classes - requires jakarta.xml.bind; + requires java.xml.bind; requires org.mule.apache.xerces; requires com.github.benmanes.caffeine; @@ -215,7 +215,7 @@ org.mule.runtime.tooling.support; opens org.mule.runtime.module.extension.internal.resources.documentation to - jakarta.xml.bind; + java.xml.bind; provides org.mule.runtime.api.connectivity.ConnectivityTestingStrategy with org.mule.runtime.module.extension.api.tooling.ExtensionConnectivityTestingStrategy; diff --git a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultExtensionDescriptionsSerializer.java b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultExtensionDescriptionsSerializer.java index 137f8300e31a..e9b83fc5e6b2 100644 --- a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultExtensionDescriptionsSerializer.java +++ b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultExtensionDescriptionsSerializer.java @@ -21,9 +21,9 @@ import java.io.InputStream; import java.io.OutputStream; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.Unmarshaller; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; public class DefaultExtensionDescriptionsSerializer implements ExtensionDescriptionsSerializer { diff --git a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionDocumentation.java b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionDocumentation.java index f5ce7196b615..0afc074917ba 100644 --- a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionDocumentation.java +++ b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionDocumentation.java @@ -11,9 +11,9 @@ import java.util.LinkedList; import java.util.List; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; /** * a POJO that represents the extension-descriptions.xml file which contains the necessary annotations and setters necessary to diff --git a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionElementDocumentation.java b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionElementDocumentation.java index 99def78445ed..a51998bc301c 100644 --- a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionElementDocumentation.java +++ b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionElementDocumentation.java @@ -12,9 +12,9 @@ import java.util.List; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; public class DefaultXmlExtensionElementDocumentation implements NamedObject, DescribedObject, XmlExtensionElementDocumentation { diff --git a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionParameterDocumentation.java b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionParameterDocumentation.java index 56d3b5675686..6412f3f3519f 100644 --- a/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionParameterDocumentation.java +++ b/modules/extensions-support/src/main/java/org/mule/runtime/module/extension/internal/resources/documentation/DefaultXmlExtensionParameterDocumentation.java @@ -10,8 +10,8 @@ import org.mule.runtime.api.meta.NamedObject; import org.mule.runtime.module.extension.api.resources.documentation.XmlExtensionParameterDocumentation; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; /** * a POJO that represents an extension parameter with a name and a description. diff --git a/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/Controller.java b/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/Controller.java index 73c34ae66138..9ba0b585e77a 100644 --- a/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/Controller.java +++ b/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/Controller.java @@ -86,7 +86,7 @@ public void start(String... args) { checkRepositoryLocationAndUpdateInternalRepoPropertyIfPresent(args); try { osSpecificController.start(args); - } catch (Throwable mce) { + } catch (MuleControllerException mce) { try { printLog(); } catch (IOException ioe) { diff --git a/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/UnixController.java b/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/UnixController.java index d15c72a04644..7e3d043ac35f 100644 --- a/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/UnixController.java +++ b/tests/infrastructure/src/main/java/org/mule/test/infrastructure/process/UnixController.java @@ -11,8 +11,6 @@ import static java.lang.Integer.parseInt; import static java.lang.String.format; -import static org.slf4j.LoggerFactory.getLogger; - import java.io.ByteArrayOutputStream; import java.util.Map; import java.util.regex.Matcher; @@ -21,15 +19,12 @@ import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.ExecuteWatchdog; import org.apache.commons.exec.PumpStreamHandler; -import org.slf4j.Logger; /** * */ public class UnixController extends AbstractOSController { - private static final Logger logger = getLogger(UnixController.class); - public UnixController(String muleHome, int timeout) { super(muleHome, timeout); } @@ -76,9 +71,7 @@ public MuleProcessStatus getProcessesStatus() { executor.setStreamHandler(streamHandler); if (this.doExecution(executor, new CommandLine(this.muleBin).addArgument(STATUS_CMD), newEnv) == 0) { - String status = outputStream.toString(); - logger.info("[Status] " + status); - Matcher matcher = STATUS_LABELS_PATTERN.matcher(status); + Matcher matcher = STATUS_LABELS_PATTERN.matcher(outputStream.toString()); if (matcher.find() && !isEmpty(matcher.group(STATUS_WRAPPER_GROUP_NAME)) && !isEmpty(matcher.group(STATUS_JAVA_GROUP_NAME))) { return MuleProcessStatus.valueOf(format("%s_%s", matcher.group(STATUS_WRAPPER_GROUP_NAME), diff --git a/tests/unit/src/main/java/org/mule/functional/transformer/simple/AbstractAddVariablePropertyProcessorTestCase.java b/tests/unit/src/main/java/org/mule/functional/transformer/simple/AbstractAddVariablePropertyProcessorTestCase.java index 2af00b5688e2..5e669c815321 100644 --- a/tests/unit/src/main/java/org/mule/functional/transformer/simple/AbstractAddVariablePropertyProcessorTestCase.java +++ b/tests/unit/src/main/java/org/mule/functional/transformer/simple/AbstractAddVariablePropertyProcessorTestCase.java @@ -43,7 +43,7 @@ import java.lang.reflect.Field; import java.nio.charset.Charset; -import jakarta.activation.MimeTypeParseException; +import javax.activation.MimeTypeParseException; import org.junit.After; import org.junit.Before;