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:28:24 UTC

[groovy] branch GROOVY_4_0_X updated: GROOVY-10827: Bump asciidoctorj dependencies (port to 4_0_X)

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new 2b1d1fb139 GROOVY-10827: Bump asciidoctorj dependencies (port to 4_0_X)
2b1d1fb139 is described below

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

    GROOVY-10827: Bump asciidoctorj dependencies (port to 4_0_X)
    
    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.
---
 .../src/main/groovy/org.apache.groovy-asciidoctor.gradle    |  3 +++
 build.gradle                                                |  2 +-
 gradle/verification-metadata.xml                            | 13 +++++++++++++
 versions.properties                                         |  6 +++---
 4 files changed, 20 insertions(+), 4 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 4b988c0db9..c92ff3aa22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -249,7 +249,7 @@ sonarqube {
     }
 }
 
-def UNSTABLE = /^([0-9,.-]+[.-](alpha|beta|rc)[.\d-]*)|20030203.000550|20031129.200437$/
+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 8a25ac8a82..51cb1ea136 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -276,6 +276,11 @@
             <sha512 value="3416784f741e02e854f9dce0a59fa1283b7340b8af056308b3cb49e4ea3896a2b7dfebae71b3057be8f3cc976db72f123d81fa00e0a069921e586da531a53ec3" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <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">
          <artifact name="com.github.blindpirate.osgi.gradle.plugin-0.0.6.pom">
             <sha512 value="7e0ca887835cb7d72cd209320399d42eb2e174f7f6735aa16ea6385cdc457e73f334eab44f4a14dfb191388c0743fdcd61ef1be0c7e9553aff112dab36dec145" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -801,6 +806,14 @@
             <sha512 value="ed1441e0040e79282aafd52d3585ac322039810d6f4bb3cee5b92dc82e58afb492c4b13dbb326ea0337aedf8a43a245023c77bbf2d559ece71bdfc8785d997cf" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <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="bd93716380efa93b4190f4c5273484ad70322f068ccc7034de01d76612baf55901a34ccc5710bebd512a32316aaec69ebe911447bc02b25da3a53b41ee7598b9" origin="Generated by Gradle because PGP signature verification failed!"/>
+         </artifact>
+      </component>
       <component group="org.jfrog.buildinfo" name="build-info-client" version="2.19.2">
          <artifact name="build-info-client-2.19.2.jar">
             <sha512 value="6a1cba6bd63f485dbf3a470eaf156c7c69977472a7450cd539ac180994cd7146480ebf4f82adbc31439e1821c3831852647b65cfb2d067dcba678e812d71195d" origin="Generated by Gradle because artifact wasn't signed"/>
diff --git a/versions.properties b/versions.properties
index 0dad5de84e..06f64e704e 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