This is an automated email from the ASF dual-hosted git repository.
adamsaghy pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 7f07c0afce FINERACT-2326: Upgrade asciidoc dependencies
7f07c0afce is described below
commit 7f07c0afce1d1b5cc9664eea9786473b3da72078
Author: Adam Saghy <[email protected]>
AuthorDate: Wed Sep 17 10:31:29 2025 +0200
FINERACT-2326: Upgrade asciidoc dependencies
---
build.gradle | 9 ++---
fineract-doc/build.gradle | 40 ++++++++++++++++++++++
.../en/chapters/release/configuration-gpg.adoc | 2 +-
renovate.json | 6 +---
4 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index cf53f0d52e..0d7d4af5d3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,16 +104,11 @@ plugins {
id 'net.ltgt.errorprone' version '4.1.0' apply false
id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.23' apply false
id 'com.gorylenko.gradle-git-properties' version '2.4.2' apply false
- // can't upgrade to 4.x because of one of these:
- // https://github.com/asciidoctor/asciidoctorj-pdf/issues/25
- // https://github.com/jruby/jruby/issues/5573
- // https://github.com/asciidoctor/asciidoctorj-pdf/issues/16
- id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
- id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
+ id 'org.asciidoctor.jvm.convert' version '4.0.5' apply false
+ id 'org.asciidoctor.jvm.pdf' version '4.0.5' apply false
id 'com.google.cloud.tools.jib' version '3.4.5' apply false
id 'org.sonarqube' version '6.0.1.5171'
id 'com.github.andygoossens.modernizer' version '1.10.0' apply false
- // TODO: upgrade to 6.0.4
id 'com.github.spotbugs' version '6.0.26' apply false
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply
false
diff --git a/fineract-doc/build.gradle b/fineract-doc/build.gradle
index 41710c31bc..0ce5359121 100644
--- a/fineract-doc/build.gradle
+++ b/fineract-doc/build.gradle
@@ -16,9 +16,49 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+buildscript {
+ repositories {
+ mavenCentral()
+ gradlePluginPortal()
+ }
+
+ dependencies {
+ classpath 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.5'
+ classpath 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:4.0.5'
+ classpath 'org.yaml:snakeyaml:1.33'
+ }
+}
+
+plugins {
+ id 'org.asciidoctor.jvm.convert' version '4.0.5' apply false
+ id 'org.asciidoctor.jvm.pdf' version '4.0.5' apply false
+}
+
apply plugin: 'org.asciidoctor.jvm.convert'
apply plugin: 'org.asciidoctor.jvm.pdf'
+// Configure resolution strategy for all configurations
+configurations.all {
+ resolutionStrategy {
+ // Force specific versions of dependencies to avoid conflicts
+ force 'org.yaml:snakeyaml:1.33',
+ 'org.jruby:jruby-complete:9.4.5.0'
+ }
+}
+
+// Configure Asciidoctor PDF
+asciidoctorPdf {
+ asciidoctorj {
+ version = '2.5.11' // Explicitly set AsciidoctorJ version
+
+ modules {
+ // Use a specific version of asciidoctorj-pdf that's known to work
with AsciidoctorJ 2.5.11
+ pdf.version '2.3.10'
+ }
+ }
+}
+
// see also:
https://asciidoctor.github.io/asciidoctor-gradle-plugin/master/user-guide/
asciidoctorj {
diff --git a/fineract-doc/src/docs/en/chapters/release/configuration-gpg.adoc
b/fineract-doc/src/docs/en/chapters/release/configuration-gpg.adoc
index f22122c414..2678766d3f 100644
--- a/fineract-doc/src/docs/en/chapters/release/configuration-gpg.adoc
+++ b/fineract-doc/src/docs/en/chapters/release/configuration-gpg.adoc
@@ -182,7 +182,7 @@ You should protect your revocation certificate. Anyone in
possession of your rev
+
IMPORTANT: Please contact a PMC member to add your GPG public key in
Fineract's Subversion repository. This is necessary to be able to validate
published releases.
-1. Upload your GPG key to a keyserver:
+6. Upload your GPG key to a keyserver:
+
[source,bash]
----
diff --git a/renovate.json b/renovate.json
index 6851acc619..0c156e78cb 100644
--- a/renovate.json
+++ b/renovate.json
@@ -35,10 +35,6 @@
"matchPackageNames": ["org.openapi.generator"],
"allowedVersions": "<=7.8.0"
},
- {
- "matchPackageNames": ["org.asciidoctor.jvm.convert",
"org.asciidoctor.jvm.pdf"],
- "allowedVersions": "<=3.3.2"
- },
{
"matchPackageNames": ["org.eclipse.persistence:eclipselink"],
"allowedVersions": "<=4.0.2",
@@ -76,7 +72,7 @@
},
{
"matchPackageNames": ["org.postgresql:postgresql"],
- "allowedVersions": "<=42.7.4",
+ "allowedVersions": "<=42.7.3",
"description": "Postgres JDBC driver 42.7.5 has a performance bug:
https://github.com/pgjdbc/pgjdbc/issues/3511#issuecomment-2637277977"
},
{