diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index fe2408431..78edd4088 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -21,7 +21,6 @@ jobs: max-parallel: 4 matrix: java: - - '8' - '11' - '17' os: diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 6e68f408c..c9f268939 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -50,6 +50,7 @@ Improvement:: Bug Fixes:: * CLI should set :mkdirs option by default (#1241) (@mojavelinux) +* Fix unresolvable dependency of JRuby Gradle plugin. (#1275) == 2.5.10 (2023-06-04) diff --git a/asciidoctorj-springboot-integration-test/src/test/java/org/asciidoctor/it/springboot/SpringBootTest.java b/asciidoctorj-springboot-integration-test/src/test/java/org/asciidoctor/it/springboot/SpringBootTest.java index 87e2244b2..ad7886867 100644 --- a/asciidoctorj-springboot-integration-test/src/test/java/org/asciidoctor/it/springboot/SpringBootTest.java +++ b/asciidoctorj-springboot-integration-test/src/test/java/org/asciidoctor/it/springboot/SpringBootTest.java @@ -2,7 +2,6 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import kotlin.collections.ArrayDeque; import okhttp3.*; import org.awaitility.Awaitility; import org.junit.After; @@ -10,20 +9,20 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.Base64; import java.util.List; import java.util.Map; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; -import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.asciidoctor.it.springboot.ProcessHelper.run; import static org.assertj.core.api.Assertions.assertThat; public class SpringBootTest { - final List testProcesses = new ArrayDeque<>(); + final List testProcesses = new ArrayList<>(); @Test diff --git a/build.gradle b/build.gradle index 3e1efe2c1..abbeaa729 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,11 @@ buildscript { } dependencies { classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0" + classpath("com.github.jruby-gradle:jruby-gradle-plugin:2.0.1") { + exclude module: 'grolifant' + exclude module: 'okhttp-digest' + } + classpath 'org.ysb33r.gradle:grolifant:0.17.0' } } @@ -24,7 +29,8 @@ plugins { id "io.sdkman.vendors" version "2.0.0" id "signing" id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id 'com.github.jruby-gradle.base' version '2.0.0' + // Moved to dependency in buildscript. See https://github.com/asciidoctor/asciidoctorj/issues/1275 + // id 'com.github.jruby-gradle.base' version '2.0.1' id 'codenarc' }