From ab96e11261b93aa910aa7435798f47c0c314eabd Mon Sep 17 00:00:00 2001 From: "dwolla-oss-scala-steward[bot]" <212073+dwolla-oss-scala-steward[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:47:05 +0000 Subject: [PATCH 1/3] Update junit-platform-engine, ... to 6.1.1 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 3ff3c93..310cbd4 100644 --- a/build.sbt +++ b/build.sbt @@ -54,8 +54,8 @@ lazy val `rsocket-consul-java` = (project in file(".")) "com.google.code.gson" % "gson" % "2.14.0", "org.slf4j" % "slf4j-api" % "2.0.17", "org.junit.jupiter" % "junit-jupiter" % "5.14.4" % Test, - "org.junit.platform" % "junit-platform-engine" % "1.14.4" % Test, - "org.junit.platform" % "junit-platform-launcher" % "1.14.4" % Test, + "org.junit.platform" % "junit-platform-engine" % "6.1.1" % Test, + "org.junit.platform" % "junit-platform-launcher" % "6.1.1" % Test, "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test, "org.mockito" % "mockito-core" % "5.23.0" % Test, "org.slf4j" % "slf4j-nop" % "2.0.17" % Test, From c69ac93bc86313a09ac291125c9bb88439c3357e Mon Sep 17 00:00:00 2001 From: "dwolla-oss-scala-steward[bot]" <212073+dwolla-oss-scala-steward[bot]@users.noreply.github.com> Date: Tue, 30 Jun 2026 17:46:45 +0000 Subject: [PATCH 2/3] Update junit-jupiter to 6.1.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 310cbd4..6dfa289 100644 --- a/build.sbt +++ b/build.sbt @@ -53,7 +53,7 @@ lazy val `rsocket-consul-java` = (project in file(".")) "org.asynchttpclient" % "async-http-client" % "2.14.5", "com.google.code.gson" % "gson" % "2.14.0", "org.slf4j" % "slf4j-api" % "2.0.17", - "org.junit.jupiter" % "junit-jupiter" % "5.14.4" % Test, + "org.junit.jupiter" % "junit-jupiter" % "6.1.1" % Test, "org.junit.platform" % "junit-platform-engine" % "6.1.1" % Test, "org.junit.platform" % "junit-platform-launcher" % "6.1.1" % Test, "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test, From 94b9574b92e140e39dc8c45820731046eda3a359 Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Wed, 1 Jul 2026 11:16:27 -0500 Subject: [PATCH 3/3] Remove Java 11, which is no longer supported by JUnit 6 --- .github/workflows/ci.yml | 49 ++++------------------------------------ .mergify.yml | 1 - build.sbt | 2 +- 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d23152..29f7f8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-22.04] scala: [2.12] - java: [temurin@11, temurin@17, temurin@21] + java: [temurin@17, temurin@21] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -41,19 +41,6 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 11 - cache: sbt - - - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' - run: sbt +update - - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -87,11 +74,11 @@ jobs: run: sbt '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04' run: sbt '++ ${{ matrix.scala }}' doc - name: Make target directories @@ -116,7 +103,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [temurin@11] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -127,19 +114,6 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 11 - cache: sbt - - - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' - run: sbt +update - - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' @@ -206,7 +180,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - java: [temurin@11] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -217,19 +191,6 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v5 - with: - distribution: temurin - java-version: 11 - cache: sbt - - - name: sbt update - if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' - run: sbt +update - - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' diff --git a/.mergify.yml b/.mergify.yml index 00c437f..c0fa17f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,7 +12,6 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - status-success=Test (ubuntu-22.04, 2.12, temurin@11) - status-success=Test (ubuntu-22.04, 2.12, temurin@17) - status-success=Test (ubuntu-22.04, 2.12, temurin@21) actions: diff --git a/build.sbt b/build.sbt index 6dfa289..68c468d 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ inThisBuild(List( .withMergeMinors(true) }}, - githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.temurin("21")), + githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")), githubWorkflowTargetTags ++= Seq("v*"), githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),