From 445729589094968507f9449ba4c1fcaf5405f893 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Jul 2025 01:32:54 +0000 Subject: [PATCH 1/4] 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] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f449188..d956103 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 2.13.1 - 3.17.0 + 3.18.0 3.11.1 2.0.17 From 99d730464c5172d809a6e3eafa00de89f58c5e08 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 11 Jul 2025 20:51:29 -0700 Subject: [PATCH 2/4] bump okhttp@5.1.0, junit-jupiter@5.13.3 --- .github/workflows/master-2.yml | 3 ++- .github/workflows/master.yml | 3 ++- pom.xml | 10 +++++----- .../switcherapi/fixture/MockWebServerHelper.java | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml index 3a9ff28..4cc6c05 100644 --- a/.github/workflows/master-2.yml +++ b/.github/workflows/master-2.yml @@ -3,8 +3,9 @@ name: Master CI v2 on: push: branches: [master-2] - pull_request: + pull_request_target: branches: [master-2] + types: [opened, synchronize, reopened] jobs: build-scan: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index ba59f18..f72fd8a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -3,8 +3,9 @@ name: Master CI v1 on: push: branches: [master] - pull_request: + pull_request_target: branches: [master] + types: [opened, synchronize, reopened] jobs: build-scan: diff --git a/pom.xml b/pom.xml index d956103..ce55760 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.github.switcherapi switcher-client jar - 2.3.1 + 2.3.2-SNAPSHOT Switcher Client Switcher Client SDK for working with Switcher API @@ -58,10 +58,10 @@ 2.0.17 - 5.0.0-alpha.16 - 5.13.1 + 5.1.0 + 5.13.3 2.3.0 - 1.13.1 + 1.13.3 3.14.0 @@ -71,7 +71,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..0ebcdf2 100644 --- a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java +++ b/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java @@ -27,11 +27,11 @@ protected static void setupMockServer() throws IOException { } protected static void tearDownMockServer() throws IOException { - mockBackEnd.shutdown(); + 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 73a77c511f49944f7997499619ebe3560ab6f8f5 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 11 Jul 2025 20:55:39 -0700 Subject: [PATCH 3/4] ci: reverted workflow event handler settings --- .github/workflows/master-2.yml | 7 +++---- .github/workflows/master.yml | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master-2.yml b/.github/workflows/master-2.yml index 4cc6c05..dd38f92 100644 --- a/.github/workflows/master-2.yml +++ b/.github/workflows/master-2.yml @@ -2,10 +2,9 @@ name: Master CI v2 on: push: - branches: [master-2] - pull_request_target: - branches: [master-2] - types: [opened, synchronize, reopened] + branches: [ master-2 ] + pull_request: + branches: [ master-2 ] jobs: build-scan: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f72fd8a..926b22e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -2,10 +2,9 @@ name: Master CI v1 on: push: - branches: [master] - pull_request_target: - branches: [master] - types: [opened, synchronize, reopened] + branches: [ master ] + pull_request: + branches: [ master ] jobs: build-scan: From 0b807a67e38f95e8efcd8639fda6f9a8a08b3810 Mon Sep 17 00:00:00 2001 From: petruki <31597636+petruki@users.noreply.github.com> Date: Fri, 11 Jul 2025 21:01:09 -0700 Subject: [PATCH 4/4] chore: removed checked exception from tearDown method --- .../com/github/switcherapi/fixture/MockWebServerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java b/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java index 0ebcdf2..2420a39 100644 --- a/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java +++ b/src/test/java/com/github/switcherapi/fixture/MockWebServerHelper.java @@ -26,7 +26,7 @@ protected static void setupMockServer() throws IOException { ((QueueDispatcher) mockBackEnd.getDispatcher()).setFailFast(true); } - protected static void tearDownMockServer() throws IOException { + protected static void tearDownMockServer() { mockBackEnd.close(); }