Merge pull request #328 from ahus1/is-327-compatibilty-jakarta-ee

Upgrade dataset provider to use JakartaEE dependencies used in KC22
keycloak · Apr 28, 2023 · 0989563 · 0989563
2 parents 9889661 + 53e7aff
commit 0989563
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 119 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.keycloak.benchmark</groupId>
     <artifactId>keycloak-benchmark</artifactId>
-    <version>0.9-SNAPSHOT</version>
+    <version>0.10-SNAPSHOT</version>
 
     <properties>
         <scala.version>2.12.10</scala.version>

diff --git a/dataset/pom.xml b/dataset/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-benchmark-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -33,30 +33,12 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
             <scope>provided</scope>
-            <exclusions>
-                <!-- keycloak-services contains the wrong version of resteasy,
-                  -   so we exclude it here and add the dependency in the correct
-                  -   version manually (see ../pom.xml)
-                -->
-                <exclusion>
-                    <artifactId>resteasy-multipart-provider</artifactId>
-                    <groupId>org.jboss.resteasy</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-infinispan</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ws.rs</groupId>
-            <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java
@@ -20,11 +20,11 @@
 
 import java.util.UUID;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
 
 import org.infinispan.Cache;
 import org.infinispan.commons.CacheConfigurationException;

diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java
@@ -22,10 +22,10 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
 
 import org.infinispan.Cache;
 import org.infinispan.client.hotrod.RemoteCache;

diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java
@@ -20,11 +20,11 @@
 
 import java.util.UUID;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
 
 import org.infinispan.Cache;
 import org.infinispan.client.hotrod.RemoteCache;

diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java
@@ -18,8 +18,8 @@
 
 package org.keycloak.benchmark.cache;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.services.resource.RealmResourceProvider;

diff --git a/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java b/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java
@@ -7,11 +7,11 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.jboss.resteasy.annotations.cache.NoCache;
 import org.keycloak.authorization.AuthorizationProvider;
 import org.keycloak.authorization.model.Policy;

diff --git a/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java
@@ -35,13 +35,13 @@
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.annotations.cache.NoCache;
@@ -57,6 +57,7 @@
 import org.keycloak.models.GroupModel;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.KeycloakUriInfo;
 import org.keycloak.models.PasswordPolicy;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RealmProvider;
@@ -87,7 +88,7 @@ public class DatasetResourceProvider implements RealmResourceProvider {
 
     protected HttpRequest httpRequest;
 
-    protected UriInfo uriInfo;
+    protected KeycloakUriInfo uriInfo;
 
     public DatasetResourceProvider(KeycloakSession session) {
         this.baseSession = session;

diff --git a/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java b/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java
@@ -187,7 +187,7 @@ private Process startKeycloak(Path keycloakProvidersFolder, String[] args) throw
             Assert.assertTrue(executable.toFile().exists());
             cli.add(executable.toString());
         }
-        cli.addAll(Arrays.asList("start-dev", "--http-port", Integer.toString(port)));
+        cli.addAll(Arrays.asList("--verbose", "start-dev", "--http-port", Integer.toString(port)));
         cli.addAll(Arrays.asList(args));
         ProcessBuilder processBuilder = new ProcessBuilder(cli);
         processBuilder.environment().put("KEYCLOAK_ADMIN", "admin");

diff --git a/doc/dataset/modules/ROOT/nav.adoc b/doc/dataset/modules/ROOT/nav.adoc
@@ -4,7 +4,6 @@
 * xref:installing-provider.adoc[]
 ** xref:installation/installation-quarkus.adoc[]
 ** xref:installation/installation-minikube.adoc[]
-** xref:installation/installation-wildfly.adoc[]
 * xref:using-provider.adoc[]
 * xref:clearing-caches.adoc[]
 * xref:changing-provider.adoc[]
diff --git a/doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc b/doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc
diff --git a/doc/dataset/modules/ROOT/pages/installing-provider.adoc b/doc/dataset/modules/ROOT/pages/installing-provider.adoc
@@ -13,6 +13,5 @@ A fully scripted installation to be run on a single machine.
 xref:installation/installation-quarkus.adoc[]::
 A custom installation on Keycloak for Quarkus.
 
-xref:installation/installation-wildfly.adoc[]::
-A custom installation on Keycloak for Wildfly.
-
+Installing on Keycloak with a Wildfly distribution is not support from version 0.10 onwards.
+Use a version 0.9 or earlier of this project.
diff --git a/pom.xml b/pom.xml
@@ -3,19 +3,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.keycloak</groupId>
   <artifactId>keycloak-benchmark-parent</artifactId>
-  <version>0.9-SNAPSHOT</version>
+  <version>0.10-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Keycloak Benchmark Parent</name>
   <description>Keycloak Benchmark Parent</description>
 
   <properties>
     <keycloak.version>999.0.0-SNAPSHOT</keycloak.version>
-    <jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec>
     <junit.version>4.13.2</junit.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <resteasy.version>4.7.4.Final</resteasy.version>
     <maven.compiler.target>11</maven.compiler.target>
     <encoding>UTF-8</encoding>
   </properties>
@@ -59,16 +57,6 @@
         <artifactId>keycloak-model-infinispan</artifactId>
         <version>${keycloak.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jboss.resteasy</groupId>
-        <artifactId>resteasy-core</artifactId>
-        <version>${resteasy.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.spec.javax.ws.rs</groupId>
-        <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
-        <version>${jboss-jaxrs-api_2.1_spec}</version>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>