From 91581fee86fc1f0da7a9e4e88ff8665aceb7dcf9 Mon Sep 17 00:00:00 2001 From: Simon Cockx Date: Mon, 24 Jun 2024 11:53:49 +0200 Subject: [PATCH] Revert imports --- .../com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java | 1 - .../java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java | 1 - .../java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java | 1 - .../fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java | 2 +- .../com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java index 3a8b68a73..c9a57c1d2 100644 --- a/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java +++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java @@ -1,6 +1,5 @@ package com.fasterxml.jackson.dataformat.xml; -import com.fasterxml.jackson.core.json.PackageVersion; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java index 48a9304cf..521c9bded 100644 --- a/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java +++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java @@ -4,7 +4,6 @@ import javax.xml.stream.*; -import com.fasterxml.jackson.core.json.PackageVersion; import org.codehaus.stax2.XMLInputFactory2; import org.codehaus.stax2.io.Stax2ByteArraySource; import org.codehaus.stax2.io.Stax2CharArraySource; diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java index be79caf1d..0fc5c1e91 100644 --- a/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java +++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlMapper.java @@ -8,7 +8,6 @@ import javax.xml.stream.XMLStreamWriter; import com.fasterxml.jackson.core.*; -import com.fasterxml.jackson.core.json.PackageVersion; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.cfg.CoercionAction; diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java index 5509294fd..654aafbe3 100644 --- a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java +++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java @@ -18,10 +18,10 @@ import com.fasterxml.jackson.core.exc.StreamConstraintsException; import com.fasterxml.jackson.core.io.IOContext; import com.fasterxml.jackson.core.io.NumberInput; -import com.fasterxml.jackson.core.json.PackageVersion; import com.fasterxml.jackson.core.util.ByteArrayBuilder; import com.fasterxml.jackson.core.util.JacksonFeatureSet; +import com.fasterxml.jackson.dataformat.xml.PackageVersion; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlNameProcessor; import com.fasterxml.jackson.dataformat.xml.util.CaseInsensitiveNameSet; diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java index 21e3a44ee..3dca6dd6d 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/VersionInfoTest.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.Versioned; -import com.fasterxml.jackson.core.json.PackageVersion; public class VersionInfoTest extends XmlTestBase {