diff --git a/.idea/org.eclipse.openk-usermodules.gridFailureInformation.backend.iml b/.idea/org.eclipse.openk-usermodules.gridFailureInformation.backend.iml
index 14eb0c8a101191c3bbc055c786d7a3b825d11e1e..bb8c3b7576d836dfc3c4ce8f4fb574d1289c25b1 100644
--- a/.idea/org.eclipse.openk-usermodules.gridFailureInformation.backend.iml
+++ b/.idea/org.eclipse.openk-usermodules.gridFailureInformation.backend.iml
@@ -2,7 +2,14 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
- <content url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/SAMO-Interface/logs" />
+ <excludeFolder url="file://$MODULE_DIR$/SARIS-Interface/logs" />
+ <excludeFolder url="file://$MODULE_DIR$/addressImport/logs" />
+ <excludeFolder url="file://$MODULE_DIR$/gfsBackendService/logs" />
+ <excludeFolder url="file://$MODULE_DIR$/gfsBackendService/target" />
+ <excludeFolder url="file://$MODULE_DIR$/stoerungsauskunftInterface/logs" />
+ </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
diff --git a/SAMO-Interface/pom.xml b/SAMO-Interface/pom.xml
index c1b208f07bc88b6490de5f62e1a84b8d6bf706d1..4bf4ecca01c9ababc902f0ed6c294a6653f40442 100644
--- a/SAMO-Interface/pom.xml
+++ b/SAMO-Interface/pom.xml
@@ -25,20 +25,20 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <openfeign.version>4.2.0</openfeign.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <openfeign.version>4.3.0</openfeign.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
</properties>
@@ -85,29 +85,13 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${openfeign.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- manually import updated excluded dependencies -->
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.79</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/SAMO-Interface/pom_backup.xml b/SAMO-Interface/pom_backup.xml
deleted file mode 100644
index bec6dfca43bc2b58c38018ca6835eacba0156f6c..0000000000000000000000000000000000000000
--- a/SAMO-Interface/pom_backup.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *******************************************************************************
- * Copyright (c) 2019 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.2.4.RELEASE</version>
- <relativePath/> <!-- lookup parent from repository -->
- </parent>
- <groupId>org.eclipse.openk</groupId>
- <artifactId>grid-failure-information.backend.saris-interface</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>grid-failure-information.saris-interface</name>
- <description>Grid-Failure-Information Project for openKONSEQUENZ</description>
-
- <properties>
- <skip.asciidoc>false</skip.asciidoc>
- <maven.test.skip>false</maven.test.skip>
-
- <java.version>21</java.version>
- <spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
- <springfox.version>2.9.2</springfox.version>
- <spring-security-test.version>5.2.1.RELEASE</spring-security-test.version>
- <powerMockReflect.version>2.0.0</powerMockReflect.version>
- <sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
- <asciidoctor-maven-plugin-version>1.5.3</asciidoctor-maven-plugin-version>
- <asciidoctorj-pdf-version>1.5.0-alpha.11</asciidoctorj-pdf-version>
- <asciidoctorj-version>1.5.4</asciidoctorj-version>
- <asciidoctorj-diagram-versions>1.5.4.1</asciidoctorj-diagram-versions>
- <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
- <jruby-complete-version>9.0.0.0</jruby-complete-version>
- <mapstruct.version>1.2.0.Final</mapstruct.version>
- <flyway-core.version>6.0.8</flyway-core.version>
- <postgresql.version>42.2.8</postgresql.version>
- <lombock.version>1.18.10</lombock.version>
- <h2.version>1.4.200</h2.version>
- <jsonwebtoken.version>0.9.1</jsonwebtoken.version>
- <openfeign.version>2.2.0.RELEASE</openfeign.version>
- <keycloak-core.version>3.4.2.Final</keycloak-core.version>
- <nexmo.version>5.2.1</nexmo.version>
- <rabbitmq.version>5.2.0</rabbitmq.version>
- </properties>
-
- <dependencies>
- <!-- https://mvnrepository.com/artifact/org.springframework.amqp/spring-rabbit-test -->
- <dependency>
- <groupId>org.springframework.amqp</groupId>
- <artifactId>spring-rabbit-test</artifactId>
- <version>2.2.7.RELEASE</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-amqp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-integration</artifactId>
- <version>2.2.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${springfox.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${springfox.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-reflect</artifactId>
- <version>${powerMockReflect.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-core</artifactId>
- <version>4.2.1.RELEASE</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.rabbitmq</groupId>
- <artifactId>amqp-client</artifactId>
- <version>${rabbitmq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>${openfeign.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
- <version>${openfeign.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-wiremock</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-stream-test-support</artifactId>
- <scope>test</scope>
- </dependency>
-
-
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-dependencies</artifactId>
- <version>${spring-cloud.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco-maven-plugin.version}</version>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <output>file</output>
- <append>true</append>
- <excludes>
- <exclude>**/Globals.*</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>jacoco-initialize</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>jacoco-site</id>
- <phase>verify</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>${sonar-maven-plugin.version}</version>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
diff --git a/SARIS-Interface/pom.xml b/SARIS-Interface/pom.xml
index dde277467b9d71bc18bba814d63f3dbffe7fb1e1..34e5d5e8b88ed363b4625908415c8512cc62367d 100644
--- a/SARIS-Interface/pom.xml
+++ b/SARIS-Interface/pom.xml
@@ -11,20 +11,20 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <openfeign.version>4.2.0</openfeign.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <openfeign.version>4.3.0</openfeign.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
</properties>
@@ -59,29 +59,13 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${openfeign.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- manually import updated excluded dependencies -->
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.79</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
diff --git a/addressImport/pom.xml b/addressImport/pom.xml
index de977690c37f23dc9adca1a9580c7f1ece7ef22e..4be2f52f773265e4fba7283dd54967b2b199d08d 100644
--- a/addressImport/pom.xml
+++ b/addressImport/pom.xml
@@ -25,21 +25,21 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<postgresql.version>42.7.3</postgresql.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
<opencsv.version>5.9</opencsv.version>
diff --git a/deployment/dockercompose/cbd/docker-compose.yml b/deployment/dockercompose/cbd/docker-compose.yml
index 295042279a533ec1d7332c0f07d4469486e20a59..ee7f8644d8815f62bc324fe085c8f646234d24e8 100644
--- a/deployment/dockercompose/cbd/docker-compose.yml
+++ b/deployment/dockercompose/cbd/docker-compose.yml
@@ -70,6 +70,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.contactfe.rule=Host(`cbd.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.contactfe.entrypoints=web"
+ - "traefik.http.services.contactfe.loadbalancer.server.port=9155"
networks:
- openknet
volumes:
diff --git a/deployment/dockercompose/gfi-dmz/docker-compose.yml b/deployment/dockercompose/gfi-dmz/docker-compose.yml
index 54ce5b00d0d6102c754b298630ff996f5283150e..e2a1f78b83eb0a5e4a3a6e0b8ce97f67f9257577 100644
--- a/deployment/dockercompose/gfi-dmz/docker-compose.yml
+++ b/deployment/dockercompose/gfi-dmz/docker-compose.yml
@@ -8,6 +8,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gfiwebcomp.rule=Host(`webcomp.gfi.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.gfiwebcomp.entrypoints=web"
+ - "traefik.http.services.gfiwebcomp.loadbalancer.server.port=3001"
ports:
- "3001:80"
networks:
@@ -21,6 +22,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gfimapapp.rule=Host(`mapapp.gfi.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.gfimapapp.entrypoints=web"
+ - "traefik.http.services.gfimapapp.loadbalancer.server.port=80"
networks:
- openknet
volumes:
@@ -32,6 +34,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gfitableapp.rule=Host(`tableapp.gfi.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.gfitableapp.entrypoints=web"
+ - "traefik.http.services.gfitableapp.loadbalancer.server.port=80"
networks:
- openknet
volumes:
diff --git a/deployment/dockercompose/gfi-dmz/traefik/docker-compose.yml b/deployment/dockercompose/gfi-dmz/traefik/docker-compose.yml
index 300004179b2380db0dfab6f238ea82e8d631e6a3..e2ebf15de69967acebc353f7d6d9d65f1ecbf827 100644
--- a/deployment/dockercompose/gfi-dmz/traefik/docker-compose.yml
+++ b/deployment/dockercompose/gfi-dmz/traefik/docker-compose.yml
@@ -1,7 +1,7 @@
services:
traefik-dmz:
- image: "traefik:v2.9"
+ image: "traefik:v3.4"
container_name: "traefik-dmz"
command:
#- "--log.level=DEBUG"
@@ -26,6 +26,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.whoami.rule=Host(`whoami.localhost`)"
- "traefik.http.routers.whoami.entrypoints=web"
+ - "traefik.http.services.whoami.loadbalancer.server.port=80"
networks:
- openknet
diff --git a/deployment/dockercompose/gfi/docker-compose.yml b/deployment/dockercompose/gfi/docker-compose.yml
index b6382fc7b6180bc0a16336ad42b09f8c2ee41022..3266c851cac007a57c8bce07d44bff724ce4bba4 100644
--- a/deployment/dockercompose/gfi/docker-compose.yml
+++ b/deployment/dockercompose/gfi/docker-compose.yml
@@ -79,7 +79,6 @@ services:
- "traefik.http.middlewares.api-strip.stripprefix.prefixes=/api"
- "traefik.http.routers.gfibe.middlewares=api-strip"
- "traefik.http.routers.gfibe.entrypoints=web"
- # spring server port
- "traefik.http.services.gfibe.loadbalancer.server.port=9156"
ports:
- "9156:9156"
@@ -133,6 +132,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gfimain.rule=Host(`main.gfi.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.gfimain.entrypoints=web"
+ - "traefik.http.services.gfimain.loadbalancer.server.port=4200"
networks:
- openknet
volumes:
diff --git a/deployment/dockercompose/infrastructure/traefik/docker-compose.yml b/deployment/dockercompose/infrastructure/traefik/docker-compose.yml
index f0029acc44f1db812bb33676d3a328169d0dbcad..2e2da8c5fa2d044e9f023e1df709c6e17983ed43 100644
--- a/deployment/dockercompose/infrastructure/traefik/docker-compose.yml
+++ b/deployment/dockercompose/infrastructure/traefik/docker-compose.yml
@@ -1,9 +1,7 @@
-version: '3.5'
-
services:
traefik:
- image: "traefik:v2.9"
+ image: "traefik:v3.4"
container_name: "traefik"
command:
#- "--log.level=DEBUG"
@@ -28,9 +26,11 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.whoami.rule=Host(`whoami.localhost`)"
- "traefik.http.routers.whoami.entrypoints=web"
+ - "traefik.http.services.whoami.loadbalancer.server.port=80"
networks:
- openknet
networks:
openknet:
- name: openknet
\ No newline at end of file
+ name: openknet
+ external: true
diff --git a/deployment/dockercompose/portal/configPortal/backendConfig.json b/deployment/dockercompose/portal/configPortal/backendConfig.json
index 65436ef21f72153ec8c6e5dcd8e1920b8960c5b3..db0510eef4879ebaf1c55ac16b08f1961c89d924 100644
--- a/deployment/dockercompose/portal/configPortal/backendConfig.json
+++ b/deployment/dockercompose/portal/configPortal/backendConfig.json
@@ -5,6 +5,6 @@
"keycloakRealm": "Elogbook",
"keycloakClient": "elogbook-backend",
"keycloakAdmin": "admin",
- "keycloakPW": "admin3",
+ "keycloakPW": "admin",
"maxLoadUsers": 1000
-}
\ No newline at end of file
+}
diff --git a/deployment/dockercompose/portal/docker-compose.yml b/deployment/dockercompose/portal/docker-compose.yml
index ca98d487f5f932018130faac65eaad2ab0307570..8d94eb6a864aebe9b670a972af638f0560e0cfb1 100644
--- a/deployment/dockercompose/portal/docker-compose.yml
+++ b/deployment/dockercompose/portal/docker-compose.yml
@@ -110,13 +110,11 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.portal.rule=Host(`portal.${ROOT_DOMAIN:-localhost}`)"
- "traefik.http.routers.portal.entrypoints=web"
- #- "traefik.http.services.portal.loadbalancer.server.port=8080"
+ - "traefik.http.services.portal.loadbalancer.server.port=8080"
networks:
- openknet
volumes:
- ./configPortal:/configPortal
- # depends_on:
- # - keycloak-service
depends_on:
# keycloak-service:
# condition: service_healthy
@@ -126,5 +124,4 @@ services:
networks:
openknet:
- name: openknet
- driver: bridge
+ external: true
diff --git a/gfsBackendService/pom.xml b/gfsBackendService/pom.xml
index 6d433134aa874fe901a3eeccee1eb8bff5c00e0a..8e9633d8a4303c4fc77f480836b97df653feea14 100644
--- a/gfsBackendService/pom.xml
+++ b/gfsBackendService/pom.xml
@@ -26,23 +26,23 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<flyway-core.version>10.13.0</flyway-core.version>
<postgresql.version>42.7.3</postgresql.version>
- <openfeign.version>4.2.0</openfeign.version>
- <keycloak-core.version>26.0.8</keycloak-core.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <openfeign.version>4.3.0</openfeign.version>
+ <keycloak-core.version>26.1.3</keycloak-core.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
<oracle-database.version>19.6.0.0</oracle-database.version>
@@ -52,7 +52,6 @@
<dependency-check-maven.version>12.1.0</dependency-check-maven.version>
<plexus-utils.version>4.0.2</plexus-utils.version>
<maven-core.version>3.9.9</maven-core.version>
- <spring-context.version>6.2.5</spring-context.version>
<google-guava.version>33.2.1-jre</google-guava.version>
</properties>
<dependencies>
@@ -71,7 +70,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring-context.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -121,12 +119,6 @@
<artifactId>logback-core</artifactId>
<version>1.5.16</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5 -->
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>5.4.2</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/ch.qos.logback/logback-classic -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -151,29 +143,13 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${openfeign.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- manually import updated excluded dependencies -->
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.79</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
@@ -312,7 +288,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring-context.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/mailExport/pom.xml b/mailExport/pom.xml
index 21efaea0aa5eb772e41cc737f048094907dc7f89..d5dd54e6e5187749fab6ad2891a73d60084d6ea1 100644
--- a/mailExport/pom.xml
+++ b/mailExport/pom.xml
@@ -25,20 +25,20 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <openfeign.version>4.2.0</openfeign.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <openfeign.version>4.3.0</openfeign.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
</properties>
@@ -78,29 +78,13 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${openfeign.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- manually import updated excluded dependencies -->
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.79</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/stoerungsauskunftInterface/pom.xml b/stoerungsauskunftInterface/pom.xml
index 00513d18c0c7b30245a6ff03aeeac758e97bd360..f625f1d5f825b673a772306a8bb538a65b49e88c 100644
--- a/stoerungsauskunftInterface/pom.xml
+++ b/stoerungsauskunftInterface/pom.xml
@@ -25,20 +25,20 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<java.version>21</java.version>
<maven.test.skip>false</maven.test.skip>
- <spring-cloud.version>2024.0.0</spring-cloud.version>
+ <spring-cloud.version>2025.0.0</spring-cloud.version>
<powerMockReflect.version>2.0.9</powerMockReflect.version>
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <openfeign.version>4.2.0</openfeign.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <openfeign.version>4.3.0</openfeign.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
</properties>
@@ -74,29 +74,13 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<version>${openfeign.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- manually import updated excluded dependencies -->
- <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk18on</artifactId>
- <version>1.79</version>
- </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.18.0</version>
+ <version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/testImportGridFailures/pom.xml b/testImportGridFailures/pom.xml
index 81632a58a6f795b2916e41cf6be781d30424084f..87e50401abaf3f3684da3348de1887c8e2e2ad9a 100644
--- a/testImportGridFailures/pom.xml
+++ b/testImportGridFailures/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>3.4.4</version>
+ <version>3.5.0</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -37,7 +37,7 @@
<sonar-maven-plugin.version>3.2</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <rabbitmq.version>5.22.0</rabbitmq.version>
+ <rabbitmq.version>5.25.0</rabbitmq.version>
<cyclonedx.version>2.9.1</cyclonedx.version>
<springdoc.version>2.4.0</springdoc.version>
</properties>