From 54852671a3807e111a89a058bcfdb2b9248e7ab0 Mon Sep 17 00:00:00 2001 From: claudemamo <823038+claudemamo@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:15:12 +0200 Subject: [PATCH] feat: resolve https://github.com/smooks/smooks/issues/581 --- .github/workflows/benchmark.yml | 2 +- .github/workflows/ci.yml | 7 +- .github/workflows/codeql-analysis.yml | 2 +- README.adoc | 6 +- api/pom.xml | 9 +- .../main/java/org/smooks/api/Registry.java | 4 +- .../smooks/benchmark/BibliographyVisitor.java | 2 +- core/pom.xml | 6 +- core/src/main/java/org/smooks/Smooks.java | 4 +- .../engine/DefaultApplicationContext.java | 2 +- .../org/smooks/engine/DefaultRegistry.java | 2 +- .../converter/BooleanConverterFactory.java | 2 +- .../converter/EnumTypeConverterFactory.java | 2 +- .../MappingTypeConverterFactory.java | 2 +- .../converter/PreprocessTypeConverter.java | 2 +- .../converter/SqlTimeConverterFactory.java | 2 +- .../converter/StringConverterFactory.java | 2 +- .../StringToBigDecimalConverterFactory.java | 2 +- .../StringToDateConverterFactory.java | 2 +- .../StringToDoubleConverterFactory.java | 2 +- .../StringToIntegerConverterFactory.java | 2 +- .../StringToLongConverterFactory.java | 2 +- ...oXmlGregorianCalendarConverterFactory.java | 2 +- .../DefaultDOMSerializerVisitor.java | 2 +- .../interceptor/ExceptionInterceptor.java | 4 +- .../InterceptorVisitorDefinition.java | 4 +- .../StreamResultWriterInterceptor.java | 4 +- .../interceptor/TextConsumerInterceptor.java | 4 +- .../sax/ng/SimpleSerializerVisitor.java | 2 +- .../PostConstructLifecyclePhase.java | 2 +- .../lifecycle/PreDestroyLifecyclePhase.java | 2 +- .../NameTypeConverterFactoryLookup.java | 2 +- .../MapToResourceConfigFromParentConfig.java | 4 +- .../resource/reader/DelegateReader.java | 4 +- .../resource/reader/XStreamXMLReader.java | 4 +- .../visitor/smooks/NestedSmooksVisitor.java | 6 +- .../smooks/engine/xml/NamespaceManager.java | 2 +- .../java/org/smooks/io/payload/Export.java | 2 +- .../CalendarConverterFactoryTestCase.java | 114 +++++++++++------- .../SqlTimeConverterFactoryTestCase.java | 8 +- .../StringToDateConverterFactoryTestCase.java | 8 +- ...orianCalendarConverterFactoryTestCase.java | 12 +- .../dom/serialize/AddAttributeSerializer.java | 2 +- .../lifecycle/LifecycleManagerTestCase.java | 4 +- pom.xml | 38 ++++-- 45 files changed, 180 insertions(+), 124 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 310bc9732..a2c585723 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 8 + java-version: 11 - name: Benchmark run: | mvn install -B -Dmaven.javadoc.skip=true -DskipTests diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9ea2be28..26971790a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,18 +17,21 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }} GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }} + strategy: + matrix: + java: [ '8', '11' ] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 8 + java-version: ${{ matrix.java }} - name: Build run: | mvn install -pl !benchmark -B -Dmaven.javadoc.skip=true mvn javadoc:aggregate -pl api,commons,tck,core -DreportOutputDirectory=target/site/javadoc/v\${project.version} -DdestDir=smooks -B - name: Deploy - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/master' && matrix.java == '11' run: | echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index df5e96a4f..6db308157 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 8 + java-version: 11 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/README.adoc b/README.adoc index 25d413b43..0a491ee78 100644 --- a/README.adoc +++ b/README.adoc @@ -128,8 +128,8 @@ Smooks 2 introduces the DFDL cartridge and revamps its EDI cartridge, while drop . Replace `org.smooks.cdr.annotation.ConfigParam` annotations with `javax.inject.Inject` annotations: * Substitute the `@ConfigParam` name attribute with the `@javax.inject.Named` annotation. * Wrap `java.util.Optional` around the field to mimic the behaviour of the `@ConfigParam` optional attribute. -. Replace `org.smooks.delivery.annotation.Initialize` annotations with `javax.annotation.PostConstruct` annotations. -. Replace `org.smooks.delivery.annotation.Uninitialize` annotations with `javax.annotation.PreDestroy` annotations. +. Replace `org.smooks.delivery.annotation.Initialize` annotations with `jakarta.annotation.PostConstruct` annotations. +. Replace `org.smooks.delivery.annotation.Uninitialize` annotations with `jakarta.annotation.PreDestroy` annotations. . Replace references to `org.smooks.javabean.DataDecode` with `org.smooks.api.converter.TypeConverterFactory`. . Replace references to `org.smooks.cdr.annotation.Configurator` with `org.smooks.api.lifecycle.LifecycleManager`. . Replace references to `org.smooks.javabean.DataDecoderException` with `org.smooks.api.converter.TypeConverterException`. @@ -2168,4 +2168,4 @@ https://github.com/smooks/smooks/blob/master/CONTRIBUTING.md[Please see the foll Smooks is open source and licensed under the terms of the Apache License Version 2.0, or the GNU Lesser General Public License version 3.0 or later. You may use Smooks according to either of these licenses as is most appropriate for your project. -`SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-or-later` \ No newline at end of file +`SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-or-later` diff --git a/api/pom.xml b/api/pom.xml index 0d4a263c4..d4ce9644f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,4 +12,11 @@ API smooks-api - \ No newline at end of file + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + diff --git a/api/src/main/java/org/smooks/api/Registry.java b/api/src/main/java/org/smooks/api/Registry.java index 81d656dac..820ef972b 100644 --- a/api/src/main/java/org/smooks/api/Registry.java +++ b/api/src/main/java/org/smooks/api/Registry.java @@ -47,7 +47,7 @@ import org.smooks.api.resource.config.ResourceConfigSeq; import org.xml.sax.SAXException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; @@ -133,7 +133,7 @@ public interface Registry { void registerResourceConfigSeq(ResourceConfigSeq resourceConfigSeq); /** - * Cleans up the resources of this Registry and calls the {@link javax.annotation.PreDestroy} method of + * Cleans up the resources of this Registry and calls the {@link jakarta.annotation.PreDestroy} method of * each registered object. */ void close(); diff --git a/benchmark/src/main/java/org/smooks/benchmark/BibliographyVisitor.java b/benchmark/src/main/java/org/smooks/benchmark/BibliographyVisitor.java index 64f82ee2b..74eb96418 100644 --- a/benchmark/src/main/java/org/smooks/benchmark/BibliographyVisitor.java +++ b/benchmark/src/main/java/org/smooks/benchmark/BibliographyVisitor.java @@ -50,7 +50,7 @@ import org.smooks.io.Stream; import org.w3c.dom.Element; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.List; diff --git a/core/pom.xml b/core/pom.xml index 8e1993c1f..2dce415c5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -110,9 +110,9 @@ 1.4.01 - javassist + org.javassist javassist - 3.12.1.GA + 3.29.2-GA test @@ -122,4 +122,4 @@ test - \ No newline at end of file + diff --git a/core/src/main/java/org/smooks/Smooks.java b/core/src/main/java/org/smooks/Smooks.java index 04bc934a1..f6bb2c7f6 100644 --- a/core/src/main/java/org/smooks/Smooks.java +++ b/core/src/main/java/org/smooks/Smooks.java @@ -595,7 +595,7 @@ public ApplicationContext getApplicationContext() { /** * Close this Smooks instance and all associated resources. *

- * Should result in the {@link javax.annotation.PostConstruct uninitialization} + * Should result in the {@link jakarta.annotation.PostConstruct uninitialization} * of all allocated {@link ContentHandler} instances. */ public void close() { @@ -610,4 +610,4 @@ private void assertIsConfigurable() { throw new UnsupportedOperationException("Unsupported call to Smooks instance configuration method after Smooks instance has created an ExecutionContext."); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/DefaultApplicationContext.java b/core/src/main/java/org/smooks/engine/DefaultApplicationContext.java index 75b4be818..7447adceb 100644 --- a/core/src/main/java/org/smooks/engine/DefaultApplicationContext.java +++ b/core/src/main/java/org/smooks/engine/DefaultApplicationContext.java @@ -56,7 +56,7 @@ import org.smooks.api.resource.ContainerResourceLocator; import org.smooks.resource.URIResourceLocator; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.net.URI; import java.util.ArrayList; diff --git a/core/src/main/java/org/smooks/engine/DefaultRegistry.java b/core/src/main/java/org/smooks/engine/DefaultRegistry.java index 865b0c773..905f935ca 100644 --- a/core/src/main/java/org/smooks/engine/DefaultRegistry.java +++ b/core/src/main/java/org/smooks/engine/DefaultRegistry.java @@ -69,7 +69,7 @@ import org.smooks.api.resource.ContainerResourceLocator; import org.xml.sax.SAXException; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/org/smooks/engine/converter/BooleanConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/BooleanConverterFactory.java index 5cfc0833f..82d2d137e 100644 --- a/core/src/main/java/org/smooks/engine/converter/BooleanConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/BooleanConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/smooks/engine/converter/EnumTypeConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/EnumTypeConverterFactory.java index e650369af..d9a2d1f2c 100644 --- a/core/src/main/java/org/smooks/engine/converter/EnumTypeConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/EnumTypeConverterFactory.java @@ -50,7 +50,7 @@ import org.smooks.api.converter.TypeConverterFactory; import org.smooks.support.ClassUtil; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Properties; @Resource(name = "Enum") diff --git a/core/src/main/java/org/smooks/engine/converter/MappingTypeConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/MappingTypeConverterFactory.java index cb91f8220..0cb86af8f 100644 --- a/core/src/main/java/org/smooks/engine/converter/MappingTypeConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/MappingTypeConverterFactory.java @@ -49,7 +49,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Properties; @Resource(name = "Mapping") diff --git a/core/src/main/java/org/smooks/engine/converter/PreprocessTypeConverter.java b/core/src/main/java/org/smooks/engine/converter/PreprocessTypeConverter.java index 76d15d0d4..fc3b97c3d 100644 --- a/core/src/main/java/org/smooks/engine/converter/PreprocessTypeConverter.java +++ b/core/src/main/java/org/smooks/engine/converter/PreprocessTypeConverter.java @@ -52,7 +52,7 @@ import org.smooks.engine.lookup.converter.NameTypeConverterFactoryLookup; import org.smooks.support.ClassUtil; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/org/smooks/engine/converter/SqlTimeConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/SqlTimeConverterFactory.java index eafe8529e..4d76663ab 100644 --- a/core/src/main/java/org/smooks/engine/converter/SqlTimeConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/SqlTimeConverterFactory.java @@ -46,7 +46,7 @@ import org.smooks.api.converter.TypeConverterDescriptor; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.sql.Time; import java.util.Date; diff --git a/core/src/main/java/org/smooks/engine/converter/StringConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringConverterFactory.java index e409d68a1..38c2d0234 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringConverterFactory.java @@ -46,7 +46,7 @@ import org.smooks.api.converter.TypeConverterDescriptor; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; @Resource(name = "String") public class StringConverterFactory implements TypeConverterFactory { diff --git a/core/src/main/java/org/smooks/engine/converter/StringToBigDecimalConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToBigDecimalConverterFactory.java index eea420b82..6fc43cbde 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToBigDecimalConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToBigDecimalConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.math.BigDecimal; import java.math.BigInteger; import java.text.ParseException; diff --git a/core/src/main/java/org/smooks/engine/converter/StringToDateConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToDateConverterFactory.java index f614587d7..c8dca4ae8 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToDateConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToDateConverterFactory.java @@ -46,7 +46,7 @@ import org.smooks.api.converter.TypeConverterDescriptor; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/core/src/main/java/org/smooks/engine/converter/StringToDoubleConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToDoubleConverterFactory.java index d08926fe7..938c990b1 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToDoubleConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToDoubleConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.ParseException; /** diff --git a/core/src/main/java/org/smooks/engine/converter/StringToIntegerConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToIntegerConverterFactory.java index 035068c65..6e2b0fd53 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToIntegerConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToIntegerConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.ParseException; /** diff --git a/core/src/main/java/org/smooks/engine/converter/StringToLongConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToLongConverterFactory.java index cb7c504fd..7db8bdd8d 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToLongConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToLongConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.text.ParseException; /** diff --git a/core/src/main/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactory.java b/core/src/main/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactory.java index 43d6eadf4..d72683dc3 100644 --- a/core/src/main/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactory.java +++ b/core/src/main/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactory.java @@ -47,7 +47,7 @@ import org.smooks.api.converter.TypeConverterException; import org.smooks.api.converter.TypeConverterFactory; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/core/src/main/java/org/smooks/engine/delivery/dom/serialize/DefaultDOMSerializerVisitor.java b/core/src/main/java/org/smooks/engine/delivery/dom/serialize/DefaultDOMSerializerVisitor.java index 6f97769a6..3d33ac4c3 100644 --- a/core/src/main/java/org/smooks/engine/delivery/dom/serialize/DefaultDOMSerializerVisitor.java +++ b/core/src/main/java/org/smooks/engine/delivery/dom/serialize/DefaultDOMSerializerVisitor.java @@ -47,7 +47,7 @@ import org.smooks.io.DomSerializer; import org.w3c.dom.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import javax.inject.Named; import java.io.IOException; diff --git a/core/src/main/java/org/smooks/engine/delivery/interceptor/ExceptionInterceptor.java b/core/src/main/java/org/smooks/engine/delivery/interceptor/ExceptionInterceptor.java index b7cf38639..9a0567545 100644 --- a/core/src/main/java/org/smooks/engine/delivery/interceptor/ExceptionInterceptor.java +++ b/core/src/main/java/org/smooks/engine/delivery/interceptor/ExceptionInterceptor.java @@ -61,7 +61,7 @@ import org.w3c.dom.CharacterData; import org.w3c.dom.Element; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class ExceptionInterceptor extends AbstractInterceptorVisitor implements ElementVisitor, DOMElementVisitor { private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionInterceptor.class); @@ -130,4 +130,4 @@ private void processVisitorException(final Throwable t, final String exceptionMe LOGGER.error(exceptionMessage, t); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/delivery/interceptor/InterceptorVisitorDefinition.java b/core/src/main/java/org/smooks/engine/delivery/interceptor/InterceptorVisitorDefinition.java index 426851aa6..992fe30ea 100644 --- a/core/src/main/java/org/smooks/engine/delivery/interceptor/InterceptorVisitorDefinition.java +++ b/core/src/main/java/org/smooks/engine/delivery/interceptor/InterceptorVisitorDefinition.java @@ -46,7 +46,7 @@ import org.smooks.api.resource.visitor.interceptor.InterceptorVisitor; import org.smooks.engine.lookup.InterceptorVisitorFactoryLookup; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.util.Optional; @@ -82,4 +82,4 @@ public void setClass(Class clazz) { public void setSelector(Optional selector) { this.selector = selector; } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/delivery/interceptor/StreamResultWriterInterceptor.java b/core/src/main/java/org/smooks/engine/delivery/interceptor/StreamResultWriterInterceptor.java index f7ec563e8..321933a00 100644 --- a/core/src/main/java/org/smooks/engine/delivery/interceptor/StreamResultWriterInterceptor.java +++ b/core/src/main/java/org/smooks/engine/delivery/interceptor/StreamResultWriterInterceptor.java @@ -56,7 +56,7 @@ import org.w3c.dom.CharacterData; import org.w3c.dom.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -483,4 +483,4 @@ public void setIdAttributeNode(Attr idAttr, boolean isId) throws DOMException { element.setIdAttributeNode(idAttr, isId); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/delivery/interceptor/TextConsumerInterceptor.java b/core/src/main/java/org/smooks/engine/delivery/interceptor/TextConsumerInterceptor.java index 587264ea3..c429a02ae 100644 --- a/core/src/main/java/org/smooks/engine/delivery/interceptor/TextConsumerInterceptor.java +++ b/core/src/main/java/org/smooks/engine/delivery/interceptor/TextConsumerInterceptor.java @@ -60,7 +60,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; public class TextConsumerInterceptor extends AbstractInterceptorVisitor implements ElementVisitor, InterceptorVisitor { @@ -118,4 +118,4 @@ public void visitChildText(final CharacterData characterData, final ExecutionCon public void visitChildElement(Element childElement, ExecutionContext executionContext) { intercept(visitChildElementInvocation, childElement, executionContext); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/delivery/sax/ng/SimpleSerializerVisitor.java b/core/src/main/java/org/smooks/engine/delivery/sax/ng/SimpleSerializerVisitor.java index ac1271215..700fd8124 100644 --- a/core/src/main/java/org/smooks/engine/delivery/sax/ng/SimpleSerializerVisitor.java +++ b/core/src/main/java/org/smooks/engine/delivery/sax/ng/SimpleSerializerVisitor.java @@ -56,7 +56,7 @@ import org.w3c.dom.EntityReference; import org.w3c.dom.Node; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import javax.inject.Named; import java.io.IOException; diff --git a/core/src/main/java/org/smooks/engine/lifecycle/PostConstructLifecyclePhase.java b/core/src/main/java/org/smooks/engine/lifecycle/PostConstructLifecyclePhase.java index 8ca316f48..3f350c097 100644 --- a/core/src/main/java/org/smooks/engine/lifecycle/PostConstructLifecyclePhase.java +++ b/core/src/main/java/org/smooks/engine/lifecycle/PostConstructLifecyclePhase.java @@ -52,7 +52,7 @@ import org.smooks.engine.injector.Scope; import org.smooks.support.ClassUtil; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/org/smooks/engine/lifecycle/PreDestroyLifecyclePhase.java b/core/src/main/java/org/smooks/engine/lifecycle/PreDestroyLifecyclePhase.java index 735edecf2..16e05caa9 100644 --- a/core/src/main/java/org/smooks/engine/lifecycle/PreDestroyLifecyclePhase.java +++ b/core/src/main/java/org/smooks/engine/lifecycle/PreDestroyLifecyclePhase.java @@ -42,7 +42,7 @@ */ package org.smooks.engine.lifecycle; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; public class PreDestroyLifecyclePhase extends AbstractLifecyclePhase { @Override diff --git a/core/src/main/java/org/smooks/engine/lookup/converter/NameTypeConverterFactoryLookup.java b/core/src/main/java/org/smooks/engine/lookup/converter/NameTypeConverterFactoryLookup.java index 924cdda3f..822ed1ab1 100644 --- a/core/src/main/java/org/smooks/engine/lookup/converter/NameTypeConverterFactoryLookup.java +++ b/core/src/main/java/org/smooks/engine/lookup/converter/NameTypeConverterFactoryLookup.java @@ -45,7 +45,7 @@ import org.smooks.api.converter.TypeConverterFactory; import org.smooks.support.ClassUtil; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/org/smooks/engine/resource/extension/MapToResourceConfigFromParentConfig.java b/core/src/main/java/org/smooks/engine/resource/extension/MapToResourceConfigFromParentConfig.java index 39f0368f2..00738a0c1 100644 --- a/core/src/main/java/org/smooks/engine/resource/extension/MapToResourceConfigFromParentConfig.java +++ b/core/src/main/java/org/smooks/engine/resource/extension/MapToResourceConfigFromParentConfig.java @@ -51,7 +51,7 @@ import org.smooks.api.resource.visitor.dom.DOMVisitBefore; import org.w3c.dom.Element; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.util.EmptyStackException; import java.util.Optional; @@ -121,4 +121,4 @@ public void visitBefore(Element element, ExecutionContext executionContext) thro } ResourceConfigUtil.mapProperty(parentConfig, mapFrom, currentConfig, actualMapTo, defaultValue.orElse(null), executionContext); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/resource/reader/DelegateReader.java b/core/src/main/java/org/smooks/engine/resource/reader/DelegateReader.java index 203f9ff93..76c61c53a 100644 --- a/core/src/main/java/org/smooks/engine/resource/reader/DelegateReader.java +++ b/core/src/main/java/org/smooks/engine/resource/reader/DelegateReader.java @@ -71,7 +71,7 @@ import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -240,4 +240,4 @@ public void parse(final InputSource inputSource) throws IOException, SAXExceptio public void parse(String systemId) throws IOException, SAXException { } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/resource/reader/XStreamXMLReader.java b/core/src/main/java/org/smooks/engine/resource/reader/XStreamXMLReader.java index 55d72737a..6ed6850ed 100644 --- a/core/src/main/java/org/smooks/engine/resource/reader/XStreamXMLReader.java +++ b/core/src/main/java/org/smooks/engine/resource/reader/XStreamXMLReader.java @@ -49,7 +49,7 @@ import org.smooks.io.payload.JavaSource; import org.xml.sax.*; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.io.IOException; import java.util.List; @@ -159,4 +159,4 @@ public void parse(InputSource input) throws IOException, SAXException { public void parse(String systemId) throws IOException, SAXException { xstreamReader.parse(systemId); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/resource/visitor/smooks/NestedSmooksVisitor.java b/core/src/main/java/org/smooks/engine/resource/visitor/smooks/NestedSmooksVisitor.java index cc4554015..7fd121dae 100644 --- a/core/src/main/java/org/smooks/engine/resource/visitor/smooks/NestedSmooksVisitor.java +++ b/core/src/main/java/org/smooks/engine/resource/visitor/smooks/NestedSmooksVisitor.java @@ -84,8 +84,8 @@ import org.w3c.dom.Node; import org.xml.sax.SAXException; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Named; import javax.xml.parsers.DocumentBuilder; @@ -477,4 +477,4 @@ public void preDestroy() { nestedSmooks.close(); } } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/smooks/engine/xml/NamespaceManager.java b/core/src/main/java/org/smooks/engine/xml/NamespaceManager.java index b394d95d8..4ff7b35a0 100644 --- a/core/src/main/java/org/smooks/engine/xml/NamespaceManager.java +++ b/core/src/main/java/org/smooks/engine/xml/NamespaceManager.java @@ -53,7 +53,7 @@ import org.smooks.engine.lookup.ResourceConfigListsLookup; import org.smooks.namespace.NamespaceDeclarationStack; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.util.Properties; diff --git a/core/src/main/java/org/smooks/io/payload/Export.java b/core/src/main/java/org/smooks/io/payload/Export.java index 9333857ee..6c1bc4c35 100644 --- a/core/src/main/java/org/smooks/io/payload/Export.java +++ b/core/src/main/java/org/smooks/io/payload/Export.java @@ -47,7 +47,7 @@ import org.smooks.engine.lookup.ExportsLookup; import org.smooks.support.CollectionsUtil; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import javax.inject.Inject; import java.util.Objects; import java.util.Optional; diff --git a/core/src/test/java/org/smooks/engine/converter/CalendarConverterFactoryTestCase.java b/core/src/test/java/org/smooks/engine/converter/CalendarConverterFactoryTestCase.java index b9910388f..251a4c0d0 100644 --- a/core/src/test/java/org/smooks/engine/converter/CalendarConverterFactoryTestCase.java +++ b/core/src/test/java/org/smooks/engine/converter/CalendarConverterFactoryTestCase.java @@ -6,35 +6,35 @@ * %% * Licensed under the terms of the Apache License Version 2.0, or * the GNU Lesser General Public License version 3.0 or later. - * + * * SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-or-later - * + * * ====================================================================== - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * ====================================================================== - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 3 of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -45,10 +45,14 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledForJreRange; +import org.junit.jupiter.api.condition.EnabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.smooks.api.resource.config.Configurable; import org.smooks.api.converter.TypeConverter; import java.text.ParseException; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Locale; import java.util.Properties; @@ -65,48 +69,72 @@ */ public class CalendarConverterFactoryTestCase { - @Test - public void test_CalendarDecoder() { + @Test + public void testCalendarDecoder() { Properties config = new Properties(); - config.setProperty(DateLocaleAwareTypeConverter.FORMAT, "EEE MMM dd HH:mm:ss z yyyy"); + config.setProperty(DateLocaleAwareTypeConverter.FORMAT, "EEE MMM dd HH:mm:ss z yyyy"); - CalendarConverterFactory calendarConverterFactory = new CalendarConverterFactory(); - config.setProperty(DateLocaleAwareTypeConverter.LOCALE_LANGUAGE_CODE, "en"); - config.setProperty(DateLocaleAwareTypeConverter.LOCALE_COUNTRY_CODE, "IE"); - config.setProperty(DateLocaleAwareTypeConverter.ZONE_ID, "America/New_York"); + CalendarConverterFactory calendarConverterFactory = new CalendarConverterFactory(); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_LANGUAGE_CODE, "en"); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_COUNTRY_CODE, "IE"); + config.setProperty(DateLocaleAwareTypeConverter.ZONE_ID, "America/New_York"); - TypeConverter typeConverter = calendarConverterFactory.createTypeConverter(); - ((Configurable) typeConverter).setConfiguration(config); + TypeConverter typeConverter = calendarConverterFactory.createTypeConverter(); + ((Configurable) typeConverter).setConfiguration(config); - Calendar cal_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Calendar cal_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); - assertEquals(1163616328000L, cal_a.getTimeInMillis()); - assertEquals("Eastern Standard Time", cal_a.getTimeZone().getDisplayName( new Locale("en", "IE") ) ); - Calendar cal_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); - assertNotSame(cal_a, cal_b); - } + assertEquals(1163616328000L, cal_a.getTimeInMillis()); + assertEquals("Eastern Standard Time", cal_a.getTimeZone().getDisplayName(new Locale("en", "IE"))); + Calendar cal_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); + assertNotSame(cal_a, cal_b); + } - @Test - public void test_CalendarDecoder_with_swedish_local() throws ParseException { - final String dateFormat = "EEE MMM dd HH:mm:ss z yyyy"; - final String dateString = "ti mar 04 15:25:07 CET 2008"; + @Test + @EnabledForJreRange(max = JRE.JAVA_10) + public void testCalendarDecoderWithSwedishLocalWhenLessThanJava11() throws ParseException { + final String dateFormat = "EEE MMM dd HH:mm:ss z yyyy"; + final String dateString = "ti mar 04 15:25:07 CET 2008"; Properties config = new Properties(); - CalendarConverterFactory calendarConverterFactory = new CalendarConverterFactory(); + CalendarConverterFactory calendarConverterFactory = new CalendarConverterFactory(); - config.setProperty(DateLocaleAwareTypeConverter.FORMAT, dateFormat ); - config.setProperty(DateLocaleAwareTypeConverter.LOCALE_LANGUAGE_CODE, "sv"); - config.setProperty(DateLocaleAwareTypeConverter.LOCALE_COUNTRY_CODE, "SE"); - config.setProperty(DateLocaleAwareTypeConverter.VERIFY_LOCALE, "true"); + config.setProperty(DateLocaleAwareTypeConverter.FORMAT, dateFormat ); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_LANGUAGE_CODE, "sv"); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_COUNTRY_CODE, "SE"); + config.setProperty(DateLocaleAwareTypeConverter.VERIFY_LOCALE, "true"); - TypeConverter typeConverter = calendarConverterFactory.createTypeConverter(); - ((Configurable) typeConverter).setConfiguration(config); - Calendar cal_a = typeConverter.convert(dateString); - assertEquals("Centraleuropeisk tid", cal_a.getTimeZone().getDisplayName( new Locale("sv", "SE") ) ); + TypeConverter typeConverter = calendarConverterFactory.createTypeConverter(); + ((Configurable) typeConverter).setConfiguration(config); + Calendar cal_a = typeConverter.convert(dateString); + assertEquals("Centraleuropeisk tid", cal_a.getTimeZone().getDisplayName( new Locale("sv", "SE") ) ); - Calendar cal_b = typeConverter.convert(dateString); - assertNotSame(cal_a, cal_b); - } + Calendar cal_b = typeConverter.convert(dateString); + assertNotSame(cal_a, cal_b); + } + + @Test + @EnabledForJreRange(min = JRE.JAVA_11) + public void testCalendarDecoderWithSwedishLocal() throws ParseException { + final String dateFormat = "EEE MMM dd HH:mm:ss z yyyy"; + final String dateString = "tis mars 04 15:25:07 CET 2008"; + + Properties config = new Properties(); + CalendarConverterFactory calendarConverterFactory = new CalendarConverterFactory(); + + config.setProperty(DateLocaleAwareTypeConverter.FORMAT, dateFormat); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_LANGUAGE_CODE, "sv"); + config.setProperty(DateLocaleAwareTypeConverter.LOCALE_COUNTRY_CODE, "SE"); + config.setProperty(DateLocaleAwareTypeConverter.VERIFY_LOCALE, "true"); + + TypeConverter typeConverter = calendarConverterFactory.createTypeConverter(); + ((Configurable) typeConverter).setConfiguration(config); + Calendar cal_a = typeConverter.convert(dateString); + assertEquals("centraleuropeisk normaltid", cal_a.getTimeZone().getDisplayName(new Locale("sv", "SE"))); + + Calendar cal_b = typeConverter.convert(dateString); + assertNotSame(cal_a, cal_b); + } private Locale defaultLocale; private TimeZone defaultTimeZone; @@ -118,16 +146,16 @@ public void setUp() { System.setProperty("file.encoding", "UTF-8"); defaultLocale = Locale.getDefault(); - Locale.setDefault( new Locale("de", "DE") ); + Locale.setDefault(new Locale("de", "DE")); defaultTimeZone = TimeZone.getDefault(); TimeZone.setDefault(TimeZone.getTimeZone("ECT")); - } + } @AfterEach public void tearDown() throws Exception { // Reset the defaults... - System.setProperty("file.encoding",defaultEncoding); + System.setProperty("file.encoding", defaultEncoding); Locale.setDefault(defaultLocale); TimeZone.setDefault(defaultTimeZone); } diff --git a/core/src/test/java/org/smooks/engine/converter/SqlTimeConverterFactoryTestCase.java b/core/src/test/java/org/smooks/engine/converter/SqlTimeConverterFactoryTestCase.java index 6d4f21aed..51a077a59 100644 --- a/core/src/test/java/org/smooks/engine/converter/SqlTimeConverterFactoryTestCase.java +++ b/core/src/test/java/org/smooks/engine/converter/SqlTimeConverterFactoryTestCase.java @@ -59,7 +59,7 @@ public class SqlTimeConverterFactoryTestCase { @Test - public void test_DateDecoder() { + public void testDateDecoder() { Properties config = new Properties(); config.setProperty(DateToStringLocaleAwareConverter.FORMAT, "EEE MMM dd HH:mm:ss z yyyy"); @@ -70,12 +70,12 @@ public void test_DateDecoder() { TypeConverter typeConverter = sqlTimeConverterFactory.createTypeConverter(); ((Configurable) typeConverter).setConfiguration(config); - Object object = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Object object = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertTrue(object instanceof Time); - Time time_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Time time_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertEquals(1163616328000L, time_a.getTime()); - Time date_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Time date_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertNotSame(time_a, date_b); } diff --git a/core/src/test/java/org/smooks/engine/converter/StringToDateConverterFactoryTestCase.java b/core/src/test/java/org/smooks/engine/converter/StringToDateConverterFactoryTestCase.java index 68afc7133..386d2f75c 100644 --- a/core/src/test/java/org/smooks/engine/converter/StringToDateConverterFactoryTestCase.java +++ b/core/src/test/java/org/smooks/engine/converter/StringToDateConverterFactoryTestCase.java @@ -76,9 +76,9 @@ public void test_DateDecoder_01() { TypeConverter typeConverter = stringToDateConverterFactory.createTypeConverter(); ((Configurable) typeConverter).setConfiguration(config); - Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertEquals(1163616328000L, date_a.getTime()); - Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertNotSame(date_a, date_b); } @@ -92,9 +92,9 @@ public void test_DateDecoder_02() { TypeConverter typeConverter = stringToDateConverterFactory.createTypeConverter(); ((Configurable) typeConverter).setConfiguration(config); - Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertEquals(1163616328000L, date_a.getTime()); - Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006"); + Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006"); assertNotSame(date_a, date_b); } diff --git a/core/src/test/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactoryTestCase.java b/core/src/test/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactoryTestCase.java index 1b2bf480e..cd0d86724 100644 --- a/core/src/test/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactoryTestCase.java +++ b/core/src/test/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactoryTestCase.java @@ -64,7 +64,7 @@ public class StringToXmlGregorianCalendarConverterFactoryTestCase { private Locale defaultLocale; @Test - public void test_DateDecoder_01() { + public void testDateDecoder01() { StringToXmlGregorianCalendarConverterFactory stringToXmlGregorianCalendarConverterFactory = new StringToXmlGregorianCalendarConverterFactory(); Properties config = new Properties(); @@ -74,14 +74,14 @@ public void test_DateDecoder_01() { TypeConverter typeConverter = stringToXmlGregorianCalendarConverterFactory.createTypeConverter(); ((Configurable) typeConverter).setConfiguration(config); - Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006").toGregorianCalendar().getTime(); + Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006").toGregorianCalendar().getTime(); assertEquals(1163616328000L, date_a.getTime()); - Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006").toGregorianCalendar().getTime(); + Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006").toGregorianCalendar().getTime(); assertNotSame(date_a, date_b); } @Test - public void test_DateDecoder_02() { + public void testDateDecoder02() { StringToXmlGregorianCalendarConverterFactory stringToXmlGregorianCalendarConverterFactory = new StringToXmlGregorianCalendarConverterFactory(); Properties config = new Properties(); @@ -90,9 +90,9 @@ public void test_DateDecoder_02() { TypeConverter typeConverter = stringToXmlGregorianCalendarConverterFactory.createTypeConverter(); ((Configurable) typeConverter).setConfiguration(config); - Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006").toGregorianCalendar().getTime(); + Date date_a = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006").toGregorianCalendar().getTime(); assertEquals(1163616328000L, date_a.getTime()); - Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 EST 2006").toGregorianCalendar().getTime(); + Date date_b = typeConverter.convert("Wed Nov 15 13:45:28 GMT-05:00 2006").toGregorianCalendar().getTime(); assertNotSame(date_a, date_b); } diff --git a/core/src/test/java/org/smooks/engine/delivery/dom/serialize/AddAttributeSerializer.java b/core/src/test/java/org/smooks/engine/delivery/dom/serialize/AddAttributeSerializer.java index bd8e89782..1b1654901 100644 --- a/core/src/test/java/org/smooks/engine/delivery/dom/serialize/AddAttributeSerializer.java +++ b/core/src/test/java/org/smooks/engine/delivery/dom/serialize/AddAttributeSerializer.java @@ -45,7 +45,7 @@ import org.smooks.io.DomSerializer; import org.w3c.dom.NamedNodeMap; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.io.Writer; diff --git a/core/src/test/java/org/smooks/engine/lifecycle/LifecycleManagerTestCase.java b/core/src/test/java/org/smooks/engine/lifecycle/LifecycleManagerTestCase.java index 6b5471f17..fbc31a429 100644 --- a/core/src/test/java/org/smooks/engine/lifecycle/LifecycleManagerTestCase.java +++ b/core/src/test/java/org/smooks/engine/lifecycle/LifecycleManagerTestCase.java @@ -55,8 +55,8 @@ import org.smooks.engine.injector.Scope; import org.smooks.engine.resource.config.MyContentDeliveryUnit5; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Named; import java.nio.charset.Charset; diff --git a/pom.xml b/pom.xml index 66a555e01..4d3073a57 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - + org.smooks smooks 2.0.0-RC2-SNAPSHOT @@ -14,7 +14,8 @@ https://www.smooks.org - Smooks is an extensible data integration Java framework for building XML and non-XML fragment-based applications. + Smooks is an extensible data integration Java framework for building XML and non-XML fragment-based + applications. @@ -59,8 +60,22 @@ 1.7.25 2.9.0 1.4.20 + + + + post-java-8 + + [9,) + + + --add-opens java.base/java.lang=ALL-UNNAMED + 8 + + + + api commons @@ -68,7 +83,7 @@ core benchmark - + @@ -87,6 +102,7 @@ maven-surefire-plugin 2.22.2 + ${surefireArgLine} false @@ -167,8 +183,10 @@ file://${maven.multiModuleProjectDirectory}/license 2020 Smooks - ========================LICENSE_START================================= - =========================LICENSE_END================================== + ========================LICENSE_START================================= + + =========================LICENSE_END================================== + @@ -237,7 +255,7 @@ - + @@ -281,7 +299,7 @@ smooks-api ${project.version} - + org.smooks smooks-core @@ -299,13 +317,13 @@ xmlunit-core ${xmlunit.version} - + org.mockito mockito-core ${mockito.version} - + org.freemarker freemarker @@ -355,7 +373,7 @@ - + com.google.code.findbugs