From 4ff2de7f4622f5b859855961281acabf4931725d Mon Sep 17 00:00:00 2001
From: Peter Zaoral <pzaoral@redhat.com>
Date: Tue, 17 Jan 2023 11:59:41 +0100
Subject: [PATCH] Quarkus3 branch sync

18.1.2023:
* applied Quarkus 3 OpenRewrite recipe
* fixed the parts that were missed by the script

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>
---
 .../map/storage/jpa/JpaAttributeEntityWithHashValue.java  | 4 ++--
 pom.xml                                                   | 4 ++--
 .../com/acme/provider/legacy/jpa/entity/persistence.xml   | 8 +++-----
 .../client/policies/ClientPoliciesExecutorTest.java       | 2 +-
 .../testsuite/client/policies/ClientPoliciesTest.java     | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntityWithHashValue.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntityWithHashValue.java
index 2891b7c4cd..076424dfd3 100644
--- a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntityWithHashValue.java
+++ b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/JpaAttributeEntityWithHashValue.java
@@ -16,8 +16,8 @@
  */
 package org.keycloak.models.map.storage.jpa;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * Enhances {@link JpaAttributeEntity} with value_hash column.
diff --git a/pom.xml b/pom.xml
index bfdc60607e..4223098ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,13 +89,13 @@
 
         <!--JAKARTA-->
         <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
-        <jakarta.mail.version>2.1.0</jakarta.mail.version>
+        <jakarta.mail.version>2.1.1</jakarta.mail.version>
         <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
         <jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.version>
         <jakarta.xml.ws.version>4.0.0</jakarta.xml.ws.version>
         <jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version>
         <jakarta.transaction.version>2.0.1</jakarta.transaction.version>
-        <jakarta.activation.version>2.1.0</jakarta.activation.version>
+        <jakarta.activation.version>2.1.1</jakarta.activation.version>
         <jakarta.xml.soap.version>3.0.0</jakarta.xml.soap.version>
 
         <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
diff --git a/quarkus/tests/integration/src/test-providers/resources/com/acme/provider/legacy/jpa/entity/persistence.xml b/quarkus/tests/integration/src/test-providers/resources/com/acme/provider/legacy/jpa/entity/persistence.xml
index 9ceccaeeac..2fda5d447c 100644
--- a/quarkus/tests/integration/src/test-providers/resources/com/acme/provider/legacy/jpa/entity/persistence.xml
+++ b/quarkus/tests/integration/src/test-providers/resources/com/acme/provider/legacy/jpa/entity/persistence.xml
@@ -16,18 +16,16 @@
   ~ limitations under the License.
   -->
 
-<persistence version="2.0"
+<persistence version="3.0"
              xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="
-        http://java.sun.com/xml/ns/persistence
-        http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
     <persistence-unit name="user-store" transaction-type="JTA">
         <class>com.acme.provider.legacy.jpa.entity.Realm</class>
         <properties>
             <property name="hibernate.dialect" value="io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect" />
             <!-- Sets the name of the datasource to be the same as the datasource name in quarkus.properties-->
             <property name="hibernate.connection.datasource" value="user-store" />
-            <property name="javax.persistence.transactionType" value="JTA" />
+            <property name="jakarta.persistence.transactionType" value="JTA" />
             <property name="hibernate.hbm2ddl.auto" value="update" />
             <property name="hibernate.show_sql" value="false" />
         </properties>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java
index 7a49fba289..6398244bfc 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java
@@ -42,7 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.ws.rs.BadRequestException;
+import jakarta.ws.rs.BadRequestException;
 
 import org.apache.http.HttpResponse;
 import org.hamcrest.Matchers;
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java
index 41d0cc1063..41ea3a9416 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java
@@ -49,7 +49,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.hamcrest.Matchers;
 import org.jboss.logging.Logger;