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 2022/11/14 08:03:04 UTC

[groovy] branch master updated: GROOVY-10827: Bump asciidoctorj dependencies

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 0501a6e8b1 GROOVY-10827: Bump asciidoctorj dependencies
0501a6e8b1 is described below

commit 0501a6e8b117aef920d135f4b80226dcc6bc072f
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Nov 14 18:02:54 2022 +1000

    GROOVY-10827: Bump asciidoctorj dependencies
    
    This also disable dependency verification for asciidoctorj module dependencies.
    It would be better to keep them enabled but the normal command for updating metadata:
    > gradlew --write-verification-metadata pgp,sha512 --dry-run
    doesn't seem to know about detached configurations.
---
 .../groovy/org.apache.groovy-asciidoctor.gradle    |  3 +++
 build.gradle                                       |  2 +-
 gradle/verification-metadata.xml                   | 26 +++++-----------------
 versions.properties                                |  6 ++---
 4 files changed, 13 insertions(+), 24 deletions(-)

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 a63e1b7e08..7b1d4bb3c3 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-asciidoctor.gradle
@@ -88,6 +88,9 @@ asciidoctorj {
     jrubyVersion = versions.jruby
     version = versions.asciidoctorj
     def vers = versions.groovy
+    resolutionStrategy {
+        it.disableDependencyVerification()
+    }
     docExtensions {
         def baseUrls = [
                 jdk: 'https://docs.oracle.com/en/java/javase/11/docs/api/index.html',
diff --git a/build.gradle b/build.gradle
index 4c7f7bc6f2..99a1278f57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -250,7 +250,7 @@ sonarqube {
     }
 }
 
-def UNSTABLE = /^([\d.-]+(alpha|beta|rc|m)[\d.-]+(groovy[\d.-]+)?|20030203.000550|20031129.200437|2004-03-19)$/
+def UNSTABLE = /^([\d.-]+(alpha|beta|rc|m)[\d.-]+(groovy[\d.-]+)?|20030203.000550|20031129.200437|20040427|2004-03-19)$/
 // ignore non-stable releases
 tasks.named("dependencyUpdates")?.configure {
     gradleReleaseChannel = 'current'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 25d9ae87db..7f80d77cfb 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -222,17 +222,9 @@
             <sha512 value="5d1c94fa87cfcd116539b49828656d5ba43c4eb342ccaab149cf891c95bc598b427d7210a43f3f0e9c788cd2b1f281b94b9c159d7c6a239d56c7df82f06ca459" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.43.0">
-         <artifact name="gradle-versions-plugin-0.43.0.jar">
-            <sha512 value="72331ea2d13aace1b6dad94f018f6e7d64b940aa032f76ad4c6e1076b5c9d33d03b821c65b3493835f7f98f74d4854419144e88c597ec6e21933148fc214c429" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-         <artifact name="gradle-versions-plugin-0.43.0.module">
-            <sha512 value="12b50e4849802820019bc18999bacfc41fbd64ce725388222bce5803e75c2dd63c9d1a295350b599f04ca4bf06b0d3e024024aa3161026affc1fd3538a99375b" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="com.github.ben-manes.versions" name="com.github.ben-manes.versions.gradle.plugin" version="0.43.0">
-         <artifact name="com.github.ben-manes.versions.gradle.plugin-0.43.0.pom">
-            <sha512 value="a4ccdd3d373bbd8f391684313272f1d5eed1f5d1ab7edb88d49c53978a3323e78d4d08d18a26b8be7787c2b0debd4a1dbb10e799ad7914b45df26ca5d62f759d" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.44.0">
+         <artifact name="gradle-versions-plugin-0.44.0.jar">
+            <sha512 value="1779ebfb210fd896aba914d7d0cab4cc249a5d375291597e3be3219c1e9c82a3ca28b4e4cc0d8aec9a70e4d0255bd75536046dca03986954c137f4ecc579ffd1" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
       <component group="com.github.blindpirate.osgi" name="com.github.blindpirate.osgi.gradle.plugin" version="0.0.6">
@@ -675,18 +667,12 @@
             <sha512 value="bc9cbda22130f8c6a0eef672a2dea0bc02ed785bb5382ac258678106175132b4c2a1e365ab69d4e06f705b88d71e9ea2aedb0861d6d63901d0320522352a6ddf" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="org.jfrog.buildinfo" name="build-info-extractor-gradle" version="4.29.2">
-         <artifact name="build-info-extractor-gradle-4.29.2.jar">
-            <ignored-keys>
-               <ignored-key id="49bc0306deb0ece16cdd09652ee4988c55528f25" reason="PGP verification failed"/>
-            </ignored-keys>
-            <sha512 value="c7d06077c9fddbc0af9f9537343d2b46d4e86d5ca0e588436f997c0ec784aee3edaedb5da16054cdf0238463bdc1a6e8ef304a88a838c3c0ab81f42593a089e3" origin="Generated by Gradle because PGP signature verification failed!"/>
-         </artifact>
-         <artifact name="build-info-extractor-gradle-4.29.2.pom">
+      <component group="org.jfrog.buildinfo" name="build-info-extractor-gradle" version="4.29.3">
+         <artifact name="build-info-extractor-gradle-4.29.3.jar">
             <ignored-keys>
                <ignored-key id="49bc0306deb0ece16cdd09652ee4988c55528f25" reason="PGP verification failed"/>
             </ignored-keys>
-            <sha512 value="5f5bfe9d7fb41b9512d904ce85827fdb4eea27287c1f48f696a6a11350ddf856c80ab6c82dcea8175765d9bcd3825633500fb52b7f48ce77768c89032e85dcc4" origin="Generated by Gradle because PGP signature verification failed!"/>
+            <sha512 value="bd93716380efa93b4190f4c5273484ad70322f068ccc7034de01d76612baf55901a34ccc5710bebd512a32316aaec69ebe911447bc02b25da3a53b41ee7598b9" origin="Generated by Gradle because PGP signature verification failed!"/>
          </artifact>
       </component>
       <component group="org.junit" name="junit-bom" version="5.7.1">
diff --git a/versions.properties b/versions.properties
index f3ec6e9f96..edf369362c 100644
--- a/versions.properties
+++ b/versions.properties
@@ -14,9 +14,9 @@
 # limitations under the License.
 
 ant=1.10.12
-asciidoctorj=2.5.2
-asciidoctorDiagram=2.2.1
-asciidoctorPdf=1.6.0
+asciidoctorj=2.5.7
+asciidoctorDiagram=2.2.3
+asciidoctorPdf=2.3.3
 asciidoctorGroovyDsl=2.0.2
 asm=9.4
 antlr4=4.9.0