This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit bc91c2bb81385f6ddc9f61dcd429d491e058cc46 Author: Georg Kallidis <[email protected]> AuthorDate: Tue May 2 11:17:23 2023 +0200 Update to jakarta xml bind for java 11 and above --- pom.xml | 2 +- .../gk/log4j2/src/java/org/apache/turbine/Turbine.java | 4 ++-- src/java/org/apache/turbine/Turbine.java | 4 ++-- .../org/apache/turbine/om/security/DefaultUserImpl.java | 2 +- src/java/org/apache/turbine/pipeline/TurbinePipeline.java | 14 +++++++------- src/java/org/apache/turbine/pipeline/XmlValve.java | 8 ++++---- src/java/org/apache/turbine/pipeline/XmlValveAdapter.java | 6 +++--- .../services/urlmapper/TurbineURLMapperService.java | 6 +++--- .../turbine/services/urlmapper/model/URLMapEntry.java | 10 +++++----- .../services/urlmapper/model/URLMappingContainer.java | 12 ++++++------ .../services/urlmapper/model/XmlParameterAdapter.java | 6 +++--- .../turbine/services/urlmapper/model/XmlParameterList.java | 10 +++++----- .../services/urlmapper/model/XmlPatternAdapter.java | 6 +++--- .../org/apache/turbine/pipeline/PipelineCreationTest.java | 6 +++--- .../services/urlmapper/model/URLMappingContainerTest.java | 4 ++-- 15 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 1493b1e8..707a9845 100644 --- a/pom.xml +++ b/pom.xml @@ -1306,7 +1306,7 @@ <turbine.site.path>turbine-core</turbine.site.path> <fulcrum.intake>2.0.1-SNAPSHOT</fulcrum.intake> <fulcrum.parser>2.0.2-SNAPSHOT</fulcrum.parser> - <fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security> + <fulcrum.security>2.1.1-SNAPSHOT</fulcrum.security> <fulcrum.yaafi>1.0.9-SNAPSHOT</fulcrum.yaafi> <torque.version>5.1</torque.version> <jackson2.version>2.14.2</jackson2.version> diff --git a/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java b/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java index f347ee27..30fd78d8 100644 --- a/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java +++ b/proposals/gk/log4j2/src/java/org/apache/turbine/Turbine.java @@ -42,8 +42,8 @@ import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; diff --git a/src/java/org/apache/turbine/Turbine.java b/src/java/org/apache/turbine/Turbine.java index 69f87614..3f3a2fb3 100644 --- a/src/java/org/apache/turbine/Turbine.java +++ b/src/java/org/apache/turbine/Turbine.java @@ -38,8 +38,8 @@ import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; diff --git a/src/java/org/apache/turbine/om/security/DefaultUserImpl.java b/src/java/org/apache/turbine/om/security/DefaultUserImpl.java index e716704d..1f4aecb3 100644 --- a/src/java/org/apache/turbine/om/security/DefaultUserImpl.java +++ b/src/java/org/apache/turbine/om/security/DefaultUserImpl.java @@ -660,7 +660,7 @@ public class DefaultUserImpl implements User * @param createDate The new creation date of the user */ @Override - public final void setCreateDate(Date createDate) + public void setCreateDate(Date createDate) { setPerm(CREATE_DATE, createDate); } diff --git a/src/java/org/apache/turbine/pipeline/TurbinePipeline.java b/src/java/org/apache/turbine/pipeline/TurbinePipeline.java index de0fbeed..fc9d3e4b 100644 --- a/src/java/org/apache/turbine/pipeline/TurbinePipeline.java +++ b/src/java/org/apache/turbine/pipeline/TurbinePipeline.java @@ -24,13 +24,13 @@ import java.util.Collections; import java.util.Iterator; import java.util.concurrent.CopyOnWriteArrayList; -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.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +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.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.turbine.annotation.AnnotationProcessor; import org.apache.turbine.util.TurbineException; diff --git a/src/java/org/apache/turbine/pipeline/XmlValve.java b/src/java/org/apache/turbine/pipeline/XmlValve.java index 46672faa..7d52714b 100644 --- a/src/java/org/apache/turbine/pipeline/XmlValve.java +++ b/src/java/org/apache/turbine/pipeline/XmlValve.java @@ -19,10 +19,10 @@ package org.apache.turbine.pipeline; * under the License. */ -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** * A JAXB Class for holding the class name of a valve. diff --git a/src/java/org/apache/turbine/pipeline/XmlValveAdapter.java b/src/java/org/apache/turbine/pipeline/XmlValveAdapter.java index 1509e7e3..f396876c 100644 --- a/src/java/org/apache/turbine/pipeline/XmlValveAdapter.java +++ b/src/java/org/apache/turbine/pipeline/XmlValveAdapter.java @@ -19,7 +19,7 @@ package org.apache.turbine.pipeline; * under the License. */ -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Creates Valve objects. @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; public class XmlValveAdapter extends XmlAdapter<XmlValve, Valve> { /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override public Valve unmarshal(XmlValve xmlValve) throws Exception @@ -39,7 +39,7 @@ public class XmlValveAdapter extends XmlAdapter<XmlValve, Valve> } /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override public XmlValve marshal(Valve valve) throws Exception diff --git a/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java b/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java index 6ace476c..9d571f50 100644 --- a/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java +++ b/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java @@ -34,9 +34,9 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import org.apache.commons.configuration2.Configuration; import org.apache.fulcrum.parser.ParameterParser; diff --git a/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java b/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java index ccb4d3fd..52e15b45 100644 --- a/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java +++ b/src/java/org/apache/turbine/services/urlmapper/model/URLMapEntry.java @@ -24,11 +24,11 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java b/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java index 1a2fac0d..26422e85 100644 --- a/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java +++ b/src/java/org/apache/turbine/services/urlmapper/model/URLMappingContainer.java @@ -22,12 +22,12 @@ package org.apache.turbine.services.urlmapper.model; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; +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.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java b/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java index 609905de..84bf800f 100644 --- a/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java +++ b/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterAdapter.java @@ -23,7 +23,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.stream.Collectors; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.apache.turbine.services.urlmapper.model.XmlParameterList.XmlParameter; @@ -35,7 +35,7 @@ import org.apache.turbine.services.urlmapper.model.XmlParameterList.XmlParameter public class XmlParameterAdapter extends XmlAdapter<XmlParameterList, Map<String, String>> { /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override public Map<String, String> unmarshal(XmlParameterList xmlList) throws Exception @@ -47,7 +47,7 @@ public class XmlParameterAdapter extends XmlAdapter<XmlParameterList, Map<String } /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override public XmlParameterList marshal(Map<String, String> map) throws Exception diff --git a/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java b/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java index 7f8a769c..c65cbd9f 100644 --- a/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java +++ b/src/java/org/apache/turbine/services/urlmapper/model/XmlParameterList.java @@ -40,11 +40,11 @@ import java.util.List; * under the License. */ -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.XmlValue; +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.XmlValue; /** * A JAXB Class for holding a list of entries with key (in an attribute) and a value. diff --git a/src/java/org/apache/turbine/services/urlmapper/model/XmlPatternAdapter.java b/src/java/org/apache/turbine/services/urlmapper/model/XmlPatternAdapter.java index 68a52c59..04ef36ff 100644 --- a/src/java/org/apache/turbine/services/urlmapper/model/XmlPatternAdapter.java +++ b/src/java/org/apache/turbine/services/urlmapper/model/XmlPatternAdapter.java @@ -21,7 +21,7 @@ package org.apache.turbine.services.urlmapper.model; import java.util.regex.Pattern; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Creates Regex Pattern objects. @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; public class XmlPatternAdapter extends XmlAdapter<String, Pattern> { /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Override public Pattern unmarshal(String urlPattern) throws Exception @@ -40,7 +40,7 @@ public class XmlPatternAdapter extends XmlAdapter<String, Pattern> } /** - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Override public String marshal(Pattern pattern) throws Exception diff --git a/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java b/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java index 98f853de..8809a9d2 100644 --- a/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java +++ b/src/test/org/apache/turbine/pipeline/PipelineCreationTest.java @@ -26,9 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/org/apache/turbine/services/urlmapper/model/URLMappingContainerTest.java b/src/test/org/apache/turbine/services/urlmapper/model/URLMappingContainerTest.java index e8a6ec39..31dc81af 100644 --- a/src/test/org/apache/turbine/services/urlmapper/model/URLMappingContainerTest.java +++ b/src/test/org/apache/turbine/services/urlmapper/model/URLMappingContainerTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; import org.junit.Before; import org.junit.Test;
