#414: move to jakarta as far as possible

oehf · Sep 28, 2023 · cc27002 · cc27002
1 parent 18b2cfb
commit cc27002
Show file tree

Hide file tree

Showing 643 changed files with 2,096 additions and 2,139 deletions.
diff --git a/boot/ipf-atna-spring-boot-starter/pom.xml b/boot/ipf-atna-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
 	<artifactId>ipf-atna-spring-boot-starter</artifactId>

diff --git a/boot/ipf-fhir-r4-spring-boot-starter/pom.xml b/boot/ipf-fhir-r4-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-fhir-r4-spring-boot-starter</artifactId>

diff --git a/...ng-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java b/...ng-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java
@@ -45,7 +45,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CorsFilter;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

diff --git a/...t-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java b/...t-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java
@@ -25,8 +25,8 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.cors.CorsConfiguration;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.*;
 
 /**

diff --git a/boot/ipf-fhir-stu3-spring-boot-starter/pom.xml b/boot/ipf-fhir-stu3-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-fhir-stu3-spring-boot-starter</artifactId>

diff --git a/...ng-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java b/...ng-boot-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirAutoConfiguration.java
@@ -43,7 +43,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CorsFilter;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;

diff --git a/...t-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java b/...t-starter/src/main/java/org/openehealth/ipf/boot/fhir/IpfFhirConfigurationProperties.java
@@ -25,8 +25,8 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.cors.CorsConfiguration;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import java.util.*;
 
 /**

diff --git a/boot/ipf-hl7-spring-boot-starter/pom.xml b/boot/ipf-hl7-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-hl7-spring-boot-starter</artifactId>

diff --git a/boot/ipf-hl7v3-spring-boot-starter/pom.xml b/boot/ipf-hl7v3-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-hl7v3-spring-boot-starter</artifactId>

diff --git a/boot/ipf-hpd-spring-boot-starter/pom.xml b/boot/ipf-hpd-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-hpd-spring-boot-starter</artifactId>

diff --git a/boot/ipf-spring-boot-starter/pom.xml b/boot/ipf-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-spring-boot-starter</artifactId>

diff --git a/boot/ipf-xds-spring-boot-starter/pom.xml b/boot/ipf-xds-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf.boot</groupId>
         <artifactId>ipf-spring-boot</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ipf-xds-spring-boot-starter</artifactId>

diff --git a/boot/pom.xml b/boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openehealth.ipf</groupId>
         <artifactId>ipf</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.openehealth.ipf.boot</groupId>
@@ -19,8 +19,8 @@
         <module>ipf-hl7-spring-boot-starter</module>
         <module>ipf-hl7v3-spring-boot-starter</module>
         <module>ipf-xds-spring-boot-starter</module>
-        <module>ipf-fhir-r4-spring-boot-starter</module>
-		<module>ipf-fhir-stu3-spring-boot-starter</module>
+        <!--<module>ipf-fhir-r4-spring-boot-starter</module>-->
+		<!--<module>ipf-fhir-stu3-spring-boot-starter</module>-->
         <module>ipf-atna-spring-boot-starter</module>
         <module>ipf-hpd-spring-boot-starter</module>
         <module>ipf-xacml20-spring-boot-starter</module>

diff --git a/commons/audit/pom.xml b/commons/audit/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.openehealth.ipf.commons</groupId>
         <artifactId>ipf-commons</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -59,16 +59,19 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
+            <version>${activemq-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-client</artifactId>
+            <artifactId>activemq-client-jakarta</artifactId>
+            <version>${activemq-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-pool</artifactId>
+            <groupId>org.messaginghub</groupId>
+            <artifactId>pooled-jms</artifactId>
+            <version>${pooled-jms-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/.../audit/src/main/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageListener.java b/.../audit/src/main/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageListener.java
@@ -16,16 +16,15 @@
 
 package org.openehealth.ipf.commons.audit.queue;
 
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.TextMessage;
 import org.openehealth.ipf.commons.audit.AuditContext;
 import org.openehealth.ipf.commons.audit.DefaultAuditMetadataProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
 import static java.util.Objects.requireNonNull;
 import static org.openehealth.ipf.commons.audit.queue.AbstractAuditMessageQueue.*;
 

diff --git a/...ons/audit/src/main/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageQueue.java b/...ons/audit/src/main/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageQueue.java
@@ -17,8 +17,8 @@
 
 import org.openehealth.ipf.commons.audit.AuditContext;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.Session;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Session;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...audit/src/test/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageQueueTest.java b/...audit/src/test/java/org/openehealth/ipf/commons/audit/queue/JmsAuditMessageQueueTest.java
@@ -15,12 +15,10 @@
  */
 package org.openehealth.ipf.commons.audit.queue;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.pool.PooledConnectionFactory;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
+import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
 import org.openehealth.ipf.commons.audit.DefaultAuditContext;
 import org.openehealth.ipf.commons.audit.codes.EventOutcomeIndicator;
 import org.openehealth.ipf.commons.audit.event.ApplicationActivityBuilder;
@@ -30,14 +28,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.jms.listener.SimpleMessageListenerContainer;
 
-import javax.jms.MessageListener;
 import java.util.Locale;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Dmytro Rud
  */
+@Disabled("JEE 10")
 public class JmsAuditMessageQueueTest {
 
     private static final Logger LOG = LoggerFactory.getLogger(JmsAuditMessageQueueTest.class);
@@ -80,18 +78,20 @@ public void tearDown() {
 
     @Test
     public void testActiveMQ() throws Exception {
-        var jmsConnectionFactory = new PooledConnectionFactory(JMS_BROKER_URL);
-        MessageListener messageListener = new JmsAuditMessageListener(auditContext);
+        var connectionFactory = new ActiveMQConnectionFactory(JMS_BROKER_URL);
+        var pooledConnectionFactory = new JmsPoolConnectionFactory();
+        pooledConnectionFactory.setConnectionFactory(connectionFactory);
+        var messageListener = new JmsAuditMessageListener(auditContext);
 
         // Setup Consumer
         var messageListenerContainer = new SimpleMessageListenerContainer();
         messageListenerContainer.setupMessageListener(messageListener);
-        messageListenerContainer.setConnectionFactory(jmsConnectionFactory);
+        messageListenerContainer.setConnectionFactory(pooledConnectionFactory);
         messageListenerContainer.setDestinationName(JMS_QUEUE_NAME);
         messageListenerContainer.start();
 
         // Setup producer
-        atnaQueue = new JmsAuditMessageQueue(jmsConnectionFactory, JMS_QUEUE_NAME, null, null);
+        atnaQueue = new JmsAuditMessageQueue(pooledConnectionFactory, JMS_QUEUE_NAME, null, null);
         auditContext.setAuditMessageQueue(atnaQueue);
 
         sendAudit();

diff --git a/commons/core/pom.xml b/commons/core/pom.xml
@@ -9,12 +9,12 @@
     <parent>
         <groupId>org.openehealth.ipf.commons</groupId>
         <artifactId>ipf-commons</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>

diff --git a/commons/core/src/main/java/org/openehealth/ipf/commons/core/ContentMap.java b/commons/core/src/main/java/org/openehealth/ipf/commons/core/ContentMap.java
@@ -15,11 +15,11 @@
  */
 package org.openehealth.ipf.commons.core;
 
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.openehealth.ipf.commons.core.config.TypeConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.annotation.XmlTransient;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/commons/ihe/core/pom.xml b/commons/ihe/core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.openehealth.ipf.commons</groupId>
         <artifactId>ipf-commons-ihe</artifactId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/commons/ihe/fhir/core/pom.xml b/commons/ihe/fhir/core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ipf-commons-ihe-fhir</artifactId>
         <groupId>org.openehealth.ipf.commons</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,6 +16,17 @@
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-server</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.bbottema</groupId>
+                    <artifactId>emailaddress-rfc2822</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.bbottema</groupId>
+            <artifactId>emailaddress-rfc2822</artifactId>
+            <version>2.3.1</version>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
@@ -63,8 +74,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>

diff --git a/...e/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/AbstractPlainProvider.java b/...e/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/AbstractPlainProvider.java
@@ -24,8 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Optional;
 

diff --git a/.../src/main/java/org/openehealth/ipf/commons/ihe/fhir/BatchTransactionResourceProvider.java b/.../src/main/java/org/openehealth/ipf/commons/ihe/fhir/BatchTransactionResourceProvider.java
@@ -21,8 +21,8 @@
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Resource provider for batch requests or transaction requests

diff --git a/commons/ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/FhirProvider.java b/commons/ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/FhirProvider.java
@@ -20,7 +20,7 @@
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 
 import javax.security.cert.X509Certificate;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.util.*;
 
@@ -102,7 +102,7 @@ protected Map<String, Object> enrichParameters(FhirSearchParameters parameters,
         var headers = extractHttpHeaders(httpServletRequest);
         enriched.put(Constants.HTTP_INCOMING_HEADERS, headers);
 
-        var cipherSuite = (String) httpServletRequest.getAttribute("javax.servlet.request.cipher_suite");
+        var cipherSuite = (String) httpServletRequest.getAttribute("jakarta.servlet.request.cipher_suite");
         if (cipherSuite != null) {
             enriched.put(Constants.HTTP_X509_CERTIFICATES, httpServletRequest.getAttribute(X509Certificate.class.getName()));
         }

diff --git a/commons/ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/IpfFhirServlet.java b/commons/ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/IpfFhirServlet.java
@@ -31,8 +31,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
 
 /**
  * HAPI FHIR {@link RestfulServer} implementation, adding a few configuration bits using servlet

diff --git a/.../ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/SharedFhirProvider.java b/.../ihe/fhir/core/src/main/java/org/openehealth/ipf/commons/ihe/fhir/SharedFhirProvider.java
@@ -22,8 +22,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

diff --git a/commons/ihe/fhir/pom.xml b/commons/ihe/fhir/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ipf-commons-ihe</artifactId>
         <groupId>org.openehealth.ipf.commons</groupId>
-        <version>4.8-SNAPSHOT</version>
+        <version>5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>