From e4a0b6988f84e85e427484e65321e9583080ccb5 Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Tue, 16 Jul 2024 11:07:51 +0200 Subject: [PATCH] Switch to a okhttp-digest version that is available on Maven central --- documentation/documentation.gradle | 12 +++++++++++- gradle.properties | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 5ffc646822..02b5f88298 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -3,6 +3,16 @@ import java.util.function.Function import org.asciidoctor.gradle.jvm.AsciidoctorTask import org.asciidoctor.gradle.jvm.pdf.AsciidoctorPdfTask +buildscript { + configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module( 'com.burgstaller:okhttp-digest:1.10' ) using module( + 'io.github.rburgst:okhttp-digest:1.21' + ) because 'okhttp-digest only version 1.21 is available on Maven Central. Old version was on jcenter, which asciidoctor-gradle-plugin depends on transitively through simplified-jruby-gradle-plugin via http-builder-ng-okhttp ' + } + } +} + plugins { id 'org.asciidoctor.jvm.convert' version '4.0.2' id 'org.asciidoctor.jvm.pdf' version '4.0.2' @@ -693,7 +703,7 @@ def renderUserGuideHtmlTask = tasks.register( 'renderUserGuideHtml', Asciidoctor stylesheet: "css/hibernate.css", docinfo: 'private', jpaJavadocUrlPrefix: "https://javaee.github.io/javaee-spec/javadocs/javax/persistence/", - 'generated-report-dir': layout.buildDirectory.dir( 'orm/generated' ) + 'generated-report-dir': layout.buildDirectory.dir( 'orm/generated' ).get() resources { from( 'src/main/asciidoc/userguide/' ) { diff --git a/gradle.properties b/gradle.properties index 5d576f7c22..54bc66455a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Keep all these properties in sync unless you know what you are doing! # We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger. # (Some of these settings need to be repeated in the test.jvmArgs blocks of each module) -org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=384m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8 toolchain.compiler.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8 toolchain.javadoc.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8 toolchain.launcher.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=448m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8