[thrift] branch master updated: THRIFT-5115 PR #2022 Updated gradle to 6.2 broke CI Client: java Patch: Mario Emmenlauer

[jensg]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new b7b02af  THRIFT-5115 PR #2022 Updated gradle to 6.2 broke CI Client: 
java Patch: Mario Emmenlauer
b7b02af is described below

commit b7b02afcd835639a0735731a63ff5b1386879c97
Author: Mario Emmenlauer <ma...@emmenlauer.de>
AuthorDate: Mon Feb 24 22:25:24 2020 +0100

    THRIFT-5115 PR #2022 Updated gradle to 6.2 broke CI
    Client: java
    Patch: Mario Emmenlauer
    
    This closes #2031
    
    Downgraded gradle to 5.6.4 after problems with 6.x in AS3
---
 lib/as3/gradle/wrapper/gradle-wrapper.properties  |  2 +-
 lib/as3/gradlew.bat                               | 18 +++++++++++++++++-
 lib/java/gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/as3/gradle/wrapper/gradle-wrapper.properties 
b/lib/as3/gradle/wrapper/gradle-wrapper.properties
index 558870d..5028f28 100644
--- a/lib/as3/gradle/wrapper/gradle-wrapper.properties
+++ b/lib/as3/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/as3/gradlew.bat b/lib/as3/gradlew.bat
index 6d57edc..9618d8d 100644
--- a/lib/as3/gradlew.bat
+++ b/lib/as3/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS 
to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/lib/java/gradle/wrapper/gradle-wrapper.properties 
b/lib/java/gradle/wrapper/gradle-wrapper.properties
index b7c8c5d..5028f28 100644
--- a/lib/java/gradle/wrapper/gradle-wrapper.properties
+++ b/lib/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists