libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Use JakartaEE dependencies

Browse source 
---
Quarkus3 branch sync no. 14 (24.4.2023)
Resolved conflicts:
keycloak/pom.xml - Modified
---
Quarkus3 branch sync no. 5 (10.2.2023)
Resolved conflicts:
keycloak/pom.xml - Modified
This commit is contained in:
Martin Bartoš 2023-01-04 16:25:12 +01:00 committed by Václav Muzikář
parent 7cff857238
commit 6118e5cfb7
19 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapters/oidc/installed/pom.xml
View file

@ -68,8 +68,8 @@
<artifactId>resteasy-client</artifactId> <artifactId>resteasy-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.undertow</groupId> <groupId>io.undertow</groupId>

4
adapters/oidc/jaxrs-oauth-client/pom.xml
View file

@ -32,8 +32,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
common/pom.xml
View file

@ -59,8 +59,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.activation</groupId> <groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation</artifactId> <artifactId>jakarta.activation-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

4
examples/providers/domain-extension/pom.xml
View file

@ -57,8 +57,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

4
examples/providers/rest/pom.xml
View file

@ -47,8 +47,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

4
federation/ldap/pom.xml
View file

@ -71,8 +71,8 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
integration/client-cli/admin-cli/pom.xml
View file

@ -133,7 +133,7 @@
</includes> </includes>
</filter> </filter>
<filter> <filter>
<artifact>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec</artifact> <artifact>jakarta.ws.rs:jakarta.ws.rs-api</artifact>
<includes> <includes>
<include>**/**</include> <include>**/**</include>
</includes> </includes>

81
pom.xml
View file

@ -41,7 +41,7 @@
<jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id> <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url> <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
<quarkus.version>2.13.7.Final</quarkus.version> <quarkus.version>3.0.0.Alpha2</quarkus.version>
<project.build-time>${timestamp}</project.build-time> <project.build-time>${timestamp}</project.build-time>
@ -86,12 +86,19 @@
<jackson.version>2.13.4</jackson.version> <jackson.version>2.13.4</jackson.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version> <jackson.databind.version>2.13.4.2</jackson.databind.version>
<jackson.annotations.version>${jackson.version}</jackson.annotations.version> <jackson.annotations.version>${jackson.version}</jackson.annotations.version>
<jakarta.mail.version>1.6.5</jakarta.mail.version>
<jboss-jaxrs-api_2.1_spec>2.0.1.Final</jboss-jaxrs-api_2.1_spec> <!--JAKARTA-->
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
<jakarta.mail.version>2.1.0</jakarta.mail.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>
<jboss.logging.version>3.4.1.Final</jboss.logging.version> <jboss.logging.version>3.4.1.Final</jboss.logging.version>
<jboss.logging.tools.version>2.2.1.Final</jboss.logging.tools.version> <jboss.logging.tools.version>2.2.1.Final</jboss.logging.tools.version>
<jboss.marshalling.version>2.0.11.Final</jboss.marshalling.version> <jboss.marshalling.version>2.0.11.Final</jboss.marshalling.version>
<jboss-transaction-api_1.3_spec>2.0.0.Final</jboss-transaction-api_1.3_spec>
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version> <jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version> <jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
@ -104,7 +111,6 @@
<sun.xml.bind.version>2.3.3-b02</sun.xml.bind.version> <sun.xml.bind.version>2.3.3-b02</sun.xml.bind.version>
<javax.xml.bind.jaxb.version>2.4.0-b180830.0359</javax.xml.bind.jaxb.version> <javax.xml.bind.jaxb.version>2.4.0-b180830.0359</javax.xml.bind.jaxb.version>
<sun.xml.ws.version>2.3.1</sun.xml.ws.version> <sun.xml.ws.version>2.3.1</sun.xml.ws.version>
<sun.activation.version>1.2.2</sun.activation.version>
<org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version> <org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
<undertow.version>2.2.19.Final</undertow.version> <undertow.version>2.2.19.Final</undertow.version>
<wildfly-elytron.version>1.20.3.Final</wildfly-elytron.version> <wildfly-elytron.version>1.20.3.Final</wildfly-elytron.version>
@ -345,35 +351,11 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>${javax.xml.bind.jaxb.version}</version> <version>${javax.xml.bind.jaxb.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>rt</artifactId>
<version>${sun.xml.ws.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>txw2</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.ha</groupId>
<artifactId>ha-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>com.sun.xml.bind.external</groupId> <groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId> <artifactId>rngom</artifactId>
<version>${sun.xml.bind.version}</version> <version>${sun.xml.bind.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${sun.activation.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.jaxb</groupId> <groupId>org.glassfish.jaxb</groupId>
<artifactId>xsom</artifactId> <artifactId>xsom</artifactId>
@ -409,21 +391,44 @@
<artifactId>uap-java</artifactId> <artifactId>uap-java</artifactId>
<version>${ua-parser.version}</version> <version>${ua-parser.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.sun.mail</groupId> <!--JAKARTA-->
<artifactId>jakarta.mail</artifactId> <dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
<version>${jakarta.mail.version}</version> <version>${jakarta.mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>${jboss-transaction-api_1.3_spec}</version> <version>${jakarta.ws.rs.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<version>${jboss-jaxrs-api_2.1_spec}</version> <version>${jakarta.transaction.version}</version>
</dependency> </dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta.xml.ws.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId> <artifactId>resteasy-core</artifactId>

4
quarkus/runtime/pom.xml
View file

@ -590,8 +590,8 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail</artifactId> <artifactId>jakarta.mail-api</artifactId>
<version>${jakarta.mail.version}</version> <version>${jakarta.mail.version}</version>
</dependency> </dependency>
<dependency> <dependency>

8
saml-core-api/pom.xml
View file

@ -50,12 +50,12 @@
<artifactId>xmlsec</artifactId> <artifactId>xmlsec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>rt</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

8
saml-core/pom.xml
View file

@ -75,12 +75,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>rt</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

5
server-spi-private/pom.xml
View file

@ -37,10 +37,11 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId> <artifactId>resteasy-core</artifactId>

4
server-spi/pom.xml
View file

@ -32,8 +32,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

12
services/pom.xml
View file

@ -56,8 +56,8 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail</artifactId> <artifactId>jakarta.mail-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
@ -104,12 +104,12 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>

4
testsuite/integration-arquillian/servers/app-server/tomcat/pom.xml
View file

@ -115,8 +115,8 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jboss-jaxrs-api_3.0_spec</artifactId>
<version>${jboss-jaxrs-api_2.1_spec}</version> <version>${jboss-jaxrs-api_3.0_spec}</version>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>

10
testsuite/integration-arquillian/test-apps/photoz/photoz-restful-api/pom.xml
View file

@ -18,8 +18,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -38,12 +38,6 @@
<version>1.0.0.Final</version> <version>1.0.0.Final</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.0-SP4</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-authz-client</artifactId> <artifactId>keycloak-authz-client</artifactId>

4
testsuite/integration-arquillian/test-apps/servlets/pom.xml
View file

@ -38,8 +38,8 @@
<artifactId>keycloak-core</artifactId> <artifactId>keycloak-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

6
testsuite/integration-arquillian/util/pom.xml
View file

@ -73,9 +73,9 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>1.0.1.Final</version> <version>${jakarta.ws.rs.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

8
testsuite/utils/pom.xml
View file

@ -80,12 +80,12 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.spec.javax.transaction</groupId> <groupId>jakarta.transaction</groupId>
<artifactId>jboss-transaction-api_1.3_spec</artifactId> <artifactId>jakarta.transaction-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>