Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing version overrides and further aligning with quarkus versions #26788

Merged
merged 6 commits into from
Feb 7, 2024
Merged

Removing version overrides and further aligning with quarkus versions #26788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8783a48
elevating wildfly-elytron-http-oidc version management
shawkins Jan 26, 2024
acab431
removing testing dependency overrides
shawkins Jan 26, 2024
3b63317
further version aligment with quarkus
shawkins Jan 26, 2024
b8386ef
adding a resteay-core-spi that can be overriden
shawkins Jan 26, 2024
a1a3db3
removing hamcrest override
shawkins Jan 29, 2024
a2da655
aligning with 3.7.1
shawkins Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions authz/policy-enforcer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
<name>Keycloak Authz: Policy Enforcer</name>
<packaging>jar</packaging>

<properties>
<wildfly-elytron.version>2.0.0.Final</wildfly-elytron.version>
</properties>

<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
Expand All @@ -49,7 +45,6 @@
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-http-oidc</artifactId>
<version>${wildfly-elytron.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
37 changes: 19 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<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>
<resteasy-legacy.version>4.7.7.Final</resteasy-legacy.version>
<resteasy.version>6.2.4.Final</resteasy.version>
<resteasy.version>6.2.7.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20220608.1</owasp.html.sanitizer.version>
<slf4j.version>2.0.6</slf4j.version>
Expand All @@ -125,7 +125,7 @@
<undertow.version>${undertow-legacy.version}</undertow.version>
<undertow-legacy.version>2.2.24.Final</undertow-legacy.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>
<jetty94.version>9.4.40.v20210413</jetty94.version>
<woodstox.version>6.0.3</woodstox.version>
Expand Down Expand Up @@ -156,21 +156,20 @@

<!-- Databases - also published to db.adoc as "Tested 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-jdbc.version>42.6.0</postgresql-jdbc.version>
<postgresql-jdbc.version>42.7.1</postgresql-jdbc.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>
<!-- this is the mssql driver version also used in the Quarkus BOM -->
<mssql-jdbc.version>12.2.0.jre11</mssql-jdbc.version>
<mssql-jdbc.version>12.4.2.jre11</mssql-jdbc.version>
<oracledb.version>19.3</oracledb.version>
<!-- this is the oracle driver version also used in the Quarkus BOM -->
<oracle-jdbc.version>23.2.0.0</oracle-jdbc.version>
<oracle-jdbc.version>23.3.0.23.09</oracle-jdbc.version>

<!-- Test -->
<greenmail.version>2.1.0-alpha-1</greenmail.version>
<hamcrest.version>2.2</hamcrest.version>
<jmeter.version>2.10</jmeter.version>
<junit.version>4.13.2</junit.version>
<picketlink.version>2.7.0.Final</picketlink.version>
Expand All @@ -179,10 +178,8 @@
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<xml-apis.version>1.4.01</xml-apis.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<awaitility.version>4.1.1</awaitility.version>
<assertj-core.version>3.22.0</assertj-core.version>
<testcontainers.version>1.17.5</testcontainers.version>


<!-- Maven Plugins -->
<maven.version>3.9.6</maven.version>
<maven.plugins.version>3.11.0</maven.plugins.version>
Expand Down Expand Up @@ -494,6 +491,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core-spi</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
Expand Down Expand Up @@ -576,12 +578,6 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand Down Expand Up @@ -738,7 +734,7 @@
</dependency>
<!-- Needed for picketlink perf test -->
<dependency>
<groupId>mysql</groupId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql-jdbc.version}</version>
<scope>test</scope>
Expand Down Expand Up @@ -897,6 +893,11 @@
<artifactId>undertow-server</artifactId>
<version>${elytron.undertow-server.version}</version>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-http-oidc</artifactId>
<version>${wildfly-elytron.version}</version>
</dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions quarkus/set-quarkus-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL")
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)

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"
$(mvn -f ./pom.xml versions:revert 1> /dev/null)
Expand All @@ -60,9 +60,9 @@ for dependency in $DEPENDENCIES_LIST; do
VERSION=$(grep -oP "(?<=<$dependency.version>).*(?=</$dependency.version)" <<< "$QUARKUS_BOM")
if [ "$VERSION" == "" ]; then
echo "Failed to resolve version for dependency '$dependency'"
exit 1
continue;
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
done
Expand Down
4 changes: 2 additions & 2 deletions testsuite/integration-arquillian/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@
<!-- 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 the particular EAP version -->
<jdbc.mvn.groupId>mysql</jdbc.mvn.groupId>
<jdbc.mvn.artifactId>mysql-connector-java</jdbc.mvn.artifactId>
<jdbc.mvn.groupId>com.mysql</jdbc.mvn.groupId>
<jdbc.mvn.artifactId>mysql-connector-j</jdbc.mvn.artifactId>
<jdbc.mvn.version>${mysql-jdbc.version}</jdbc.mvn.version>
<docker.database.image>mysql:${mysql.version}</docker.database.image>
<docker.database.port>3306</docker.database.port>
Expand Down
1 change: 0 additions & 1 deletion testsuite/integration-arquillian/tests/base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
1 change: 1 addition & 0 deletions testsuite/integration-arquillian/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,6 +1813,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
Expand Down
4 changes: 2 additions & 2 deletions testsuite/utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql-jdbc.version}</version>
<scope>compile</scope>
</dependency>
Expand Down