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

Removing version overrides and further aligning with quarkus versions (#26788)

Browse source 
* elevating wildfly-elytron-http-oidc version management

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* removing testing dependency overrides

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* further version aligment with quarkus

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* adding a resteay-core-spi that can be overriden

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* removing hamcrest override

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

* aligning with 3.7.1

Signed-off-by: Steve Hawkins <shawkins@redhat.com>

---------

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-02-07 11:57:23 -05:00 committed by GitHub
parent 54a55bf1a6
commit 402c7d9b18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
authz/policy-enforcer/pom.xml
View file

@ -30,10 +30,6 @@
<name>Keycloak Authz: Policy Enforcer</name> <name>Keycloak Authz: Policy Enforcer</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties>
<wildfly-elytron.version>2.0.0.Final</wildfly-elytron.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
@ -49,7 +45,6 @@
<dependency> <dependency>
<groupId>org.wildfly.security</groupId> <groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-http-oidc</artifactId> <artifactId>wildfly-elytron-http-oidc</artifactId>
<version>${wildfly-elytron.version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>

1
operator/pom.xml
View file

@ -132,7 +132,6 @@
<dependency> <dependency>
<groupId>org.awaitility</groupId> <groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId> <artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

29
pom.xml
View file

@ -125,7 +125,7 @@
<undertow.version>${undertow-legacy.version}</undertow.version> <undertow.version>${undertow-legacy.version}</undertow.version>
<undertow-legacy.version>2.2.24.Final</undertow-legacy.version> <undertow-legacy.version>2.2.24.Final</undertow-legacy.version>
<undertow-jakarta.version>2.3.2.Final</undertow-jakarta.version> <undertow-jakarta.version>2.3.2.Final</undertow-jakarta.version>
<wildfly-elytron.version>2.2.0.Final</wildfly-elytron.version> <wildfly-elytron.version>2.2.3.Final</wildfly-elytron.version>
<elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version> <elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version>
<jetty94.version>9.4.40.v20210413</jetty94.version> <jetty94.version>9.4.40.v20210413</jetty94.version>
<woodstox.version>6.0.3</woodstox.version> <woodstox.version>6.0.3</woodstox.version>
@ -158,11 +158,11 @@
<!-- Databases - also published to db.adoc as "Tested Version" --> <!-- Databases - also published to db.adoc as "Tested Version" -->
<mysql.version>8.0</mysql.version> <mysql.version>8.0</mysql.version>
<mysql-jdbc.version>8.0.33</mysql-jdbc.version> <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
<postgresql.version>15</postgresql.version> <postgresql.version>15</postgresql.version>
<postgresql-jdbc.version>42.6.0</postgresql-jdbc.version> <postgresql-jdbc.version>42.7.1</postgresql-jdbc.version>
<mariadb.version>10.11</mariadb.version> <mariadb.version>10.11</mariadb.version>
<mariadb-jdbc.version>3.1.4</mariadb-jdbc.version> <mariadb-jdbc.version>3.3.2</mariadb-jdbc.version>
<mssql.version>2022-latest</mssql.version> <mssql.version>2022-latest</mssql.version>
<!-- this is the mssql driver version also used in the Quarkus BOM --> <!-- this is the mssql driver version also used in the Quarkus BOM -->
<mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version> <mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
@ -172,7 +172,6 @@
<!-- Test --> <!-- Test -->
<greenmail.version>2.1.0-alpha-1</greenmail.version> <greenmail.version>2.1.0-alpha-1</greenmail.version>
<hamcrest.version>2.2</hamcrest.version>
<jmeter.version>2.10</jmeter.version> <jmeter.version>2.10</jmeter.version>
<junit.version>4.13.2</junit.version> <junit.version>4.13.2</junit.version>
<picketlink.version>2.7.0.Final</picketlink.version> <picketlink.version>2.7.0.Final</picketlink.version>
@ -181,9 +180,7 @@
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version> <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<xml-apis.version>1.4.01</xml-apis.version> <xml-apis.version>1.4.01</xml-apis.version>
<subethasmtp.version>3.1.7</subethasmtp.version> <subethasmtp.version>3.1.7</subethasmtp.version>
<awaitility.version>4.1.1</awaitility.version>
<assertj-core.version>3.22.0</assertj-core.version> <assertj-core.version>3.22.0</assertj-core.version>
<testcontainers.version>1.17.5</testcontainers.version>
<!-- Maven Plugins --> <!-- Maven Plugins -->
<maven.version>3.9.6</maven.version> <maven.version>3.9.6</maven.version>
@ -496,6 +493,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core-spi</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId> <artifactId>resteasy-multipart-provider</artifactId>
@ -578,12 +580,6 @@
<version>${junit.version}</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
@ -740,7 +736,7 @@
</dependency> </dependency>
<!-- Needed for picketlink perf test --> <!-- Needed for picketlink perf test -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>${mysql-jdbc.version}</version> <version>${mysql-jdbc.version}</version>
<scope>test</scope> <scope>test</scope>
@ -899,6 +895,11 @@
<artifactId>undertow-server</artifactId> <artifactId>undertow-server</artifactId>
<version>${elytron.undertow-server.version}</version> <version>${elytron.undertow-server.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-http-oidc</artifactId>
<version>${wildfly-elytron.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId> <artifactId>liquibase-core</artifactId>

6
quarkus/set-quarkus-version.sh
View file

@ -51,7 +51,7 @@ QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL")
echo "Setting Quarkus version: $QUARKUS_VERSION" echo "Setting Quarkus version: $QUARKUS_VERSION"
$(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version,quarkus.build.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null) $(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version,quarkus.build.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null)
DEPENDENCIES_LIST="resteasy jackson-bom hibernate-orm mysql-jdbc postgresql-jdbc microprofile-metrics-api wildfly-common wildfly-elytron" DEPENDENCIES_LIST=$(grep -oP '(?<=\</).*(?=\.version\>)' ../pom.xml)
echo "Changing dependencies: $DEPENDENCIES_LIST" echo "Changing dependencies: $DEPENDENCIES_LIST"
$(mvn -f ./pom.xml versions:revert 1> /dev/null) $(mvn -f ./pom.xml versions:revert 1> /dev/null)
@ -60,9 +60,9 @@ for dependency in $DEPENDENCIES_LIST; do
VERSION=$(grep -oP "(?<=<$dependency.version>).*(?=</$dependency.version)" <<< "$QUARKUS_BOM") VERSION=$(grep -oP "(?<=<$dependency.version>).*(?=</$dependency.version)" <<< "$QUARKUS_BOM")
if [ "$VERSION" == "" ]; then if [ "$VERSION" == "" ]; then
echo "Failed to resolve version for dependency '$dependency'" echo "Failed to resolve version for dependency '$dependency'"
exit 1 continue;
fi fi
echo "Setting $VERSION to $dependency" echo "Setting $dependency to $VERSION"
mvn versions:set-property -f ../pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null mvn versions:set-property -f ../pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null
mvn versions:set-property -f ./pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null mvn versions:set-property -f ./pom.xml -Dproperty="$dependency".version -DnewVersion="$VERSION" 1> /dev/null
done done

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

@ -462,8 +462,8 @@
<!-- JDBC properties point to "default" JDBC driver for the particular DB --> <!-- JDBC properties point to "default" JDBC driver for the particular DB -->
<!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver --> <!-- For EAP testing, it is recommended to override those with system properties pointing to GAV of more appropriate JDBC driver -->
<!-- for the particular EAP version --> <!-- for the particular EAP version -->
<jdbc.mvn.groupId>mysql</jdbc.mvn.groupId> <jdbc.mvn.groupId>com.mysql</jdbc.mvn.groupId>
<jdbc.mvn.artifactId>mysql-connector-java</jdbc.mvn.artifactId> <jdbc.mvn.artifactId>mysql-connector-j</jdbc.mvn.artifactId>
<jdbc.mvn.version>${mysql-jdbc.version}</jdbc.mvn.version> <jdbc.mvn.version>${mysql-jdbc.version}</jdbc.mvn.version>
<docker.database.image>mysql:${mysql.version}</docker.database.image> <docker.database.image>mysql:${mysql.version}</docker.database.image>
<docker.database.port>3306</docker.database.port> <docker.database.port>3306</docker.database.port>

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

@ -110,7 +110,6 @@
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId> <artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>

1
testsuite/integration-arquillian/tests/pom.xml
View file

@ -1813,6 +1813,7 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>

4
testsuite/utils/pom.xml
View file

@ -264,8 +264,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>${mysql-jdbc.version}</version> <version>${mysql-jdbc.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>