Merge pull request #10028 from gastaldi/bump_gradle

Bump to Gradle 6.5
quarkusio · Jun 16, 2020 · bf590a1 · bf590a1
2 parents 41cb0be + e6e9680
commit bf590a1
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 4 deletions.
diff --git 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
@@ -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
@@ -56,7 +56,7 @@
         <!-- These 2 properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.6.3</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
-        <gradle-wrapper.version>6.4.1</gradle-wrapper.version>
+        <gradle-wrapper.version>6.5</gradle-wrapper.version>
 
         <!-- MicroProfile TCK versions -->
         <microprofile-health-api.version>2.2</microprofile-health-api.version>

diff --git a/devtools/gradle/gradle/wrapper/gradle-wrapper.jar b/devtools/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -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
@@ -27,7 +27,7 @@
         <!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
         <proposed-maven-version>3.6.3</proposed-maven-version>
         <maven-wrapper.version>0.7.7</maven-wrapper.version>
-        <gradle-wrapper.version>6.4.1</gradle-wrapper.version>
+        <gradle-wrapper.version>6.5</gradle-wrapper.version>
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
         <!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->

diff --git 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
 }
diff --git a/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -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%
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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%

Expand Down