Merge branch 'main' of https://github.com/pstaeck/SDCcc into remove-c…

…onsumer-test-related-implementations Conflicts: CHANGELOG.md
Draegerwerk · Apr 5, 2024 · c25ca2f · c25ca2f
2 parents 869638a + 994158d
commit c25ca2f
Show file tree

Hide file tree

Showing 26 changed files with 95 additions and 118 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- sdc-ri version to 6.0.0-SNAPSHOT
+
 ### Removed
 
 - consumer test related implementations

diff --git a/biceps-model/pom.xml b/biceps-model/pom.xml
@@ -29,10 +29,11 @@
             <version>${jakartaXmlBindApiVersion}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${comSunXmlBindVersion}</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxbRuntimeVersion}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -64,7 +65,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${jaxbBuildHelperMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

diff --git a/dpws-model/pom.xml b/dpws-model/pom.xml
@@ -28,10 +28,11 @@
             <version>${jakartaXmlBindApiVersion}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${comSunXmlBindVersion}</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxbRuntimeVersion}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -61,7 +62,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>${jaxbBuildHelperMavenPluginVersion}</version>
                 <executions>
                     <execution>
                         <id>add-source</id>

diff --git a/pom.xml b/pom.xml
@@ -19,8 +19,10 @@
         <changelist>-SNAPSHOT</changelist>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <execPluginVersion>3.1.0</execPluginVersion>
-        <jakartaXmlBindApiVersion>4.0.0</jakartaXmlBindApiVersion>
-        <comSunXmlBindVersion>4.0.1</comSunXmlBindVersion>
+        <jakartaXmlBindApiVersion>4.0.1</jakartaXmlBindApiVersion>
+        <jaxbRuntimeVersion>4.0.4</jaxbRuntimeVersion>
+        <jaxbCoreVersion>4.0.4</jaxbCoreVersion>
+        <jaxbBuildHelperMavenPluginVersion>3.5.0</jaxbBuildHelperMavenPluginVersion>
     </properties>
 
     <build>

diff --git a/sdccc/pom.xml b/sdccc/pom.xml
@@ -15,7 +15,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junitVersion>5.6.0</junitVersion>
         <junitPlatformVersion>1.6.0</junitPlatformVersion>
-        <sdcriVersion>5.0.0</sdcriVersion>
+        <sdcriVersion>6.0.0-SNAPSHOT</sdcriVersion>
         <log4jVersion>2.17.1</log4jVersion>
         <spotbugsVersion>4.7.3</spotbugsVersion>
         <checkstyleConfigDir>../checkstyle</checkstyleConfigDir>
@@ -34,11 +34,6 @@
     </properties>
 
     <repositories>
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/Draegerwerk/t2iapi</url>
-        </repository>
         <repository>
             <id>sonatype</id>
             <name>OSS Sonatype Snapshots</name>
@@ -195,29 +190,19 @@
             <version>${jakartaXmlBindApiVersion}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-core -->
         <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${comSunXmlBindVersion}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
+            <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>${comSunXmlBindVersion}</version>
-            <scope>compile</scope>
+            <version>${jaxbCoreVersion}</version>
         </dependency>
-
-        <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
-        <!-- use older version for sdc-ri -->
+        <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>${jaxbRuntimeVersion}</version>
         </dependency>
 
-
         <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -253,6 +238,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/jakarta.inject/jakarta.inject-api -->
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
     </dependencies>
 
     <reporting>

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java b/sdccc/src/main/java/com/draeger/medical/sdccc/TestSuite.java
@@ -39,6 +39,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.Module;
+import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
 import java.io.File;
@@ -54,7 +55,6 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeoutException;
-import javax.inject.Named;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import org.apache.commons.lang3.SystemUtils;

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/messages/HibernateConfigBase.java b/sdccc/src/main/java/com/draeger/medical/sdccc/messages/HibernateConfigBase.java
@@ -12,10 +12,10 @@
 import com.draeger.medical.sdccc.messages.mapping.ManipulationParameter;
 import com.draeger.medical.sdccc.messages.mapping.MdibVersionGroupEntity;
 import com.draeger.medical.sdccc.messages.mapping.MessageContent;
+import com.google.inject.Singleton;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import javax.inject.Singleton;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/messages/HibernateConfigImpl.java b/sdccc/src/main/java/com/draeger/medical/sdccc/messages/HibernateConfigImpl.java
@@ -8,11 +8,11 @@
 package com.draeger.medical.sdccc.messages;
 
 import com.draeger.medical.sdccc.configuration.TestRunConfig;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 import java.io.File;
 import java.nio.file.Path;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 
 /**
  * Hibernate configuration using a file based backend.

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/messages/ManipulationInfo.java b/sdccc/src/main/java/com/draeger/medical/sdccc/messages/ManipulationInfo.java
@@ -9,10 +9,10 @@
 
 import com.draeger.medical.sdccc.tests.util.ManipulationParameterUtil;
 import com.draeger.medical.t2iapi.ResponseTypes;
+import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import java.util.List;
 import java.util.UUID;
-import javax.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;
 
 /**

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java b/sdccc/src/main/java/com/draeger/medical/sdccc/sdcri/testclient/TestClientUtil.java
@@ -19,11 +19,11 @@
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
+import com.google.inject.name.Named;
 import com.google.inject.util.Modules;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.inject.Named;
 import javax.net.ssl.HostnameVerifier;
 import org.somda.sdc.biceps.guice.DefaultBicepsConfigModule;
 import org.somda.sdc.biceps.guice.DefaultBicepsModule;

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/dpws/direct/DirectMessagingTest.java b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/dpws/direct/DirectMessagingTest.java
@@ -175,7 +175,7 @@ private void sendToAllEpr(final String wsaAction, final int low, final int high)
     @TestIdentifier(EnabledTestConfig.DPWS_R0031)
     @TestDescription("Provokes an wsa:InvalidAddressingHeader SOAP Fault and verifies, that with an anonymous"
             + " reply endpoint the wsa:InvalidAddressingHeader SOAP Fault is not thrown.")
-    void testRequirement0031() throws javax.xml.bind.JAXBException {
+    void testRequirement0031() throws jakarta.xml.bind.JAXBException {
         final var msgUUID = soapUtil.createRandomUuidUri();
         try {
             sendMessageWithReplyToHeader(msgUUID, SOME_REPLY_ENDPOINT);
@@ -198,7 +198,7 @@ void testRequirement0031() throws javax.xml.bind.JAXBException {
     }
 
     private void sendMessageWithReplyToHeader(final String msgId, final String replyUri)
-            throws javax.xml.bind.JAXBException, SoapFaultException {
+            throws jakarta.xml.bind.JAXBException, SoapFaultException {
         final var message =
                 soapUtil.createMessage(ActionConstants.ACTION_GET_MDIB, messageModelFactory.createGetMdib());
 

diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/mdpws/direct/DirectWSDLTest.java b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/mdpws/direct/DirectWSDLTest.java
@@ -694,10 +694,10 @@ protected void sendMustUnderstand(final TestClient testClient, final Object mess
         getService.sendRequestResponse(getMdibRequest);
     }
 
-    private javax.xml.bind.JAXBElement<AttributedURIType> createMustUnderstandNode() {
+    private jakarta.xml.bind.JAXBElement<AttributedURIType> createMustUnderstandNode() {
         final var entry = new AttributedURIType();
         entry.setValue(MUST_UNDERSTAND_TEXT);
         entry.getOtherAttributes().put(Constants.MUST_UNDERSTAND_ATTRIBUTE, "true");
-        return new javax.xml.bind.JAXBElement<>(CUSTOM_NAMESPACE, AttributedURIType.class, entry);
+        return new jakarta.xml.bind.JAXBElement<>(CUSTOM_NAMESPACE, AttributedURIType.class, entry);
     }
 }
diff --git a/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/HostedServiceVerifier.java b/sdccc/src/main/java/com/draeger/medical/sdccc/tests/util/HostedServiceVerifier.java
@@ -101,7 +101,7 @@ public void verifyHostedService(
                         parsedWsdls.containsKey(portTypeName),
                         DUPLICATE_PORT_TYPE_TEMPLATE + " portType " + portTypeName + " service " + serviceId));
                 parsedWsdls.putAll(wsdlPortTypes);
-            } catch (final javax.xml.bind.JAXBException e) {
+            } catch (final jakarta.xml.bind.JAXBException e) {
                 LOG.debug("Could not parse WSDL for service {}", serviceId, e);
                 fail("Could not parse WSDL for service " + serviceId + ". Message: " + e.getMessage());
                 // unreachable, silence warnings