Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/master-2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Master CI v1

on:
push:
branches: [master]
branches: [ master ]
pull_request:
branches: [master]
branches: [ master ]

jobs:
build-scan:
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.switcherapi</groupId>
<artifactId>switcher-client</artifactId>
<packaging>jar</packaging>
<version>1.7.1</version>
<version>1.7.2-SNAPSHOT</version>

<name>Switcher Client</name>
<description>Switcher Client SDK for working with Switcher API</description>
Expand Down Expand Up @@ -59,15 +59,15 @@
<gson.version>2.13.1</gson.version>

<!-- utils -->
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<commons-net.version>3.11.1</commons-net.version>
<slf4j-api.version>2.0.17</slf4j-api.version>

<!-- test -->
<okhttp.version>5.0.0-alpha.16</okhttp.version>
<junit-jupiter.version>5.13.1</junit-jupiter.version>
<okhttp.version>5.1.0</okhttp.version>
<junit-jupiter.version>5.13.3</junit-jupiter.version>
<junit-pioneer.version>1.9.1</junit-pioneer.version>
<junit-platform-launcher.version>1.13.1</junit-platform-launcher.version>
<junit-platform-launcher.version>1.13.3</junit-platform-launcher.version>

<!-- Plugins -->
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
Expand All @@ -77,7 +77,7 @@
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<sonar-maven-plugin.version>3.11.0.3922</sonar-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>

<!-- Sonar -->
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
}

Expand Down