feat: resolve smooks#581

.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

.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

.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

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`
+`SPDX-License-Identifier: Apache-2.0 OR LGPL-3.0-or-later`

api/pom.xml

@@ -12,4 +12,11 @@
     <name>API</name>
     <artifactId>smooks-api</artifactId>
 
-</project>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+</project>

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 <code>Registry</code> and calls the {@link javax.annotation.PreDestroy} method of
+     * Cleans up the resources of this <code>Registry</code> and calls the {@link jakarta.annotation.PreDestroy} method of
      * each registered object.
      */
     void close();

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;
 

core/pom.xml

@@ -110,9 +110,9 @@
             <version>1.4.01</version>
         </dependency>
         <dependency>
-            <groupId>javassist</groupId>
+            <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.12.1.GA</version>
+            <version>3.29.2-GA</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -122,4 +122,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>

core/src/main/java/org/smooks/Smooks.java

@@ -595,7 +595,7 @@ public ApplicationContext getApplicationContext() {
     /**
      * Close this Smooks instance and all associated resources.
      * <p/>
-     * 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.");
         }
     }
-}
+}

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;

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;

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;
 

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")

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")

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;

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;
 

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<String, String> {

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;

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;

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;

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);
         }
     }
-}
+}

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<? extends InterceptorVisitor> clazz) {
     public void setSelector(Optional<String> selector) {
         this.selector = selector;
     }
-}
+}

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);
         }
     }
-}
+}

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);
     }
-}
+}

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;

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;

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

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;
 

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);
     }
-}
+}