You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by he...@apache.org on 2020/03/31 19:21:36 UTC
[netbeans-website] branch upgrade_gradle_version created (now
68a3549)
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a change to branch upgrade_gradle_version
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git.
at 68a3549 Upgrade to gradle 6.3
This branch includes the following new commits:
new 68a3549 Upgrade to gradle 6.3
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] 01/01: Upgrade to gradle 6.3
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a commit to branch upgrade_gradle_version
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
commit 68a35492d80b82c0f4b4e9c5751242cd6ef009d7
Author: Hector Espert <he...@gmail.com>
AuthorDate: Tue Mar 31 21:21:01 2020 +0200
Upgrade to gradle 6.3
---
netbeans.apache.org/build.gradle | 8 ++++----
netbeans.apache.org/gradle/deps.gradle | 2 +-
.../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes
.../gradle/wrapper/gradle-wrapper.properties | 3 +--
netbeans.apache.org/gradlew | 8 ++++----
netbeans.apache.org/gradlew.bat | 2 +-
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index 55f5c97..1c45a2a 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"],
}
-task("run", type: JavaExec, group: "Run", overwrite: true) {
+task run(type: JavaExec, group: "Run") {
def wDir = new File(buildDir, "tomcat")
@@ -216,14 +216,14 @@ task("run", type: JavaExec, group: "Run", overwrite: true) {
}
main "TomcatMain"
- classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main")
+ classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = [bakedDir, 8080, "SHUTDOWN", 8088]
workingDir = wDir
}
-task("stop", type: JavaExec, group: "Run", overwrite: true) {
+task stop(type: JavaExec, group: "Run") {
main "TomcatStopMain"
- classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/main")
+ classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = ["SHUTDOWN", 8082]
}
diff --git a/netbeans.apache.org/gradle/deps.gradle b/netbeans.apache.org/gradle/deps.gradle
index 1e86767..2c1d522 100644
--- a/netbeans.apache.org/gradle/deps.gradle
+++ b/netbeans.apache.org/gradle/deps.gradle
@@ -22,7 +22,7 @@ buildscript {
tomcat "org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}"
}
libs = [
- groovy: "2.4.11",
+ groovy: "2.5.10",
jbake: "2.5.1",
snakeYaml: "1.18",
gradle: "3.5.1",
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
index 19c760f..457aad0 100644
Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
index d212895..a4b4429 100644
--- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
+++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 04 17:14:53 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew
index 4453cce..af6708f 100755
--- a/netbeans.apache.org/gradlew
+++ b/netbeans.apache.org/gradlew
@@ -28,16 +28,16 @@ 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='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/gradlew.bat
index e95643d..0f8d593 100644
--- a/netbeans.apache.org/gradlew.bat
+++ b/netbeans.apache.org/gradlew.bat
@@ -14,7 +14,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="-Xmx64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists