libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Remove WF dependencies, add Jakarta SOAP, fix tests

Browse source 
---
Quarkus3 branch sync no. 13 (11.4.2023)
Resolved conflicts:
IdeaProjects/keycloak/quarkus/pom.xml - Modified
IdeaProjects/keycloak/quarkus/runtime/pom.xml - Modified
This commit is contained in:
Martin Bartoš 2023-03-21 18:23:08 +01:00 committed by Václav Muzikář
parent 5252992384
commit 5b7e9a2603
5 changed files with 16 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
quarkus/pom.xml
View file

@ -39,14 +39,6 @@
-->
<wildfly.common.version>${wildfly-common.version}</wildfly.common.version>
<!--
Java EE dependencies. Not available from JDK 11+.
The dependencies and their versions are the same used by Wildfly distribution.
-->
<org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<sun.saaj-impl.version>1.4.1.SP1</sun.saaj-impl.version>
<org.jvnet.staxex.version>1.8.3</org.jvnet.staxex.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<maven.compiler.release>11</maven.compiler.release>
@ -85,64 +77,6 @@
<artifactId>infinispan-client-hotrod-jakarta</artifactId>
<version>${infinispan.version}</version>
</dependency>
<dependency>
<groupId>io.agroal</groupId>
<artifactId>agroal-api</artifactId>
<version>${io.agroal.version}</version>
</dependency>
<dependency>
<groupId>io.agroal</groupId>
<artifactId>agroal-narayana</artifactId>
<version>${io.agroal.version}</version>
</dependency>
<dependency>
<groupId>io.agroal</groupId>
<artifactId>agroal-pool</artifactId>
<version>${io.agroal.version}</version>
</dependency>
<!-- Dependencies removed from JDK 11 and in compliance with those used by Wildfly. -->
<dependency>
<groupId>org.jboss.spec.javax.xml.bind</groupId>
<artifactId>jboss-jaxb-api_2.3_spec</artifactId>
<version>${org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>${sun.saaj-impl.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jvnet.mimepull</groupId>
<artifactId>mimepull</artifactId>
</exclusion>
<exclusion>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>${org.jvnet.staxex.version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

12
quarkus/runtime/pom.xml
View file

@ -591,6 +591,10 @@
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
@ -657,14 +661,6 @@
<artifactId>nashorn-core</artifactId>
<version>${nashorn.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>

3
testsuite/integration-arquillian/pom.xml
View file

@ -41,7 +41,7 @@
<cache.server.java.home>${java.home}</cache.server.java.home>
<!--component versions-->
<arquillian-core.version>1.7.0.Alpha13</arquillian-core.version>
<arquillian-core.version>1.7.0.Alpha14</arquillian-core.version>
<!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->
<shrinkwrap-resolver.version>3.1.4</shrinkwrap-resolver.version>
<selenium.version>3.14.0</selenium.version>
@ -58,6 +58,7 @@
<version.org.wildfly.extras.creaper>1.6.1</version.org.wildfly.extras.creaper>
<appium.client.version>6.1.0</appium.client.version>
<jakarta.persistence-legacy.version>2.2.3</jakarta.persistence-legacy.version>
<smallrye.jandex.version>3.0.5</smallrye.jandex.version>
<!--migration properties-->
<migration.70.version>1.9.8.Final</migration.70.version>

4
testsuite/integration-arquillian/tests/base/pom.xml
View file

@ -161,9 +161,9 @@
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
<version>2.1.3.Final</version>
<version>${smallrye.jandex.version}</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>

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

@ -56,6 +56,14 @@
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${arquillian-core.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<!-- Ability to compile/run jsp on undertow -->
<groupId>io.undertow.jastow</groupId>