diff --git a/pom.xml b/pom.xml index 69f333d9fa..c74e331db2 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 1.2.7.SP1 - 2.19.1 + 2.38.0 linux-x86_64 osx-x86_64 @@ -108,6 +108,8 @@ 1.2.3.GA 1.0.0.GA + + 2.0.1 @@ -1023,6 +1025,12 @@ ${version.org.jboss.jboss-msc} + + org.glassfish + jakarta.json + ${version.glassfish.jakarta.json} + + org.apache.logging.log4j 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 + 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 + + diff --git a/uberfire-structure/uberfire-structure-backend/pom.xml b/uberfire-structure/uberfire-structure-backend/pom.xml index c849864127..2af4ff98ba 100644 --- a/uberfire-structure/uberfire-structure-backend/pom.xml +++ b/uberfire-structure/uberfire-structure-backend/pom.xml @@ -15,14 +15,14 @@ UberFire - Structure Backend - - jakarta.json - jakarta.json-api - jakarta.ejb jakarta.ejb-api + + org.glassfish + jakarta.json + org.uberfire 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;