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 4.0.x into 5.x.x #12

Merged
merged 18 commits into from
Jan 7, 2025
Merged

Merge 4.0.x into 5.x.x #12

merged 18 commits into from
Jan 7, 2025

Conversation

matrei
Copy link
Collaborator

@matrei matrei commented Jan 7, 2025

No description provided.

matrei and others added 18 commits January 18, 2022 11:21
Pulled in github workflow files from master.
Change SQL type of field AsynchronousMailMessage.alternative from VARCHAR to text to allow for email message which contain more than 256 characters.

(cherry picked from commit 0ab4b0d)
Upgrade Gradle to enable support for using a plugins block in `settings.gradle`.
Add an `.sdkmanrc` file to enable the use of the `sdk env` command, making it easier to set the correct Java version for the project.
Failure: unable to resolve class io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository

Using tasks.named() instead.
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/release.yml
#	README.md
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	gradlew
@matrei matrei changed the title Merge 4.0.x into 5.0.x Merge 4.0.x into 5.x.x Jan 7, 2025
@matrei matrei merged commit afb6903 into 5.x.x Jan 7, 2025
2 checks passed
@matrei matrei deleted the matrei/merge-4.0.x-into-5.0.x branch January 7, 2025 16:27
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.

1 participant