You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2025/01/22 10:48:43 UTC
(groovy-website) branch asf-site updated (ee9a88f -> 018a629)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
from ee9a88f later gradle syntax
new c6a12f8 bump gradle version
new 2e26a91 later gradle syntax
new 018a629 bump dependencies
The 3 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.
Summary of changes:
build.gradle | 2 +-
buildSrc/build.gradle | 4 ++--
generator/build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 61624 -> 43462 bytes
gradle/wrapper/gradle-wrapper.properties | 3 ++-
gradlew | 29 +++++++++++++++++------------
gradlew.bat | 20 ++++++++++----------
site-dev/build.gradle | 2 +-
site-user/build.gradle | 12 +++++++-----
9 files changed, 41 insertions(+), 33 deletions(-)
(groovy-website) 02/03: later gradle syntax
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit 2e26a91930ddcd62e8503003c14ff6d379b00378
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 22 20:48:09 2025 +1000
later gradle syntax
---
site-user/build.gradle | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/site-user/build.gradle b/site-user/build.gradle
index a5c8f1f..d157c0a 100644
--- a/site-user/build.gradle
+++ b/site-user/build.gradle
@@ -37,7 +37,7 @@ ext.excludeFromChecks = [
apply plugin: 'base'
-task copyAssets(type:Copy) {
+tasks.register('copyAssets', Copy) {
from file('../site/src/site/assets')
into layout.buildDirectory.dir('site')
filesMatching('**/*.css') { f->
@@ -52,12 +52,12 @@ task copyAssets(type:Copy) {
}
}
-task copyReleaseNotesAssets(type:Copy) {
+tasks.register('copyReleaseNotesAssets', Copy) {
from file('../site/src/site/releasenotes/img')
into layout.buildDirectory.dir('site/releasenotes/img')
}
-task generateSite(type:JavaExec) {
+tasks.register('generateSite', JavaExec) {
description = 'Generates the Groovy User Website'
dependsOn copyAssets
dependsOn copyReleaseNotesAssets
@@ -73,7 +73,8 @@ task generateSite(type:JavaExec) {
systemProperties.docs_baseurl = System.getProperty('docs_baseurl')
}
-task checkDeadLinks(dependsOn: generateSite) {
+tasks.register('checkDeadLinks') {
+ dependsOn generateSite
description = 'Checks for dead links in the generated Groovy website'
ext.outputDir = layout.buildDirectory.dir('reports')
@@ -104,7 +105,8 @@ task checkDeadLinks(dependsOn: generateSite) {
}
}
-task webzip(type:Zip, dependsOn: checkDeadLinks) {
+tasks.register('webzip', Zip) {
+ dependsOn checkDeadLinks
description = 'Creates a zip with the generated website and the deadlink report'
destinationDirectory = layout.buildDirectory.dir('distributions')
(groovy-website) 01/03: bump gradle version
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit c6a12f82383b695d3382831d14d57919bce41922
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 22 20:47:56 2025 +1000
bump gradle version
---
gradle/wrapper/gradle-wrapper.jar | Bin 61624 -> 43462 bytes
gradle/wrapper/gradle-wrapper.properties | 3 ++-
gradlew | 29 +++++++++++++++++------------
gradlew.bat | 20 ++++++++++----------
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index afba109..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 509c4a2..cea7a79 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# 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" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
(groovy-website) 03/03: bump dependencies
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit 018a629328e37c92398cc2e845d1b60fc0821019
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 22 20:48:34 2025 +1000
bump dependencies
---
build.gradle | 2 +-
buildSrc/build.gradle | 4 ++--
generator/build.gradle | 2 +-
site-dev/build.gradle | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index af6c366..7355ce8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'org.apache.ant:ant:1.10.14'
+ classpath 'org.apache.ant:ant:1.10.15'
classpath 'com.yahoo.platform.yui:yuicompressor:2.4.8'
}
}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 0fefbd4..74a914a 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,6 +22,6 @@ repositories {
}
dependencies {
- implementation 'org.apache.httpcomponents:httpclient:4.5.1'
- implementation 'com.yahoo.platform.yui:yuicompressor:2.4.7'
+ implementation 'org.apache.httpcomponents:httpclient:4.5.13'
+ implementation 'com.yahoo.platform.yui:yuicompressor:2.4.8'
}
diff --git a/generator/build.gradle b/generator/build.gradle
index 8455590..47fa213 100644
--- a/generator/build.gradle
+++ b/generator/build.gradle
@@ -25,7 +25,7 @@ repositories {
mavenCentral()
}
-ext.groovyVersion = '3.0.20'
+ext.groovyVersion = '3.0.23'
ext.asciidocVersion = '2.5.11'
ext.asciidoctorDiagram='2.2.10'
diff --git a/site-dev/build.gradle b/site-dev/build.gradle
index 91020d7..4a445a0 100644
--- a/site-dev/build.gradle
+++ b/site-dev/build.gradle
@@ -26,7 +26,7 @@ import util.CheckLinks
plugins {
id 'base' // common lifecycle tasks and artifact types
- id 'org.ajoberstar.grgit' version '5.2.1' // to publish website to asf-git branch
+ id 'org.ajoberstar.grgit' version '5.3.0' // to publish website to asf-git branch
}
ext {