#414: fixes

oehf · Sep 28, 2023 · cf59e02 · cf59e02
1 parent 855659c
commit cf59e02
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 16 deletions.
diff --git a/.../main/java/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JaxbElementListSerializer.java b/.../main/java/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JaxbElementListSerializer.java
@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.type.SimpleType;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.io.IOException;
 import java.util.List;
 

diff --git a/...s/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JsonTest.groovy b/...s/ihe/hpd/src/test/groovy/org/openehealth/ipf/commons/ihe/hpd/stub/dsmlv2/JsonTest.groovy
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test
 import org.openehealth.ipf.commons.ihe.hpd.HpdValidator
 import org.openehealth.ipf.commons.xml.XmlUtils
 
-import javax.xml.bind.JAXBElement
+import jakarta.xml.bind.JAXBElement
 
 @Slf4j
 class JsonTest {

diff --git a/commons/ihe/ws/pom.xml b/commons/ihe/ws/pom.xml
@@ -123,6 +123,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -11,27 +11,27 @@
         <gpg-plugin-version>1.6</gpg-plugin-version>
         <bouncycastle-version>1.75</bouncycastle-version>
         <brave-version>5.16.0</brave-version>
-        <camel-version>3.21.0</camel-version>
-        <cxf-version>3.6.1</cxf-version>
+        <camel-version>4.0.0-RC1</camel-version>
+        <cxf-version>4.0.2</cxf-version>
         <commons-io-version>2.13.0</commons-io-version>
         <equinox-app.version>1.3.200-v20130910-1609</equinox-app.version>
         <equinox-common.version>3.6.200-v20130402-1505</equinox-common.version>
         <gazelle-hl7v3-jar-version>1.3.7</gazelle-hl7v3-jar-version>
         <groovy-version>4.0.12</groovy-version>
         <hapi-version>2.3</hapi-version>
-        <hapi-fhir-version>6.6.1</hapi-fhir-version>
+        <hapi-fhir-version>6.6.2</hapi-fhir-version>
         <herasaf-version>3.0.2</herasaf-version>
         <ipf-gazelle-version>3.0-SNAPSHOT</ipf-gazelle-version>
         <ipf-oht-mdht-version>1.2.0.201212201425</ipf-oht-mdht-version>
-        <jaxb-version>4.0.2</jaxb-version>
-        <jakarta-jwsapi-version>2.1.0</jakarta-jwsapi-version>
+        <jaxb-version>4.0.3</jaxb-version>
+        <jakarta-jwsapi-version>3.0.0</jakarta-jwsapi-version>
         <jdom-version>2.0.6.1</jdom-version>
         <methanol-version>1.7.0</methanol-version>
         <ph-schematron-version>5.6.5</ph-schematron-version>
         <ph-commons-version>9.5.5</ph-commons-version>
-        <saxon-he-version>11.4</saxon-he-version>
+        <saxon-he-version>12.3</saxon-he-version>
         <simple-syslog-version>0.0.16</simple-syslog-version>
-        <spring-boot-version>3.0.6</spring-boot-version>
+        <spring-boot-version>3.1.2</spring-boot-version>
         <velocity-version>2.3</velocity-version>
         <vertx-version>4.3.8</vertx-version>
         <vibur-version>25.0</vibur-version>

diff --git a/platform-camel/core/pom.xml b/platform-camel/core/pom.xml
@@ -99,6 +99,12 @@
             <version>${activemq-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-spring</artifactId>
+            <version>${activemq-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
@@ -109,6 +115,12 @@
             <artifactId>spring-jms</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- TODO 414: no jakarta server side yet -->
+        <dependency>
+            <groupId>javax.jms</groupId>
+            <artifactId>javax.jms-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/platform-camel/core/src/test/resources/context-camel-transaction-delivery.xml b/platform-camel/core/src/test/resources/context-camel-transaction-delivery.xml
@@ -49,7 +49,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd">
   </bean> 
 
   <bean id="jmsConnectionFactoryDelivery" class="org.apache.activemq.ActiveMQConnectionFactory">
-      <property name="brokerURL" value="tcp://localhost:60001"/>
+      <property name="brokerURL" value="tcp://localhost:60003"/>
       <property name="redeliveryPolicy" ref="redeliveryPolicyDelivery" />
   </bean>
 

diff --git a/platform-camel/core/src/test/resources/context-camel-transaction-process.xml b/platform-camel/core/src/test/resources/context-camel-transaction-process.xml
@@ -49,7 +49,7 @@ http://www.springframework.org/schema/beans/spring-beans.xsd">
   </bean> 
 
   <bean id="jmsConnectionFactoryProcess" class="org.apache.activemq.ActiveMQConnectionFactory">
-      <property name="brokerURL" value="tcp://localhost:60001"/>
+      <property name="brokerURL" value="tcp://localhost:60002"/>
       <property name="redeliveryPolicy" ref="redeliveryPolicyProcess" />
   </bean>
 

diff --git a/pom.xml b/pom.xml
@@ -40,8 +40,8 @@
         <assembly-plugin-version>3.6.0</assembly-plugin-version>
         <build-helper-version>3.4.0</build-helper-version>
         <compiler-plugin-version>3.11.0</compiler-plugin-version>
-        <enforcer-plugin-version>3.4.0</enforcer-plugin-version>
-        <gmavenplus-plugin-version>2.1.0</gmavenplus-plugin-version>
+        <enforcer-plugin-version>3.3.0</enforcer-plugin-version>
+        <gmavenplus-plugin-version>3.0.0</gmavenplus-plugin-version>
 
         <jar-plugin-version>3.3.0</jar-plugin-version>
         <javadoc-plugin-version>3.5.0</javadoc-plugin-version>
@@ -54,14 +54,14 @@
         <site-plugin-version>3.12.1</site-plugin-version>
 
         <!-- Dependency version properties -->
-        <activemq-version>5.18.1</activemq-version>
+        <activemq-version>5.18.2</activemq-version>
         <easymock-version>5.1.0</easymock-version>
-        <guava-version>31.1-jre</guava-version>
+        <guava-version>32.1.1-jre</guava-version>
         <jaspic-api-version>1.1.3</jaspic-api-version>
         <mockserver-version>5.15.0</mockserver-version>
         <pooled-jms-version>3.1.0</pooled-jms-version>
         <quickcheck-version>0.6</quickcheck-version>
-        <tomcat-version>10.1.8</tomcat-version>
+        <tomcat-version>10.1.11</tomcat-version>
         <xbean-spring-version>4.23</xbean-spring-version>
     </properties>