Skip to content

Commit 7f07c0a

Browse files
committed
FINERACT-2326: Upgrade asciidoc dependencies
1 parent d48eb16 commit 7f07c0a

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

build.gradle

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,11 @@ plugins {
104104
id 'net.ltgt.errorprone' version '4.1.0' apply false
105105
id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.23' apply false
106106
id 'com.gorylenko.gradle-git-properties' version '2.4.2' apply false
107-
// can't upgrade to 4.x because of one of these:
108-
// https://github.com/asciidoctor/asciidoctorj-pdf/issues/25
109-
// https://github.com/jruby/jruby/issues/5573
110-
// https://github.com/asciidoctor/asciidoctorj-pdf/issues/16
111-
id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
112-
id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
107+
id 'org.asciidoctor.jvm.convert' version '4.0.5' apply false
108+
id 'org.asciidoctor.jvm.pdf' version '4.0.5' apply false
113109
id 'com.google.cloud.tools.jib' version '3.4.5' apply false
114110
id 'org.sonarqube' version '6.0.1.5171'
115111
id 'com.github.andygoossens.modernizer' version '1.10.0' apply false
116-
// TODO: upgrade to 6.0.4
117112
id 'com.github.spotbugs' version '6.0.26' apply false
118113
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
119114
id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false

fineract-doc/build.gradle

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,49 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19+
20+
buildscript {
21+
repositories {
22+
mavenCentral()
23+
gradlePluginPortal()
24+
}
25+
26+
dependencies {
27+
classpath 'org.asciidoctor:asciidoctor-gradle-jvm:4.0.5'
28+
classpath 'org.asciidoctor:asciidoctor-gradle-jvm-pdf:4.0.5'
29+
classpath 'org.yaml:snakeyaml:1.33'
30+
}
31+
}
32+
33+
plugins {
34+
id 'org.asciidoctor.jvm.convert' version '4.0.5' apply false
35+
id 'org.asciidoctor.jvm.pdf' version '4.0.5' apply false
36+
}
37+
1938
apply plugin: 'org.asciidoctor.jvm.convert'
2039
apply plugin: 'org.asciidoctor.jvm.pdf'
2140

41+
// Configure resolution strategy for all configurations
42+
configurations.all {
43+
resolutionStrategy {
44+
// Force specific versions of dependencies to avoid conflicts
45+
force 'org.yaml:snakeyaml:1.33',
46+
'org.jruby:jruby-complete:9.4.5.0'
47+
}
48+
}
49+
50+
// Configure Asciidoctor PDF
51+
asciidoctorPdf {
52+
asciidoctorj {
53+
version = '2.5.11' // Explicitly set AsciidoctorJ version
54+
55+
modules {
56+
// Use a specific version of asciidoctorj-pdf that's known to work with AsciidoctorJ 2.5.11
57+
pdf.version '2.3.10'
58+
}
59+
}
60+
}
61+
2262
// see also: https://asciidoctor.github.io/asciidoctor-gradle-plugin/master/user-guide/
2363

2464
asciidoctorj {

fineract-doc/src/docs/en/chapters/release/configuration-gpg.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ You should protect your revocation certificate. Anyone in possession of your rev
182182
+
183183
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.
184184
185-
1. Upload your GPG key to a keyserver:
185+
6. Upload your GPG key to a keyserver:
186186
+
187187
[source,bash]
188188
----

renovate.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
"matchPackageNames": ["org.openapi.generator"],
3636
"allowedVersions": "<=7.8.0"
3737
},
38-
{
39-
"matchPackageNames": ["org.asciidoctor.jvm.convert", "org.asciidoctor.jvm.pdf"],
40-
"allowedVersions": "<=3.3.2"
41-
},
4238
{
4339
"matchPackageNames": ["org.eclipse.persistence:eclipselink"],
4440
"allowedVersions": "<=4.0.2",
@@ -76,7 +72,7 @@
7672
},
7773
{
7874
"matchPackageNames": ["org.postgresql:postgresql"],
79-
"allowedVersions": "<=42.7.4",
75+
"allowedVersions": "<=42.7.3",
8076
"description": "Postgres JDBC driver 42.7.5 has a performance bug: https://github.com/pgjdbc/pgjdbc/issues/3511#issuecomment-2637277977"
8177
},
8278
{

0 commit comments

Comments
 (0)