You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/10/05 21:07:08 UTC
[netbeans-website] branch master updated: Bump build system
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 51681e35d Bump build system
new b85a55cd7 Merge pull request #612 from ebarboni/gradlemodern
51681e35d is described below
commit 51681e35db0a45d538ecea2e639d5593840ff0a4
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed Sep 21 18:52:52 2022 +0200
Bump build system
---
netbeans.apache.org/build.gradle | 4 +-
netbeans.apache.org/buildSrc/build.gradle | 22 ++++-----
netbeans.apache.org/gradle/deps.gradle | 7 ++-
.../gradle/wrapper/gradle-wrapper.jar | Bin 55741 -> 58694 bytes
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
netbeans.apache.org/gradlew | 51 +++++++++++++--------
netbeans.apache.org/gradlew.bat | 21 ++++++++-
7 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index b883d878c..b2a17f6a1 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -238,14 +238,14 @@ task run(type: JavaExec, group: "Run") {
bakedDir.mkdirs()
}
- main "TomcatMain"
+ mainClass="TomcatMain"
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") {
- main "TomcatStopMain"
+ mainClass="TomcatStopMain"
classpath buildscript.configurations.classpath + files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = ["SHUTDOWN", 8082]
}
diff --git a/netbeans.apache.org/buildSrc/build.gradle b/netbeans.apache.org/buildSrc/build.gradle
index 0ff8fc070..5bb3c6bcc 100644
--- a/netbeans.apache.org/buildSrc/build.gradle
+++ b/netbeans.apache.org/buildSrc/build.gradle
@@ -10,18 +10,18 @@ apply plugin: "groovy"
//groovy added some things to the compile configuration; remove them
//as we add our own versions for this
-configurations.compile.dependencies.clear()
+configurations.implementation.dependencies.clear()
dependencies {
- compile "org.yaml:snakeyaml:${libs.snakeYaml}"
- compile "org.codehaus.groovy:groovy-all:${libs.groovy}"
- compile "org.gradle:gradle-core:${libs.gradle}"
- compile "org.gradle:gradle-model-core:${libs.gradle}"
- compile "org.gradle:gradle-base-services-groovy:${libs.gradle}"
- compile "org.gradle:gradle-base-services:${libs.gradle}"
- compile "org.gradle:gradle-logging:${libs.gradle}"
- compile "org.slf4j:slf4j-api:1.7.25"
+ implementation "org.yaml:snakeyaml:${libs.snakeYaml}"
+ implementation "org.codehaus.groovy:groovy-all:${libs.groovy}"
+ implementation "org.gradle:gradle-core:${libs.gradle}"
+ implementation "org.gradle:gradle-model-core:${libs.gradle}"
+ implementation "org.gradle:gradle-base-services-groovy:${libs.gradle}"
+ implementation "org.gradle:gradle-base-services:${libs.gradle}"
+ implementation "org.gradle:gradle-logging:${libs.gradle}"
+ implementation "org.slf4j:slf4j-api:1.7.36"
//we will do this this way as extendsFrom does not work across containers or something...
- compile buildscript.configurations.tomcat.allDependencies
- testCompile 'junit:junit:4.12'
+ implementation buildscript.configurations.tomcat.allDependencies
+ testImplementation 'junit:junit:4.13.2'
}
\ No newline at end of file
diff --git a/netbeans.apache.org/gradle/deps.gradle b/netbeans.apache.org/gradle/deps.gradle
index 3ee967275..a6b0a88f2 100644
--- a/netbeans.apache.org/gradle/deps.gradle
+++ b/netbeans.apache.org/gradle/deps.gradle
@@ -6,11 +6,10 @@ buildscript {
}
mavenLocal()
mavenCentral()
- jcenter()
}
sharedDependencies = {
classpath "org.codehaus.groovy:groovy-all:${libs.groovy}"
- classpath "org.jbake:jbake-gradle-plugin:5.3.0"
+ classpath "org.jbake:jbake-gradle-plugin:5.5.0"
classpath "io.freefair.gradle:jsass-plugin:3.8.4"
}
tomcatDependencies = {
@@ -22,8 +21,8 @@ buildscript {
tomcat "org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}"
}
libs = [
- groovy: "2.5.13",
- jbake: "2.6.5",
+ groovy: "3.0.10",
+ jbake: "2.6.7",
snakeYaml: "1.18",
gradle: "3.5.1",
tomcat: "8.5.16",
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
index 457aad0d9..490fda857 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 a4b442974..ae04661ee 100644
--- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
+++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew
index af6708ff2..2fe81a7d9 100755
--- a/netbeans.apache.org/gradlew
+++ b/netbeans.apache.org/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
+#
+# https://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='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -159,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/gradlew.bat
index 0f8d5937c..9109989e3 100644
--- a/netbeans.apache.org/gradlew.bat
+++ b/netbeans.apache.org/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
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@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
---------------------------------------------------------------------
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