From 19f6607c79d97143de89fe4ebce834f2f2904f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Thu, 23 Oct 2025 13:42:46 +0200 Subject: [PATCH 1/7] Update artemis-jms-client to 2.43.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69f333d9fa..c5517abfc0 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.2.7.SP1 - 2.19.1 + 2.43.0 linux-x86_64 osx-x86_64 From e144e82f8ef38db2d1f061c339790f76a812c430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Thu, 23 Oct 2025 14:01:37 +0200 Subject: [PATCH 2/7] Update artemis-jms-client to 2.38.0 - last version supporting Java 11. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5517abfc0..d7d278a158 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.2.7.SP1 - 2.43.0 + 2.38.0 linux-x86_64 osx-x86_64 From 800dd3663a72f89846a1fe0d64c04643610d586c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Fri, 24 Oct 2025 15:21:33 +0200 Subject: [PATCH 3/7] Fix duplicate classes Enforcer error. --- .../uberfire-security-management-keycloak/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml index ac8f6da4ec..850c229776 100644 --- a/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml +++ b/uberfire-extensions/uberfire-security/uberfire-security-management/uberfire-security-management-keycloak/pom.xml @@ -129,6 +129,20 @@ org.keycloak keycloak-adapter-core + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcutil-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + + From 7a7f8c592c89d981ba28312f48ca728c85f85a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Fri, 24 Oct 2025 15:27:27 +0200 Subject: [PATCH 4/7] Fix duplicate classes Enforcer error. --- .../uberfire-metadata-commons-io/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml b/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml index d6a2ea13e3..c38619f7bb 100644 --- a/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml +++ b/uberfire-extensions/uberfire-metadata/uberfire-metadata-commons-io/pom.xml @@ -178,6 +178,18 @@ javax.ws.rs javax.ws.rs-api + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcutil-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + From 860d5ef77eacc36cb4d1d7e633766e5110e06375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Mon, 27 Oct 2025 13:04:40 +0100 Subject: [PATCH 5/7] Fix tests. --- pom.xml | 8 ++++++++ uberfire-structure/uberfire-structure-backend/pom.xml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index d7d278a158..8680fb66c4 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,8 @@ 1.2.3.GA 1.0.0.GA + + 1.1.4 @@ -1023,6 +1025,12 @@ ${version.org.jboss.jboss-msc} + + org.glassfish + javax.json + ${version.glassfish.javax.json} + + org.apache.logging.log4j diff --git a/uberfire-structure/uberfire-structure-backend/pom.xml b/uberfire-structure/uberfire-structure-backend/pom.xml index c849864127..718900143e 100644 --- a/uberfire-structure/uberfire-structure-backend/pom.xml +++ b/uberfire-structure/uberfire-structure-backend/pom.xml @@ -23,6 +23,10 @@ jakarta.ejb jakarta.ejb-api + + org.glassfish + javax.json + org.uberfire From 3e4d8236c4f56b2cf778c4814b5457fab5a6fe32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Mon, 27 Oct 2025 13:32:49 +0100 Subject: [PATCH 6/7] Fix enforcer fail. --- uberfire-structure/uberfire-structure-backend/pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/uberfire-structure/uberfire-structure-backend/pom.xml b/uberfire-structure/uberfire-structure-backend/pom.xml index 718900143e..70fb87d91e 100644 --- a/uberfire-structure/uberfire-structure-backend/pom.xml +++ b/uberfire-structure/uberfire-structure-backend/pom.xml @@ -15,10 +15,6 @@ UberFire - Structure Backend - - jakarta.json - jakarta.json-api - jakarta.ejb jakarta.ejb-api From ba1dabf933c19a22e5bc1710eca95102e565eff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Tue, 28 Oct 2025 10:39:29 +0100 Subject: [PATCH 7/7] Move to jakarta.json. --- pom.xml | 6 +++--- uberfire-structure/uberfire-structure-backend/pom.xml | 2 +- .../structure/backend/pom/PomJsonReaderDefault.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8680fb66c4..c74e331db2 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 1.0.0.GA - 1.1.4 + 2.0.1 @@ -1027,8 +1027,8 @@ org.glassfish - javax.json - ${version.glassfish.javax.json} + jakarta.json + ${version.glassfish.jakarta.json} diff --git a/uberfire-structure/uberfire-structure-backend/pom.xml b/uberfire-structure/uberfire-structure-backend/pom.xml index 70fb87d91e..2af4ff98ba 100644 --- a/uberfire-structure/uberfire-structure-backend/pom.xml +++ b/uberfire-structure/uberfire-structure-backend/pom.xml @@ -21,7 +21,7 @@ org.glassfish - javax.json + jakarta.json diff --git a/uberfire-structure/uberfire-structure-backend/src/main/java/org/guvnor/structure/backend/pom/PomJsonReaderDefault.java b/uberfire-structure/uberfire-structure-backend/src/main/java/org/guvnor/structure/backend/pom/PomJsonReaderDefault.java index 42fc2525c3..63ce5de3ed 100644 --- a/uberfire-structure/uberfire-structure-backend/src/main/java/org/guvnor/structure/backend/pom/PomJsonReaderDefault.java +++ b/uberfire-structure/uberfire-structure-backend/src/main/java/org/guvnor/structure/backend/pom/PomJsonReaderDefault.java @@ -20,10 +20,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.guvnor.structure.pom.DependencyType; import org.guvnor.structure.pom.DynamicPomDependency;