Skip to content

Commit e4a0b69

Browse files
committed
Switch to a okhttp-digest version that is available on Maven central
1 parent 1da1845 commit e4a0b69

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

documentation/documentation.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ import java.util.function.Function
33
import org.asciidoctor.gradle.jvm.AsciidoctorTask
44
import org.asciidoctor.gradle.jvm.pdf.AsciidoctorPdfTask
55

6+
buildscript {
7+
configurations.all {
8+
resolutionStrategy.dependencySubstitution {
9+
substitute module( 'com.burgstaller:okhttp-digest:1.10' ) using module(
10+
'io.github.rburgst:okhttp-digest:1.21'
11+
) 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 '
12+
}
13+
}
14+
}
15+
616
plugins {
717
id 'org.asciidoctor.jvm.convert' version '4.0.2'
818
id 'org.asciidoctor.jvm.pdf' version '4.0.2'
@@ -693,7 +703,7 @@ def renderUserGuideHtmlTask = tasks.register( 'renderUserGuideHtml', Asciidoctor
693703
stylesheet: "css/hibernate.css",
694704
docinfo: 'private',
695705
jpaJavadocUrlPrefix: "https://javaee.github.io/javaee-spec/javadocs/javax/persistence/",
696-
'generated-report-dir': layout.buildDirectory.dir( 'orm/generated' )
706+
'generated-report-dir': layout.buildDirectory.dir( 'orm/generated' ).get()
697707

698708
resources {
699709
from( 'src/main/asciidoc/userguide/' ) {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Keep all these properties in sync unless you know what you are doing!
22
# We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger.
33
# (Some of these settings need to be repeated in the test.jvmArgs blocks of each module)
4-
org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
4+
org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=384m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
55
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
66
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
77
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

0 commit comments

Comments
 (0)