Skip to content

Add a Maven profile to remove GELF support - #22797

Merged
vmuzikar merged 1 commit into
keycloak:release/22.0from
mabartos:gelfRemovalBackport
Aug 29, 2023
Merged

Add a Maven profile to remove GELF support#22797
vmuzikar merged 1 commit into
keycloak:release/22.0from
mabartos:gelfRemovalBackport

Conversation

@mabartos

@mabartos mabartos commented Aug 29, 2023

Copy link
Copy Markdown
Member

Closes #22515

Backport of #22615

@mabartos
mabartos requested review from a team as code owners August 29, 2023 14:10
@mabartos
mabartos requested a review from vmuzikar August 29, 2023 14:10
@vmuzikar vmuzikar linked an issue Aug 29, 2023 that may be closed by this pull request
Add a Maven profile to remove GELF support #22515
Closed
vmuzikar
vmuzikar requested changes Aug 29, 2023
View reviewed changes

@vmuzikar vmuzikar left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should we make the product profile activated by a property -Dproduct?
https://github.com/keycloak/keycloak/blob/9d8f334c8eedd22bf062b5ccf7175b8fec21b9db/quarkus/runtime/pom.xml#L728

@mabartos

mabartos commented Aug 29, 2023

Copy link
Copy Markdown
Member Author

@vmuzikar I thought I'd manage all activation of "product" things via the property in a follow-up task. However, I rechecked it, and the only place is here, so I agree to include it in this PR.

@mabartos
mabartos force-pushed the gelfRemovalBackport branch from 9d8f334 to 51aa076 Compare August 29, 2023 14:27
@mabartos

mabartos commented Aug 29, 2023

Copy link
Copy Markdown
Member Author

@vmuzikar done

@vmuzikar

vmuzikar commented Aug 29, 2023

Copy link
Copy Markdown
Contributor

However, I rechecked it, and the only place is here

There seem to be one more:

keycloak/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml

Lines 340 to 376 in aae4569

<profile>
<id>product</id>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>includeProprietaryDependencies</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
<version>${oracle-jdbc.version}</version>
<type>jar</type>
<outputDirectory>${auth.server.home}/providers</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<version>${oracle-jdbc.version}</version>
<type>jar</type>
<outputDirectory>${auth.server.home}/providers</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

Can you please update it too?

@mabartos @vmuzikar
Add a Maven profile to remove GELF support
81ac0aa 
Closes keycloak#22515

Co-authored-by: Václav Muzikář <vmuzikar@redhat.com>
@mabartos
mabartos force-pushed the gelfRemovalBackport branch from 51aa076 to 81ac0aa Compare August 29, 2023 16:20
@mabartos
mabartos requested a review from a team as a code owner August 29, 2023 16:20
@mabartos
mabartos requested a review from a team August 29, 2023 16:20
@ghost ghost added team/core labels Aug 29, 2023
@mabartos

mabartos commented Aug 29, 2023

Copy link
Copy Markdown
Member Author

@vmuzikar Oops. I have some struggles with finding things in IDE these days 😄

vmuzikar
vmuzikar approved these changes Aug 29, 2023
View reviewed changes

@vmuzikar vmuzikar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@mabartos LGTM, thanks!

@ASzc jFYI – product needs to be build with -Dproduct, not just -Pproduct.

@vmuzikar
vmuzikar enabled auto-merge (squash) August 29, 2023 16:24
@vmuzikar
vmuzikar merged commit 76e8b92 into keycloak:release/22.0 Aug 29, 2023
@ghost ghost added the flaky-test label Aug 29, 2023
@ghost

ghost commented Aug 29, 2023

Copy link
Copy Markdown

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.ui.account2.UpdateEmailTest#updateEmailLinkVisibleWithUpdateEmailActionEnabled

Keycloak CI - Account Console IT (firefox)

java.lang.AssertionError: Expected PersonalInfoPage but was Keycloak Account Management (https://localhost:8543/auth/realms/test/account/#/personal-info&state=cd65e64a-7464-4541-bf0d-a99ae8a69222&session_state=3abc9c88-7dc2-438f-9326-5d815766d6ba&code=f85554ad-8bcd-4900-86e6-1979f77270cd.3abc9c88-7dc2-438f-9326-5d815766d6ba.e9b7749a-ab7e-42cb-b8c5-4a7d4706acbc)
	at org.junit.Assert.fail(Assert.java:89)
	at org.junit.Assert.assertTrue(Assert.java:42)
	at org.keycloak.testsuite.page.AbstractPage.assertCurrent(AbstractPage.java:110)
	at jdk.internal.reflect.GeneratedMethodAccessor111.invoke(Unknown Source)
...

Report flaky test

ghost
ghost reviewed Aug 29, 2023
View reviewed changes

@ghost ghost left a comment

Copy link
Copy Markdown

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

This was referenced Sep 4, 2023
Closed
Closed
Closed
@stianst stianst mentioned this pull request Nov 14, 2023
Closed
@stianst stianst mentioned this pull request May 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vmuzikar vmuzikar vmuzikar approved these changes
+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

flaky-test team/cloud-native

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add a Maven profile to remove GELF support

2 participants

@mabartos @vmuzikar