FINERACT-2326: Upgrade asciidoc dependencies

This commit is contained in:
Adam Saghy
2025-09-18 20:55:01 +02:00
parent d48eb161ea
commit 7f07c0afce
4 changed files with 44 additions and 13 deletions
+2 -7
View File
@@ -104,16 +104,11 @@ plugins {
id 'net.ltgt.errorprone' version '4.1.0' apply false 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 '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 id 'com.gorylenko.gradle-git-properties' version '2.4.2' apply false
// can't upgrade to 4.x because of one of these: id 'org.asciidoctor.jvm.convert' version '4.0.5' apply false
// https://github.com/asciidoctor/asciidoctorj-pdf/issues/25 id 'org.asciidoctor.jvm.pdf' version '4.0.5' apply false
// 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 'com.google.cloud.tools.jib' version '3.4.5' apply false id 'com.google.cloud.tools.jib' version '3.4.5' apply false
id 'org.sonarqube' version '6.0.1.5171' id 'org.sonarqube' version '6.0.1.5171'
id 'com.github.andygoossens.modernizer' version '1.10.0' apply false 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 'com.github.spotbugs' version '6.0.26' apply false
id 'se.thinkcode.cucumber-runner' version '0.0.11' 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 id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false
+40
View File
@@ -16,9 +16,49 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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.convert'
apply plugin: 'org.asciidoctor.jvm.pdf' 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/ // see also: https://asciidoctor.github.io/asciidoctor-gradle-plugin/master/user-guide/
asciidoctorj { asciidoctorj {
@@ -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. 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] [source,bash]
---- ----
+1 -5
View File
@@ -35,10 +35,6 @@
"matchPackageNames": ["org.openapi.generator"], "matchPackageNames": ["org.openapi.generator"],
"allowedVersions": "<=7.8.0" "allowedVersions": "<=7.8.0"
}, },
{
"matchPackageNames": ["org.asciidoctor.jvm.convert", "org.asciidoctor.jvm.pdf"],
"allowedVersions": "<=3.3.2"
},
{ {
"matchPackageNames": ["org.eclipse.persistence:eclipselink"], "matchPackageNames": ["org.eclipse.persistence:eclipselink"],
"allowedVersions": "<=4.0.2", "allowedVersions": "<=4.0.2",
@@ -76,7 +72,7 @@
}, },
{ {
"matchPackageNames": ["org.postgresql:postgresql"], "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" "description": "Postgres JDBC driver 42.7.5 has a performance bug: https://github.com/pgjdbc/pgjdbc/issues/3511#issuecomment-2637277977"
}, },
{ {