From caba46cd2ced26bd395ed78ded151c58ba614268 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Jul 2025 21:03:37 -0700 Subject: [PATCH 1/2] Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0 (#351) * Bump org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0 Bumps org.apache.commons:commons-lang3 from 3.17.0 to 3.18.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.18.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] * bump okhttp@5.1.0, junit-jupiter@5.13.3 * ci: reverted workflow event handler settings * chore: removed checked exception from tearDown method --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: petruki <31597636+petruki@users.noreply.github.com> --- .github/workflows/master-2.yml | 4 ++-- .github/workflows/master.yml | 4 ++-- pom.xml | 16 ++++++++-------- .../switcherapi/fixture/MockWebServerHelper.java | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml index 3a9ff28..dd38f92 100644 --- a/.github/workflows/master-2.yml +++ b/.github/workflows/master-2.yml @@ -2,9 +2,9 @@ name: Master CI v2 on: push: - branches: [master-2] + branches: [ master-2 ] pull_request: - branches: [master-2] + branches: [ master-2 ] jobs: build-scan: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ba59f18..926b22e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -2,9 +2,9 @@ name: Master CI v1 on: push: - branches: [master] + branches: [ master ] pull_request: - branches: [master] + branches: [ master ] jobs: build-scan: diff --git a/pom.xml b/pom.xml index 42ab516..bc1b484 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ - + 4.0.0 com.github.switcherapi @@ -59,15 +59,15 @@ 2.13.1 - 3.17.0 + 3.18.0 3.11.1 2.0.17 - 5.0.0-alpha.16 - 5.13.1 + 5.1.0 + 5.13.3 1.9.1 - 1.13.1 + 1.13.3 3.14.0 @@ -77,7 +77,7 @@ 3.2.7 3.11.0.3922 0.8.13 - 0.7.0 + 0.8.0 jacoco diff --git a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java b/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java index 0a45fd1..2420a39 100644 --- a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java +++ b/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java @@ -26,12 +26,12 @@ protected static void setupMockServer() throws IOException { ((QueueDispatcher) mockBackEnd.getDispatcher()).setFailFast(true); } - protected static void tearDownMockServer() throws IOException { - mockBackEnd.shutdown(); + protected static void tearDownMockServer() { + mockBackEnd.close(); } protected void givenResponse(MockResponse response) { - ((QueueDispatcher) mockBackEnd.getDispatcher()).enqueueResponse(response); + ((QueueDispatcher) mockBackEnd.getDispatcher()).enqueue(response); } protected MockResponse generateTimeOut(int timeoutMs) { @@ -103,7 +103,7 @@ protected MockResponse generateCheckSnapshotVersionResponse(String status) { */ protected MockResponse generateStatusResponse(String code) { MockResponse.Builder builder = new MockResponse.Builder(); - builder.setCode(Integer.parseInt(code)); + builder.code(Integer.parseInt(code)); return builder.build(); } From c767bf3f0d878d24ab9a55b1971a34efd4ee0600 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 11 Jul 2025 21:10:54 -0700 Subject: [PATCH 2/2] Bump release version to 1.7.2-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc1b484..282badc 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.github.switcherapi switcher-client jar - 1.7.1 + 1.7.2-SNAPSHOT Switcher Client Switcher Client SDK for working with Switcher API