Merge pull request #168 from FraunhoferIOSB/feature/dependencyUpdate

bump dependency version
FraunhoferIOSB · Jan 24, 2025 · 9051ef7 · 9051ef7
2 parents bfd0fda + b65cecb
commit 9051ef7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/data-plane-aas/src/test/java/de/fraunhofer/iosb/aas/impl/AllAasDataProcessorFactoryTest.java b/data-plane-aas/src/test/java/de/fraunhofer/iosb/aas/impl/AllAasDataProcessorFactoryTest.java
@@ -20,6 +20,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.exception.ConfigurationException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.EndpointException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.MessageBusException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.exception.PersistenceException;
 import de.fraunhofer.iosb.model.aas.service.Service;
 import de.fraunhofer.iosb.ssl.impl.DefaultSelfSignedCertificateRetriever;
 import de.fraunhofer.iosb.testutils.TestUtils;
@@ -55,7 +56,8 @@ void testSendForeign() throws IOException {
                 // This means the HTTP request went through --> no certificate problems etc.
                 assertNotEquals(500, response.code());
             }
-        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException e) {
+        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException |
+                 PersistenceException e) {
             fail("Failed starting FA³ST service");
         }
     }

diff --git a/...-aas/src/test/java/de/fraunhofer/iosb/aas/impl/RegisteredAasDataProcessorFactoryTest.java b/...-aas/src/test/java/de/fraunhofer/iosb/aas/impl/RegisteredAasDataProcessorFactoryTest.java
@@ -20,6 +20,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.exception.ConfigurationException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.EndpointException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.MessageBusException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.exception.PersistenceException;
 import de.fraunhofer.iosb.model.aas.net.AasAccessUrl;
 import de.fraunhofer.iosb.model.aas.service.Service;
 import de.fraunhofer.iosb.ssl.impl.DefaultSelfSignedCertificateRetriever;
@@ -60,7 +61,8 @@ void testSendRegistered() throws IOException {
                 // This means the HTTP request went through --> no certificate problems etc.
                 assertNotEquals(500, response.code());
             }
-        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException e) {
+        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException |
+                 PersistenceException e) {
             fail("Failed starting FA³ST service");
         }
     }
@@ -85,7 +87,8 @@ void testSendForeign() throws IOException {
                     "certificates.");
         } catch (SSLException sslException) {
             // self-signed
-        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException e) {
+        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException |
+                 PersistenceException e) {
             fail("Failed starting FA³ST service");
         }
     }

diff --git a/.../src/test/java/de/fraunhofer/iosb/ssl/impl/DefaultSelfSignedCertificateRetrieverTest.java b/.../src/test/java/de/fraunhofer/iosb/ssl/impl/DefaultSelfSignedCertificateRetrieverTest.java
@@ -19,6 +19,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.exception.ConfigurationException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.EndpointException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.MessageBusException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.exception.PersistenceException;
 import de.fraunhofer.iosb.testutils.TestUtils;
 import org.eclipse.edc.spi.result.Result;
 import org.junit.jupiter.api.Test;
@@ -51,7 +52,8 @@ void getSelfSignedCertificate() throws MalformedURLException {
         Result<Certificate[]> certResult;
         try (var ignored = new TestUtils().startFaaastService(port)) {
             certResult = new DefaultSelfSignedCertificateRetriever().getSelfSignedCertificate(url);
-        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException e) {
+        } catch (MessageBusException | EndpointException | ConfigurationException | AssetConnectionException |
+                 PersistenceException e) {
             fail("Failed starting FA³ST service");
             return;
         }

diff --git a/data-plane-aas/src/test/java/de/fraunhofer/iosb/testutils/TestUtils.java b/data-plane-aas/src/test/java/de/fraunhofer/iosb/testutils/TestUtils.java
@@ -22,6 +22,7 @@
 import de.fraunhofer.iosb.ilt.faaast.service.exception.ConfigurationException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.EndpointException;
 import de.fraunhofer.iosb.ilt.faaast.service.exception.MessageBusException;
+import de.fraunhofer.iosb.ilt.faaast.service.model.exception.PersistenceException;
 import de.fraunhofer.iosb.ilt.faaast.service.persistence.memory.PersistenceInMemoryConfig;
 import de.fraunhofer.iosb.ilt.faaast.service.starter.util.ServiceConfigHelper;
 import de.fraunhofer.iosb.ssl.impl.DefaultSelfSignedCertificateRetriever;
@@ -53,7 +54,7 @@ public Certificate[] getSelfSignedCertificate() {
      * @return AutoCloseable handle on FA³ST service
      */
     public ServiceHandle startFaaastService(int port) throws ConfigurationException, AssetConnectionException,
-            MessageBusException, EndpointException {
+            MessageBusException, EndpointException, PersistenceException {
         var serviceConfig = new ServiceConfig.Builder()
                 .endpoint(new HttpEndpointConfig.Builder().port(port).build())
                 .persistence(PersistenceInMemoryConfig.builder()
@@ -74,7 +75,7 @@ public static class ServiceHandle implements AutoCloseable {
 
         private final Service service;
 
-        ServiceHandle(Service service) throws MessageBusException, EndpointException {
+        ServiceHandle(Service service) throws MessageBusException, EndpointException, PersistenceException {
             this.service = service;
             this.service.start();
         }

diff --git a/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/aas/FaaastServiceManager.java b/edc-extension4aas/src/main/java/de/fraunhofer/iosb/app/aas/FaaastServiceManager.java
@@ -141,7 +141,7 @@ public void stopService(URL aasServiceUrl) {
 
         try {
             service.start();
-        } catch (MessageBusException | EndpointException faaastServiceException) {
+        } catch (Exception faaastServiceException) {
             throw new EdcException(GENERIC_EXCEPTION_MESSAGE, faaastServiceException);
         }
         return service;

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 javaVersion=17
 group=org.eclipse.edc
-edcVersion=0.10.0
-faaastVersion=1.1.0
+edcVersion=0.10.1
+faaastVersion=1.2.0
 aas4jVersion=1.0.2
 mockitoVersion=5.2.0
 jupiterVersion=5.10.2