Merge branch '6.4.x' into 6.5.x

This commit is contained in:
Rob Winch 2025-05-20 15:59:40 -05:00
commit 6433f7ecc0
No known key found for this signature in database

View File

@ -14,7 +14,11 @@
# limitations under the License.
#
springBootVersion=3.3.3
<<<<<<< HEAD
version=6.5.1-SNAPSHOT
=======
version=6.4.7-SNAPSHOT
>>>>>>> origin/6.4.x
samplesBranch=main
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true