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.2.x into 7.0.x #919

Merged
merged 25 commits into from
Nov 11, 2024
Merged

Merge 6.2.x into 7.0.x #919

merged 25 commits into from
Nov 11, 2024

Conversation

jamesfredley
Copy link
Contributor

No description provided.

jeffscottbrown and others added 25 commits January 9, 2024 10:40
* Revert "Update scope.adoc (#509)"

This reverts commit 9b3884d.

* docs: Add note about controller scope
As in org.grails.plugins.datasource.DataSourceGrailsPlugin, configuration name is `grails.transaction.chainedTransactionManager`.
* feat(java): baseline to java 17

* chore: update GRADLE_OPTS
Class grails.cli.GrailsApplicationCommand does not exist. Based on other recently updated commands the correct class is grails.dev.commands.GrailsApplicationCommand

Tested and worked.
Update creatingCustomCommands.adoc
update in preparation for Grails 6.2.1 release and update to Gradle 7.6.4
Update what's included in Grails 6.2.1
Update multipleDatasources.adoc
…docs

Update chainedTransactionManager configuration documentation
# Conflicts:
#	build.gradle
#	buildSrc/build.gradle
#	buildSrc/gradle.properties
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
@jamesfredley jamesfredley merged commit c35af09 into 7.0.x Nov 11, 2024
2 checks passed
@jamesfredley jamesfredley deleted the merge-6.2.x-into-7.0.x branch November 11, 2024 23:51
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.

7 participants