asciidoctor-diagram 2.3.1 and asciidoctor-diagram-plantuml 1.2024.5

robertpanzer · robertpanzer · commit 0708071b848d · 2024-06-22T17:41:55.000+02:00
diff --git a/asciidoctorj-diagram-plantuml/build.gradle b/asciidoctorj-diagram-plantuml/build.gradle
@@ -1,5 +1,9 @@
 dependencies {
-  gems("rubygems:asciidoctor-diagram-plantuml:${project.version}")
+  gems("rubygems:asciidoctor-diagram-plantuml:${project.version}") {
+    // Version resolution does not seem to work correctly for this one, therefore requiring it explicitly
+    exclude module: "asciidoctor-diagram-batik"
+  }
+  gems("rubygems:asciidoctor-diagram-batik:${asciidoctorDiagramBatikGemVersion}")
 }
 
 def gemFiles = fileTree("${project.buildDir}/.gems") {
diff --git a/asciidoctorj-diagram-plantuml/gradle.properties b/asciidoctorj-diagram-plantuml/gradle.properties
@@ -1,5 +1,5 @@
 properName=AsciidoctorJ Diagram Plantuml
 description=AsciidoctorJ Diagram Plantuml bundles the Asciidoctor Diagram Plantuml RubyGem (asciidoctor-diagram-plantuml) so it can be loaded into the JVM using JRuby.
-version=1.2024.3
+version=1.2024.5
 gem_name=asciidoctor-diagram-plantuml
 
diff --git a/asciidoctorj-diagram/build.gradle b/asciidoctorj-diagram/build.gradle
@@ -12,9 +12,11 @@ dependencies {
     // Exclude gems provided by AsciidoctorJ core
     exclude module: 'asciidoctor'
     exclude module: 'thread_safe'
+    exclude module: 'rexml'
     exclude module: 'asciidoctor-diagram-plantuml'
     exclude module: 'asciidoctor-diagram-ditaamini'
   }
+  gems("rubygems:rexml:$rexmlGemVersion")
 }
 
 def gemFiles = fileTree("${project.buildDir}/.gems") {
diff --git a/asciidoctorj-diagram/gradle.properties b/asciidoctorj-diagram/gradle.properties
@@ -1,4 +1,4 @@
 properName=AsciidoctorJ Diagram
 description=AsciidoctorJ Diagram bundles the Asciidoctor Diagram RubyGem (asciidoctor-diagram) so it can be loaded into the JVM using JRuby.
-version=2.3.0
+version=2.3.1
 gem_name=asciidoctor-diagram
diff --git a/build.gradle b/build.gradle
@@ -31,16 +31,18 @@ ext {
   statusIsRelease = (status == 'release')
 
   // jar versions
-  jrubyVersion = '9.4.2.0'
+  jrubyVersion = '9.4.7.0'
   junitVersion = '5.8.2'
   assertjVersion = '3.22.0'
-  jsoupVersion = '1.15.3'
+  jsoupVersion = '1.17.2'
 
   // gem versions
   asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.10'
   asciidoctorDiagramGemVersion = project.hasProperty('asciidoctorDiagramGemVersion') ? project.asciidoctorDiagramGemVersion : project(':asciidoctorj-diagram').version.replace('-', '.')
-  barbyGemVersion = "0.6.8"
+  asciidoctorDiagramBatikGemVersion = "1.17"
+  barbyGemVersion = "0.6.9"
   rqrcodeGemVersion = "2.2.0"
+  rexmlGemVersion = '3.2.6'
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version=2.3.0
+version=2.3.1
 gem_name=asciidoctor-diagram

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,11 @@ dependencies {`
`12`	`12`	`// Exclude gems provided by AsciidoctorJ core`
`13`	`13`	`exclude module: 'asciidoctor'`
`14`	`14`	`exclude module: 'thread_safe'`
	`15`	`+ exclude module: 'rexml'`
`15`	`16`	`exclude module: 'asciidoctor-diagram-plantuml'`
`16`	`17`	`exclude module: 'asciidoctor-diagram-ditaamini'`
`17`	`18`	`}`
	`19`	`+ gems("rubygems:rexml:$rexmlGemVersion")`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`def gemFiles = fileTree("${project.buildDir}/.gems") {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-version=2.3.0`
	`1`	`+version=2.3.1`
`2`	`2`	`gem_name=asciidoctor-diagram`