Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<version.org.jboss.jboss-msc>1.2.7.SP1</version.org.jboss.jboss-msc>

<version.org.apache.activemq.artemis>2.19.1</version.org.apache.activemq.artemis>
<version.org.apache.activemq.artemis>2.38.0</version.org.apache.activemq.artemis>
<netty-transport-native-epoll-classifier>linux-x86_64</netty-transport-native-epoll-classifier>
<netty-transport-native-kqueue-classifier>osx-x86_64</netty-transport-native-kqueue-classifier>

Expand Down Expand Up @@ -108,6 +108,8 @@
<version.org.jboss.marshalling.api>1.2.3.GA</version.org.jboss.marshalling.api>
<!-- Version 2.0.1.Final which is coming from kie-parent is not compatible with dashbuilder-validator module -->
<version.javax.validation>1.0.0.GA</version.javax.validation>

<version.glassfish.jakarta.json>2.0.1</version.glassfish.jakarta.json>
</properties>

<repositories>
Expand Down Expand Up @@ -1023,6 +1025,12 @@
<version>${version.org.jboss.jboss-msc}</version>
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>${version.glassfish.jakarta.json}</version>
</dependency>

<!-- log4j-to-slf4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,18 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-adapter-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk15on</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions uberfire-structure/uberfire-structure-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<description>UberFire - Structure Backend</description>

<dependencies>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
</dependency>
<!-- dependencies added because of illegal transitive dependency check -->
<dependency>
<groupId>org.uberfire</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down