add jakarta namespace

pwachira · Dec 6, 2022 · 3f965ab · 3f965ab
1 parent 1517b42
commit 3f965ab
Show file tree

Hide file tree

Showing 36 changed files with 53 additions and 39 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -10,6 +10,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <name>API</name>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+    </dependencies>
     <artifactId>smooks-api</artifactId>
 
 </project>
diff --git 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 <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();

diff --git 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/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.
      * <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() {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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> {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...c/main/java/org/smooks/engine/converter/StringToXmlGregorianCalendarConverterFactory.java b/...c/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
@@ -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
@@ -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);

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
@@ -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;
 

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
@@ -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;

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
@@ -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 {
 

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
@@ -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
@@ -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
@@ -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
@@ -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/...c/main/java/org/smooks/engine/resource/extension/MapToResourceConfigFromParentConfig.java b/...c/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;

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
@@ -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;

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
@@ -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;

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
@@ -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;

diff --git 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
@@ -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/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
@@ -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
@@ -42,8 +42,8 @@
     </developers>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <gpg.skip>true</gpg.skip>
 
@@ -122,6 +122,7 @@
             </plugins>
         </pluginManagement>
         <plugins>
+<!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -144,6 +145,7 @@
                     </execution>
                 </executions>
             </plugin>
+-->
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -270,6 +272,11 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>2.1.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.smooks</groupId>
                 <artifactId>smooks-commons</artifactId>