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>
This commit is contained in:
Peter Zaoral 2023-01-17 11:59:41 +01:00 committed by Václav Muzikář
parent 9d217d66a0
commit 4ff2de7f46
5 changed files with 9 additions and 11 deletions

View file

@ -16,8 +16,8 @@
*/ */
package org.keycloak.models.map.storage.jpa; package org.keycloak.models.map.storage.jpa;
import javax.persistence.Column; import jakarta.persistence.Column;
import javax.persistence.MappedSuperclass; import jakarta.persistence.MappedSuperclass;
/** /**
* Enhances {@link JpaAttributeEntity} with value_hash column. * Enhances {@link JpaAttributeEntity} with value_hash column.

View file

@ -89,13 +89,13 @@
<!--JAKARTA--> <!--JAKARTA-->
<jakarta.persistence.version>3.1.0</jakarta.persistence.version> <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.servlet.version>6.0.0</jakarta.servlet.version>
<jakarta.ws.rs.version>3.1.0</jakarta.ws.rs.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.ws.version>4.0.0</jakarta.xml.ws.version>
<jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version> <jakarta.xml.bind.version>4.0.0</jakarta.xml.bind.version>
<jakarta.transaction.version>2.0.1</jakarta.transaction.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> <jakarta.xml.soap.version>3.0.0</jakarta.xml.soap.version>
<servlet.api.30.version>1.0.2.Final</servlet.api.30.version> <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>

View file

@ -16,18 +16,16 @@
~ limitations under the License. ~ 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" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="user-store" transaction-type="JTA"> <persistence-unit name="user-store" transaction-type="JTA">
<class>com.acme.provider.legacy.jpa.entity.Realm</class> <class>com.acme.provider.legacy.jpa.entity.Realm</class>
<properties> <properties>
<property name="hibernate.dialect" value="io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect" /> <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--> <!-- 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="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.hbm2ddl.auto" value="update" />
<property name="hibernate.show_sql" value="false" /> <property name="hibernate.show_sql" value="false" />
</properties> </properties>

View file

@ -42,7 +42,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import javax.ws.rs.BadRequestException; import jakarta.ws.rs.BadRequestException;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;

View file

@ -49,7 +49,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;