Merge branch '6.0.x'

sync-boot-version.sh

@@ -6,4 +6,4 @@ if [[ "$BOOT_VERSION" == "" ]]; then
   echo "Missing boot-version. Usage: sync-boot-version.sh <boot-version>"
   exit 1
 fi
-find -mindepth 2 -name build.gradle | xargs sed -i -E "s/(id 'org.springframework.boot' version ').*?'/\1$BOOT_VERSION'/"
+find . -mindepth 2 -name build.gradle | xargs sed -i '' -E "s/(id 'org.springframework.boot' version ')[^']+'/\1$BOOT_VERSION'/"

sync-dependency-management.sh

@@ -6,4 +6,4 @@ if [[ "VERSION" == "" ]]; then
   echo "Missing version. Usage: sync-dependency-management.sh <version>"
   exit 1
 fi
-find -mindepth 2 -name build.gradle | xargs sed -i -E "s/(id 'io.spring.dependency-management' version ').*?'/\1$VERSION'/"
+find . -mindepth 2 -name build.gradle | xargs sed -i '' -E "s/(id 'io.spring.dependency-management' version ')[^']+'/\1$VERSION'/"

sync-gradle-properties.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-find -mindepth 2 -name build.gradle | xargs -I {} sh -c "dirname {} | xargs cp gradle.properties"
+find . -mindepth 2 -name build.gradle | xargs -I {} sh -c "dirname {} | xargs cp gradle.properties"

sync-gradle.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-find -mindepth 2 -name "build.gradle*" | xargs dirname | xargs -I{} sh -c "cp './gradlew' {}; cp ./gradlew.bat {} ; cp -r gradle/wrapper {}/gradle/"
+find . -mindepth 2 -name "build.gradle*" | xargs dirname | xargs -I{} sh -c "cp './gradlew' {}; cp ./gradlew.bat {} ; cp -r gradle/wrapper {}/gradle/"

sync-nebula-integtest.sh

@@ -6,4 +6,4 @@ if [[ "VERSION" == "" ]]; then
   echo "Missing version. Usage: sync-nebula-integtest.sh <version>"
   exit 1
 fi
-find -mindepth 2 -name build.gradle | xargs sed -i -E "s/(id 'nebula.integtest' version ').*?'/\1$VERSION'/"
+find . -mindepth 2 -name build.gradle | xargs sed -i '' -E "s/(id 'nebula.integtest' version ')[^']+'/\1$VERSION'/"