This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 647ff67cbc GROOVY-11763: Bump asciidoctor gradle plugins to 4.0.5
(build dependency) reverted from 5 alpha
647ff67cbc is described below
commit 647ff67cbcc502baf6c34a63d5c639b851de35b4
Author: Paul King <[email protected]>
AuthorDate: Mon Apr 13 20:48:17 2026 +1000
GROOVY-11763: Bump asciidoctor gradle plugins to 4.0.5 (build dependency)
reverted from 5 alpha
---
build-logic/build.gradle | 4 ++--
.../main/groovy/org.apache.groovy-asciidoctor.gradle | 2 +-
.../main/groovy/org.apache.groovy-distribution.gradle | 2 +-
.../gradle/GenerateSwingBuilderWidgetDocs.groovy | 2 +-
gradle/verification-metadata.xml | 19 ++++++++++++++++++-
src/spec/doc/grape.adoc | 5 ++++-
subprojects/groovy-binary/src/spec/doc/index.adoc | 1 +
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 1 +
.../src/spec/doc/_swing-builder-widgets.adoc | 15 +++++----------
9 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/build-logic/build.gradle b/build-logic/build.gradle
index 2b77313c3d..edb951bc91 100644
--- a/build-logic/build.gradle
+++ b/build-logic/build.gradle
@@ -27,8 +27,8 @@ repositories {
}
dependencies {
- implementation 'org.asciidoctor:asciidoctor-gradle-jvm:5.0.0-alpha.1'
- implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:5.0.0-alpha.1'
+ implementation 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.5'
+ implementation 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:4.0.5'
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4'
implementation 'org.nosphere.apache:creadur-rat-gradle:0.8.1'
implementation 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.2'
diff --git a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
index 056391d1fa..e46c623c28 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -21,7 +21,7 @@ import org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask
import org.apache.groovy.gradle.ConcurrentExecutionControlBuildService
plugins {
- id 'org.asciidoctor.jvm.convert.classic'
+ id 'org.asciidoctor.jvm.convert'
}
configurations {
diff --git a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
index 081d91a5d0..df19285292 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-distribution.gradle
@@ -25,7 +25,7 @@ plugins {
id 'org.apache.groovy-common'
id 'org.apache.groovy-aggregating-project'
id 'org.apache.groovy-doc-aggregator'
- id 'org.asciidoctor.jvm.pdf.classic'
+ id 'org.asciidoctor.jvm.pdf'
}
def distributionExtension = project.extensions.create('distribution',
DistributionExtension, project)
diff --git
a/build-logic/src/main/resources/org/apache/groovy/gradle/GenerateSwingBuilderWidgetDocs.groovy
b/build-logic/src/main/resources/org/apache/groovy/gradle/GenerateSwingBuilderWidgetDocs.groovy
index 9c6f49b490..4b123501ae 100644
---
a/build-logic/src/main/resources/org/apache/groovy/gradle/GenerateSwingBuilderWidgetDocs.groovy
+++
b/build-logic/src/main/resources/org/apache/groovy/gradle/GenerateSwingBuilderWidgetDocs.groovy
@@ -296,7 +296,7 @@ if (explicitMethods) {
explicitMethods.keySet().sort().each { methodName ->
def desc = methodDescriptions[methodName] ?: ''
- out << "| `${methodName}()`\n"
+ out << "| [[swing-widget-${methodName}]]`${methodName}()`\n"
out << "| ${desc}\n\n"
}
out << "|===\n"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5d838f21b0..754462bad2 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -104,6 +104,7 @@
<trusted-key id="3F999BB69041CF17E73BB1CEC038787776A19D18"
group="net.javacrumbs.json-unit"/>
<trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE"
group="org.apache.commons" name="commons-math3"/>
<trusted-key id="416952B945B78A34C6C7678562EBFC78FE4156D1"
group="org.jruby"/>
+ <trusted-key id="41A1A08C62FCA78B79D3081164A16FAAEC16A4BE"
group="org.apache.commons" name="commons-math3"/>
<trusted-key id="47063E8BA7A6450E4A52E7AE466CAED6E0747D50"
group="org.apache.maven.plugin-tools"/>
<trusted-key id="49BC0306DEB0ECE16CDD09652EE4988C55528F25"
group="^org[.]jfrog($|([.].*))" regex="true"/>
<trusted-key id="4C5F68D09D42BA7FAC888DF9A929EA2321FDBF8F">
@@ -113,6 +114,7 @@
<trusted-key id="4DB1A49729B053CAF015CEE9A6ADFC93EF34893E"
group="org.hamcrest"/>
<trusted-key id="4F7E32D440EF90A83011A8FC6425559C47CC79C4"
group="^javax[.]servlet($|([.].*))" regex="true"/>
<trusted-key id="5719E50EAC5A4B1DD390B72C2A742740E08E7F8D"
group="org.antlr"/>
+ <trusted-key id="5A022DE16956DECDAD4EBC161FE771E34EF57D42"
group="jakarta.servlet.jsp"/>
<trusted-key id="60200AC4AE761F1614D6C46766D68DAA073BE985">
<trusting group="ch.qos.logback"/>
<trusting group="org.slf4j"/>
@@ -374,7 +376,7 @@
</component>
<component group="com.github.jk1" name="gradle-license-report"
version="3.1.2">
<artifact name="gradle-license-report-3.1.2.jar">
- <sha512
value="a9f33f620a13f95b7a8e5e441cbcf49413a9ecfdba526e9dd6d65adcfe5b582522881be164e3536079b9cb9b2beda0b8d71e1403b7d1f69167c3c96523620d4a"
origin="Generated by Gradle"/>
+ <sha512
value="a9f33f620a13f95b7a8e5e441cbcf49413a9ecfdba526e9dd6d65adcfe5b582522881be164e3536079b9cb9b2beda0b8d71e1403b7d1f69167c3c96523620d4a"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.jnr" name="jffi" version="1.3.13">
@@ -1671,16 +1673,31 @@
<sha512
value="d7ccd0e7019f1a997de39d66dc0ad4efe150428fdd7f4c743c93884f1602a3e90135ad34baea96d5b6d925ad6c0c8487c8e78304f0a089a12383d4a62e2c9a61"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
+ <component group="org.asciidoctor" name="asciidoctor-gradle-base"
version="4.0.5">
+ <artifact name="asciidoctor-gradle-base-4.0.5.jar">
+ <sha512
value="d190f9e242b01b80c04bca65a0ed0284e976541eac7708d0bb0ffea6669eaddf151609c6ed9fc60f1324f87811a9af3876085768390142c56e6cc47885134290"
origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="org.asciidoctor" name="asciidoctor-gradle-base"
version="5.0.0-alpha.1">
<artifact name="asciidoctor-gradle-base-5.0.0-alpha.1.jar">
<sha512
value="eb7a31424d8c9d914e9f8e5c8abc2ca4652072c72ed70dd6a2c27f4e7064448fcd617c3b66d96b7a18dcbb24f2ab62fa9de17605a4ea41ac1ea7acdfa7804538"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
+ <component group="org.asciidoctor" name="asciidoctor-gradle-jvm"
version="4.0.5">
+ <artifact name="asciidoctor-gradle-jvm-4.0.5.jar">
+ <sha512
value="9bbcb40943b82246695f1476515d3ae9a5476977bbd54a978272bb67c0165a5891da48538b35655f778ad61773d39dee95265567972c635b6cb44c3d1114f758"
origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="org.asciidoctor" name="asciidoctor-gradle-jvm"
version="5.0.0-alpha.1">
<artifact name="asciidoctor-gradle-jvm-5.0.0-alpha.1.jar">
<sha512
value="000f0caecf58abebe24107084ba3dc9608fb8d1a8f4fae197ebc0f0e2cfd79873d2ca3dd885c043847303a63a7b14af0f6bf9d30b5cb91836f249ea94b18e597"
origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
+ <component group="org.asciidoctor" name="asciidoctor-gradle-jvm-pdf"
version="4.0.5">
+ <artifact name="asciidoctor-gradle-jvm-pdf-4.0.5.jar">
+ <sha512
value="feac950c1d281f12c3f3b3c1bee50e1aac2f923ae4e750f9661d75749709ecb54775587714d5188eb1a595682794a75638aa9d7affce74ec7a06317dfaef5253"
origin="Generated by Gradle" reason="Artifact is not signed"/>
+ </artifact>
+ </component>
<component group="org.asciidoctor" name="asciidoctor-gradle-jvm-pdf"
version="5.0.0-alpha.1">
<artifact name="asciidoctor-gradle-jvm-pdf-5.0.0-alpha.1.jar">
<sha512
value="ee3e79b73e062998f92e6bbb4b9ffb20865d543e13077e8e98ec8038051834c81de4b6b86d63936e4159348e686470855ff442b54d00f6cfbc1848653d7d5994"
origin="Generated by Gradle" reason="Artifact is not signed"/>
diff --git a/src/spec/doc/grape.adoc b/src/spec/doc/grape.adoc
index c35b190d73..062191b309 100644
--- a/src/spec/doc/grape.adoc
+++ b/src/spec/doc/grape.adoc
@@ -18,6 +18,9 @@
under the License.
//////////////////////////////////////////
+ifndef::tools-groovy[]
+:tools-groovy: tools-groovy.adoc
+endif::[]
[[section-grape]]
= Dependency management with Grape
@@ -130,7 +133,7 @@ JAVA_OPTS = -Dhttp.proxyHost=yourproxy -Dhttp.proxyPort=8080
The Grape facade (`groovy.grape.Grape`) uses
https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/lang/System.Logger.html[JDK
Platform Logging]
and can be configured through `~/.groovy/logging.properties`
-(see <<section-groovy-commandline>> for details).
+(see <<{tools-groovy}#section-groovy-commandline,the groovy command>> for
details).
Logging of the underlying engine depends on which Grape implementation is
active.
diff --git a/subprojects/groovy-binary/src/spec/doc/index.adoc
b/subprojects/groovy-binary/src/spec/doc/index.adoc
index b612833960..6976190afe 100644
--- a/subprojects/groovy-binary/src/spec/doc/index.adoc
+++ b/subprojects/groovy-binary/src/spec/doc/index.adoc
@@ -56,6 +56,7 @@ include::../../../../../src/spec/doc/core-introduction.adoc[]
:groovyc-ant-task:
:guide-integrating:
:jmx:
+:tools-groovy:
:tools-groovyc:
:xml-userguide:
:sql-userguide:
diff --git a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
index 2437510f34..20d6590da8 100644
--- a/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
+++ b/subprojects/groovy-groovysh/src/spec/doc/groovysh.adoc
@@ -100,6 +100,7 @@ Script examples might distinguish between local variables
with a type and script
binding variables where no type, nor the `def` or `var` type placeholders,
are given. The script binding is the exact equivalent to the shell's shared
variables.
+[[GroovyShell-InterpreterMode]]
Because such statements are so common, the shell has a special mode
called _interpreter mode_ which allows you to use typed variables.
The following table summarizes the differences between the two modes:
diff --git a/subprojects/groovy-swing/src/spec/doc/_swing-builder-widgets.adoc
b/subprojects/groovy-swing/src/spec/doc/_swing-builder-widgets.adoc
index e99190a76d..27c99bebb7 100644
--- a/subprojects/groovy-swing/src/spec/doc/_swing-builder-widgets.adoc
+++ b/subprojects/groovy-swing/src/spec/doc/_swing-builder-widgets.adoc
@@ -617,19 +617,19 @@ These are explicit methods (not node factories) available
on `SwingBuilder`:
|===
| Method | Description
-| `doLater()`
+| [[swing-widget-doLater]]`doLater()`
| Run a closure on the EDT asynchronously (non-blocking)
-| `doOutside()`
+| [[swing-widget-doOutside]]`doOutside()`
| Run a closure outside the EDT in a new thread
-| `edt()`
+| [[swing-widget-edt]]`edt()`
| Run a closure on the Event Dispatch Thread (blocking)
-| `keyStrokeAction()`
+| [[swing-widget-keyStrokeAction]]`keyStrokeAction()`
| Create keyboard shortcut bindings on a component
-| `shortcut()`
+| [[swing-widget-shortcut]]`shortcut()`
| Create a platform-appropriate KeyStroke (uses Cmd on Mac, Ctrl elsewhere)
|===
@@ -14843,11 +14843,6 @@ swing.splitPane()
| icon:check[]
|
-| `componentOrientation`
-| `awt.ComponentOrientation`
-|
-| icon:check[]
-
| `componentPopupMenu`
| `JPopupMenu`
| icon:check[]
