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

Merge 6.1.x into 7.0.x #1044

Merged
merged 15 commits into from
Dec 10, 2024
Merged

Merge 6.1.x into 7.0.x #1044

merged 15 commits into from
Dec 10, 2024

Conversation

jamesfredley
Copy link
Contributor

@jamesfredley jamesfredley commented Dec 6, 2024

This PR is failing for reasons which appear to be unrelated to merging these changes up.

matrei and others added 14 commits December 3, 2024 21:18
This class was converted to Java from Groovy in 6ac0d99,
and it was probably missed to add the `public` access modifier.

This caused a problem for the javadoc generation.
set nexusUrl directly like in grails-core
set nexusURL to string which is later converted to URI
# Conflicts:
#	gradle.properties
#	gradle/buildsrc.libs.versions.toml
#	gradle/libs.versions.toml
#	plugin/src/main/groovy/grails/plugin/springsecurity/SecurityFilterPosition.java
@jamesfredley jamesfredley self-assigned this Dec 6, 2024
@jamesfredley jamesfredley changed the title Merge 6.1.x into 7.0.x 12 6 2024 Merge 6.1.x into 7.0.x Dec 6, 2024
@matrei matrei mentioned this pull request Dec 8, 2024
Copy link
Contributor

@matrei matrei left a comment

Choose a reason for hiding this comment

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

We can merge this and fix the tests errors afterwards.

@jamesfredley jamesfredley merged commit 091859e into 7.0.x Dec 10, 2024
4 of 14 checks passed
@jamesfredley jamesfredley deleted the merge-6.1.x-into-7.0.x-12-6-2024 branch December 10, 2024 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants