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

Fixed publish guide issue #12494

Merged
merged 1 commit into from
Apr 29, 2022
Merged

Conversation

rainboyan
Copy link
Contributor

Use Grails 5.0.2 build docs successful, should remove @Nested on macros property.

@Input @Nested Collection macros = []

related commit : 835498f

@puneetbehl puneetbehl merged commit 161a9ff into grails:5.1.x Apr 29, 2022
@tylervz
Copy link

tylervz commented Aug 4, 2022

@puneetbehl @rainboyan This change should be merged into grails:5.2.x/grails:6.0.x as well, right? I'm currently working on a pull request to update one of the Grails guides to Grails 5.2.1 and I copied the gist "https://raw.githubusercontent.com/grails/grails-guides/master/gradle/guide-build.gradle" into the build.gradle file of the project and the publishGuide Gradle task fails when I have classpath "org.grails:grails-docs:5.2.1" with the error:

A problem was found with the configuration of task ':publishGuide' (type 'PublishGuide').
  - Type 'grails.doc.gradle.PublishGuide' property 'macros' has conflicting type annotations declared: @Input, @Nested.

    Reason: The different annotations have different semantics and Gradle cannot determine which one to pick.

    Possible solution: Choose between one of the conflicting annotations.

But the publishGuide task succeeds when I have classpath "org.grails:grails-docs:5.1.9"

Should I just open two more pull requests to merge this same change into grails:5.2.x and grails:6.0.x?

@rainboyan
Copy link
Contributor Author

@tylervz sorry for the late reply. I think it's better to merge branch 5.1.x directly into 5.2.x, to ensure that other PRs will not be missing.
@puneetbehl What do you think?

@rainboyan rainboyan deleted the fix_publish_guide_issue branch September 9, 2022 08:05
jdaugherty added a commit to jdaugherty/grails-core that referenced this pull request Oct 2, 2024
@jdaugherty
Copy link
Contributor

As part of the grails 6.2.x release, we pulled forward this change since it wasn't merged upstream previously.

jdaugherty added a commit that referenced this pull request Oct 2, 2024
Pull forward #12494 fix into 6.2.x that was missed in 5.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants