This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_0_X by this push:
new d96622739e Ensure that Console, Enduser and WA Docker images wotk with
JDK 25
d96622739e is described below
commit d96622739e5713de7a5f98c107e1a341af3e2151
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Oct 27 13:19:38 2025 +0100
Ensure that Console, Enduser and WA Docker images wotk with JDK 25
---
docker/console/pom.xml | 6 ++++++
docker/enduser/pom.xml | 6 ++++++
.../main/resources/docker-compose/docker-compose-all.yml | 2 +-
docker/wa/pom.xml | 6 ++++++
pom.xml | 14 ++++++--------
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/docker/console/pom.xml b/docker/console/pom.xml
index 9bc7a504f4..0302ec31c8 100644
--- a/docker/console/pom.xml
+++ b/docker/console/pom.xml
@@ -83,6 +83,12 @@ under the License.
<artifactId>syncope-ext-scimv2-client-console</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${byte-buddy.jdk25.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/docker/enduser/pom.xml b/docker/enduser/pom.xml
index b069410438..4e394af886 100644
--- a/docker/enduser/pom.xml
+++ b/docker/enduser/pom.xml
@@ -72,6 +72,12 @@ under the License.
<artifactId>syncope-ext-oidcc4ui-client-enduser</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${byte-buddy.jdk25.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml
b/docker/src/main/resources/docker-compose/docker-compose-all.yml
index ce63fe1bb7..671b5e6213 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-all.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml
@@ -22,7 +22,7 @@
services:
keymaster:
- image: zookeeper:3.9.3
+ image: zookeeper:3.9.4
restart: always
db:
diff --git a/docker/wa/pom.xml b/docker/wa/pom.xml
index 11665d842c..a2cbd05fcd 100644
--- a/docker/wa/pom.xml
+++ b/docker/wa/pom.xml
@@ -66,6 +66,12 @@ under the License.
<artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>${byte-buddy.jdk25.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index 69e404f941..10ee191975 100644
--- a/pom.xml
+++ b/pom.xml
@@ -471,7 +471,10 @@ under the License.
<curator.version>5.9.0</curator.version>
<zookeeper.version>3.9.4</zookeeper.version>
- <testcontainers.version>1.21.0</testcontainers.version>
+ <byte-buddy.jdk25.version>1.17.8</byte-buddy.jdk25.version>
+ <mockito.jdk25.version>5.20.0</mockito.jdk25.version>
+
+ <testcontainers.version>1.21.3</testcontainers.version>
<zonky.embedded-postgres.version>2.1.1</zonky.embedded-postgres.version>
<zonky.embedded-postgres-binaries.version>17.6.0</zonky.embedded-postgres-binaries.version>
@@ -2469,17 +2472,12 @@ under the License.
<jdk>[25,)</jdk>
</activation>
- <properties>
- <byte-buddy.version>1.17.7</byte-buddy.version>
- <mockito.version>5.20.0</mockito.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>${byte-buddy.version}</version>
+ <version>${byte-buddy.jdk25.version}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
@@ -2490,7 +2488,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>${mockito.version}</version>
+ <version>${mockito.jdk25.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
