You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2019/07/07 11:44:38 UTC
[incubator-openwhisk-catalog] branch master updated: bundle
gradlew[.bat] version that includes license header. (#305)
This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-catalog.git
The following commit(s) were added to refs/heads/master by this push:
new 0208e60 bundle gradlew[.bat] version that includes license header. (#305)
0208e60 is described below
commit 0208e60e7b25ec4f88fee7bdf88683d02fe65938
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Sun Jul 7 07:44:34 2019 -0400
bundle gradlew[.bat] version that includes license header. (#305)
Update to the gradlew and gradlew.bat versions included in
Gradle release 5.5. These newer versions of the files
include an Apache License header.
Add copyright attribution to NOTICE. The Gradle 5.5 release
does not itself contain a NOTICE file, so there are no additional
entries to carry forward beyond noting that we are bundling
third party Apache Licensed files.
---
NOTICE.txt | 4 ++++
gradlew | 18 +++++++++++++++++-
gradlew.bat | 18 +++++++++++++++++-
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/NOTICE.txt b/NOTICE.txt
index ee979eb..753fc4d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -3,3 +3,7 @@ Copyright 2016-2019 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles the files gradlew and gradlew.bat
+which are copyright by their original authors and licensed
+under the Apache License, Version 2.0.
diff --git a/gradlew b/gradlew
index cccdd3d..08282de 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
#!/usr/bin/env sh
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d..dbd960e 100644
--- a/gradlew.bat
+++ b/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 http://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=
+set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome