diff --git a/.dependabot/config.yml b/.dependabot/config.yml index e55caed15f409..3192e5aeaba2a 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -183,6 +183,11 @@ update_configs: update_schedule: "daily" default_labels: - "area/dependencies" + - package_manager: "java:gradle" + directory: "/integration-tests/gradle" + update_schedule: "daily" + default_labels: + - "area/dependencies" # 1.3 - package_manager: "java:maven" diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml index d34133e16271d..dea2070daacbe 100644 --- a/.github/boring-cyborg.yml +++ b/.github/boring-cyborg.yml @@ -97,6 +97,7 @@ labelPRBasedOnFilePath: - extensions/funqy/**/* area/gradle: - devtools/gradle/**/* + - integration-tests/gradle/**/* area/hibernate-orm: - extensions/hibernate-orm/**/* - extensions/spring-data-jpa/**/* diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 15e779fd9a76e..ecc64f236e044 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -56,7 +56,7 @@ 3.6.3 0.7.7 - 6.4.1 + 6.5 2.2 diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.jar b/devtools/gradle/gradle/wrapper/gradle-wrapper.jar index 490fda8577df6..62d4c053550b9 100644 Binary files a/devtools/gradle/gradle/wrapper/gradle-wrapper.jar and b/devtools/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties index 21e622da69ce9..186b71557c501 100644 --- a/devtools/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/devtools/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/devtools/gradle/gradlew b/devtools/gradle/gradlew index 2fe81a7d95e4f..fbd7c515832da 100755 --- a/devtools/gradle/gradlew +++ b/devtools/gradle/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/devtools/gradle/gradlew.bat b/devtools/gradle/gradlew.bat index 9109989e3cbf6..a9f778a7a964b 100644 --- a/devtools/gradle/gradlew.bat +++ b/devtools/gradle/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index d1f57cf53bb9d..c5dfbd3da3b75 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -27,7 +27,7 @@ 3.6.3 0.7.7 - 6.4.1 + 6.5 diff --git a/integration-tests/gradle/build.gradle b/integration-tests/gradle/build.gradle index 644688fd9ebd9..3fc7a210f60bd 100644 --- a/integration-tests/gradle/build.gradle +++ b/integration-tests/gradle/build.gradle @@ -56,4 +56,8 @@ task nativeTest(type: Test) { // Include only native build test package include 'io/quarkus/gradle/nativeimage/*.class' +} + +wrapper { + distributionType = Wrapper.DistributionType.ALL } \ No newline at end of file diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar index 490fda8577df6..62d4c053550b9 100644 Binary files a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar and b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties index 21e622da69ce9..186b71557c501 100644 --- a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/gradlew b/integration-tests/gradle/gradlew index 2fe81a7d95e4f..fbd7c515832da 100755 --- a/integration-tests/gradle/gradlew +++ b/integration-tests/gradle/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/integration-tests/gradle/gradlew.bat b/integration-tests/gradle/gradlew.bat index 9109989e3cbf6..a9f778a7a964b 100644 --- a/integration-tests/gradle/gradlew.bat +++ b/integration-tests/gradle/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%