Updated to JakartaEE 9

Author: phax

as2-demo-spring-boot/pom.xml

@@ -70,8 +70,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -84,6 +84,14 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>

as2-demo-spring-boot/src/main/java/com/helger/as2demo/springboot/As2SandboxApplication.java

@@ -17,26 +17,16 @@
  */
 package com.helger.as2demo.springboot;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import com.helger.as2servlet.AS2WebAppListener;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-public class As2SandboxApplication implements ServletContextListener
+@ComponentScan
+public class As2SandboxApplication
 {
   public static void main (final String [] args)
   {
     SpringApplication.run (As2SandboxApplication.class, args);
   }
-
-  @Override
-  public void contextDestroyed (final ServletContextEvent sce)
-  {
-    ServletConfig.shutDown ();
-    AS2WebAppListener.staticDestroy ();
-  }
 }

as2-demo-spring-boot/src/main/java/com/helger/as2demo/springboot/ServletConfig.java

@@ -20,13 +20,12 @@
 import java.io.File;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import com.helger.as2lib.exception.AS2Exception;
 import com.helger.as2lib.session.AS2ComponentNotFoundException;
@@ -39,6 +38,10 @@
 import com.helger.web.scope.mgr.WebScopeManager;
 import com.helger.xservlet.AbstractXServlet;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+
 @Configuration
 public class ServletConfig
 {
@@ -139,4 +142,21 @@ public static void shutDown ()
         // we don't care on shut down
       }
   }
+
+  @Component
+  public static class As2Cleanup
+  {
+    @PreDestroy
+    public void onShutdown ()
+    {
+      ServletConfig.shutDown ();
+      AS2WebAppListener.staticDestroy ();
+    }
+  }
+
+  @Bean
+  public As2Cleanup cleanUpBean ()
+  {
+    return new As2Cleanup ();
+  }
 }

as2-demo-spring-boot/src/test/java/com/helger/as2demo/springboot/As2SpringbootApplicationTests.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2018-2023 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ * Idea by: Sergey Yaskov
+ *
+ * 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.
+ */
+package com.helger.as2demo.springboot;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class As2SpringbootApplicationTests
+{
+  @Test
+  void testContextLoads ()
+  {}
+}

as2-demo-spring-boot/src/test/java/com/helger/as2demo/springboot/SPITest.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2018-2023 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ * Idea by: Sergey Yaskov
+ *
+ * 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.
+ */
+package com.helger.as2demo.springboot;
+
+import org.junit.jupiter.api.Test;
+
+import com.helger.commons.mock.SPITestHelper;
+
+/**
+ * Test SPI definitions
+ *
+ * @author Philip Helger
+ */
+public final class SPITest
+{
+  @Test
+  public void testBasic () throws Exception
+  {
+    SPITestHelper.testIfAllSPIImplementationsAreValid ();
+  }
+}

as2-demo-webapp/pom.xml

@@ -54,8 +54,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 

as2-demo-webapp/src/main/java/com/helger/as2/webapp/servlet/AS2MDNReceiveServlet.java

@@ -17,12 +17,13 @@
 package com.helger.as2.webapp.servlet;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;
-import javax.servlet.ServletException;
 
 import com.helger.as2servlet.mdn.AS2MDNReceiveXServletHandlerConstantSession;
 import com.helger.commons.http.EHttpMethod;
 import com.helger.xservlet.AbstractXServlet;
 
+import jakarta.servlet.ServletException;
+
 /**
  * This is the main servlet that takes async AS2 MDN messages and processes
  * them. This servlet is configured to accept only POST requests. The logic for

as2-demo-webapp/src/main/java/com/helger/as2/webapp/servlet/AS2ReceiveServlet.java

@@ -17,12 +17,13 @@
 package com.helger.as2.webapp.servlet;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;
-import javax.servlet.ServletException;
 
 import com.helger.as2servlet.AS2ReceiveXServletHandlerConstantSession;
 import com.helger.commons.http.EHttpMethod;
 import com.helger.xservlet.AbstractXServlet;
 
+import jakarta.servlet.ServletException;
+
 /**
  * This is the main servlet that takes AS2 messages and processes them. This
  * servlet is configured to accept only POST requests. The logic for receiving

as2-demo-webapp/src/main/java/com/helger/as2/webapp/servlet/AS2WebAppListener.java

@@ -17,12 +17,13 @@
 package com.helger.as2.webapp.servlet;
 
 import javax.annotation.Nonnull;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 
 import com.helger.web.scope.mgr.WebScopeManager;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+
 /**
  * A very simple listener, specifically modified for this demo application. Use
  * this as a &lt;listener&gt; in your <code>web.xml</code>.

as2-lib/pom.xml

@@ -79,7 +79,6 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcjmail-jdk18on</artifactId>
-      <version>1.72</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>