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.

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

Support EAP8 with SAML Adapter Galleon Feature Pack #22824

Merged
merged 6 commits into from
Sep 7, 2023

Conversation

pskopek
Copy link
Contributor

@pskopek pskopek commented Aug 30, 2023

Dependencies used in SAML Adapter Galleon Feature Pack need to be aligned with EAP8.

Closes #22823
Closes #22593
Closes #22623
Closes #22172

<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
<wildfly.core.version>19.0.1.Final</wildfly.core.version>
<!-- Upstream WildFly Versions -->
<upstream.wildfly.version>29.0.0.Final</upstream.wildfly.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a minor note that WildFly 29.0.1.Final was released last week so this could be updated and the Core version below could also be updated to the corresponding 21.1.1.Final version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did it to match EAP8 and ease alignment process.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok makes sense, thanks.

Copy link
Contributor

@fjuma fjuma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pskopek Thanks very much! This looks good to me, I've only added a minor comment about the latest WildFly and Core versions.

@fjuma
Copy link
Contributor

fjuma commented Aug 30, 2023

@jfdenise Just FYI, the SAML adapter fixes have been incorporated in this PR.

@@ -30,13 +30,13 @@
<name>App Server - Wildfly</name>

<properties>
<wildfly.version>23.0.2.Final</wildfly.version>
<wildfly.server.version>23.0.2.Final</wildfly.server.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be updated to a later version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed with @pskopek, this is about the test suite and could/should IMHO be a follow up issue.

pedroigor
pedroigor previously approved these changes Sep 4, 2023
@ghost
Copy link

ghost commented Sep 5, 2023

Unreported flaky test detected

If the below flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.admin.concurrency.ConcurrencyTest#testAllConcurrently

Keycloak CI - Base IT (1)

java.lang.RuntimeException: There were failures in threads. Failures count: 1
	at org.keycloak.testsuite.admin.concurrency.AbstractConcurrencyTest.run(AbstractConcurrencyTest.java:122)
	at org.keycloak.testsuite.admin.concurrency.AbstractConcurrencyTest.run(AbstractConcurrencyTest.java:63)
	at org.keycloak.testsuite.admin.concurrency.AbstractConcurrencyTest.run(AbstractConcurrencyTest.java:59)
	at org.keycloak.testsuite.admin.concurrency.ConcurrencyTest.concurrentTest(ConcurrencyTest.java:60)
...

Report flaky test

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unreported flaky test detected, please review

pskopek and others added 6 commits September 7, 2023 10:25
Signed-off-by: Peter Skopek <pskopek@redhat.com>
…buteDefinition#getAttributeMarshaller method

Closes keycloak#22593

Signed-off-by: Peter Skopek <pskopek@redhat.com>
Signed-off-by: Peter Skopek <pskopek@redhat.com>
…dules

Signed-off-by: Peter Skopek <pskopek@redhat.com>
Copy link
Contributor

@vmuzikar vmuzikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pskopek LGTM from Operator and Quarkus dist perspective. org.wildfly.common:wildfly-common remained on 1.5.4.

Copy link
Contributor

@ahus1 ahus1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - it's quite unrelated to storage.

@ahus1 ahus1 merged commit 35c2d52 into keycloak:main Sep 7, 2023
72 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants