Skip to content

Commit 52b81b4

Browse files
dependabot[bot]a-dnewtork
authored
chore: [DevOps] bump the production-minor-patch group across 1 directory with 16 updates (#684)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexander Dümont <[email protected]> Co-authored-by: Alexander Dümont <[email protected]>
1 parent d5799e2 commit 52b81b4

File tree

9 files changed

+32
-27
lines changed

9 files changed

+32
-27
lines changed

cloudplatform/connectivity-dwc/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteConnectivityProxyInformationResolverTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.cloudplatform.connectivity;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import static org.assertj.core.api.Assertions.assertThat;
46
import static org.assertj.core.api.Assertions.assertThatThrownBy;
57
import static org.mockito.ArgumentMatchers.any;
@@ -25,7 +27,6 @@
2527
import org.junit.jupiter.api.Test;
2628
import org.junit.jupiter.api.Timeout;
2729

28-
import com.google.common.base.Charsets;
2930
import com.sap.cloud.sdk.cloudplatform.resilience.ResilienceRuntimeException;
3031
import com.sap.cloud.sdk.cloudplatform.tenant.DefaultTenant;
3132
import com.sap.cloud.sdk.cloudplatform.tenant.TenantAccessor;
@@ -43,7 +44,7 @@ class MegacliteConnectivityProxyInformationResolverTest
4344
doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK"))
4445
.when(successResponse)
4546
.getStatusLine();
46-
doReturn(new StringEntity("{ \"proxy\":\"http://some.proxy\", \"proxyAuth\":\"Bearer 1234\"}", Charsets.UTF_8))
47+
doReturn(new StringEntity("{ \"proxy\":\"http://some.proxy\", \"proxyAuth\":\"Bearer 1234\"}", UTF_8))
4748
.when(successResponse)
4849
.getEntity();
4950

datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataHttpRequest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.datamodel.odata.client.request;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import java.io.IOException;
46
import java.net.URI;
57
import java.util.function.Function;
@@ -21,7 +23,6 @@
2123
import org.apache.http.conn.ConnectionPoolTimeoutException;
2224
import org.apache.http.entity.StringEntity;
2325

24-
import com.google.common.base.Charsets;
2526
import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataConnectionException;
2627
import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataRequestException;
2728

@@ -54,7 +55,7 @@ static ODataHttpRequest forBodyJson(
5455
@Nonnull final HttpClient httpClient,
5556
@Nonnull final String json )
5657
{
57-
final StringEntity requestBody = new StringEntity(json, Charsets.UTF_8);
58+
final StringEntity requestBody = new StringEntity(json, UTF_8);
5859
requestBody.setContentType("application/json");
5960
return forHttpEntity(requestGeneric, httpClient, requestBody);
6061
}
@@ -64,7 +65,7 @@ static ODataHttpRequest forBodyText(
6465
@Nonnull final HttpClient httpClient,
6566
@Nonnull final String text )
6667
{
67-
return forHttpEntity(requestGeneric, httpClient, new StringEntity(text, Charsets.UTF_8));
68+
return forHttpEntity(requestGeneric, httpClient, new StringEntity(text, UTF_8));
6869
}
6970

7071
static ODataHttpRequest forHttpEntity(

datamodel/odata-client/src/main/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataRequestUpdate.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.datamodel.odata.client.request;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import static org.apache.http.HttpHeaders.CONTENT_TYPE;
46

57
import java.net.URI;
@@ -14,7 +16,6 @@
1416
import org.apache.http.entity.StringEntity;
1517
import org.apache.http.util.EntityUtils;
1618

17-
import com.google.common.base.Charsets;
1819
import com.google.common.collect.Lists;
1920
import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
2021
import com.sap.cloud.sdk.datamodel.odata.client.exception.ODataRequestException;
@@ -190,7 +191,7 @@ public ODataRequestResultGeneric execute( @Nonnull final HttpClient httpClient )
190191
public String getSerializedEntity()
191192
{
192193
return Try
193-
.of(() -> EntityUtils.toString(requestHttpEntity, Charsets.UTF_8))
194+
.of(() -> EntityUtils.toString(requestHttpEntity, UTF_8))
194195
.getOrElseThrow(e -> new ODataRequestException(this, "Unable to serialize request payload.", e));
195196
}
196197

datamodel/odata-client/src/test/java/com/sap/cloud/sdk/datamodel/odata/client/request/ODataQueryPropertyTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.datamodel.odata.client.request;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import static com.github.tomakehurst.wiremock.client.WireMock.containing;
46
import static com.github.tomakehurst.wiremock.client.WireMock.delete;
57
import static com.github.tomakehurst.wiremock.client.WireMock.deleteRequestedFor;
@@ -15,14 +17,12 @@
1517
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
1618
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
1719
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
18-
import static com.google.common.base.Charsets.UTF_8;
1920
import static com.sap.cloud.sdk.datamodel.odata.client.request.UpdateStrategy.REPLACE_WITH_PUT;
2021
import static org.apache.http.HttpHeaders.ACCEPT;
2122
import static org.apache.http.HttpHeaders.CONTENT_TYPE;
2223
import static org.assertj.core.api.Assertions.assertThat;
2324

2425
import java.io.ByteArrayInputStream;
25-
import java.nio.charset.StandardCharsets;
2626

2727
import javax.annotation.Nonnull;
2828

@@ -124,7 +124,7 @@ void deleteSimplePropertyV2()
124124
void getStreamPropertyV2()
125125
{
126126
final String payloadV2 = "<xml>This is a large document</xml>";
127-
final byte[] payloadBytes = payloadV2.getBytes(StandardCharsets.UTF_8);
127+
final byte[] payloadBytes = payloadV2.getBytes(UTF_8);
128128
stubFor(get(WireMock.anyUrl()).willReturn(ok().withBody(payloadBytes).withHeader(CONTENT_TYPE, XML)));
129129

130130
// user code
@@ -149,7 +149,7 @@ void setStreamPropertyV2()
149149

150150
// user code
151151
final String payloadV2 = "<xml>This is a large document</xml>";
152-
final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV2.getBytes(StandardCharsets.UTF_8));
152+
final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV2.getBytes(UTF_8));
153153
final HttpEntity httpEntity = new InputStreamEntity(payloadBytes, ContentType.create(XML, UTF_8));
154154

155155
final ODataRequestResultGeneric result =
@@ -220,7 +220,7 @@ void deleteSimplePropertyV4()
220220
void getStreamPropertyV4()
221221
{
222222
final String payloadV4 = "<xml>This is a large document</xml>";
223-
final byte[] payloadBytes = payloadV4.getBytes(StandardCharsets.UTF_8);
223+
final byte[] payloadBytes = payloadV4.getBytes(UTF_8);
224224
stubFor(get(WireMock.anyUrl()).willReturn(ok().withBody(payloadBytes).withHeader(CONTENT_TYPE, XML)));
225225

226226
// user code
@@ -245,7 +245,7 @@ void setStreamPropertyV4()
245245

246246
// user code
247247
final String payloadV4 = "<xml>This is a large document</xml>";
248-
final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV4.getBytes(StandardCharsets.UTF_8));
248+
final ByteArrayInputStream payloadBytes = new ByteArrayInputStream(payloadV4.getBytes(UTF_8));
249249
final HttpEntity httpEntity = new InputStreamEntity(payloadBytes, ContentType.create(XML, UTF_8));
250250

251251
final ODataRequestResultGeneric result =

datamodel/odata-v4/odata-v4-core/src/test/java/com/sap/cloud/sdk/datamodel/odatav4/core/ModificationResponseTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.datamodel.odatav4.core;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import static org.assertj.core.api.Assertions.assertThat;
46
import static org.mockito.Mockito.doReturn;
57
import static org.mockito.Mockito.mock;
@@ -21,7 +23,6 @@
2123

2224
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2325
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
24-
import com.google.common.base.Charsets;
2526
import com.google.gson.annotations.JsonAdapter;
2627
import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
2728
import com.sap.cloud.sdk.datamodel.odata.client.request.ODataRequestGeneric;
@@ -78,7 +79,7 @@ void testEntityResponse()
7879
final HttpResponse response = mock(HttpResponse.class);
7980
doReturn(responseHeaders).when(response).getAllHeaders();
8081
doReturn(responseHeaders).when(response).getHeaders("ETag");
81-
doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity();
82+
doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity();
8283
doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine();
8384

8485
final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response);
@@ -136,7 +137,7 @@ void testResponseIsOnlyEvaluatedOnce()
136137
final HttpResponse response = mock(HttpResponse.class);
137138
doReturn(responseHeaders).when(response).getAllHeaders();
138139
doReturn(responseHeaders).when(response).getHeaders("ETag");
139-
doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity();
140+
doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity();
140141
doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine();
141142

142143
final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response);

datamodel/odata/odata-core/src/test/java/com/sap/cloud/sdk/datamodel/odata/helper/ModificationResponseTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cloud.sdk.datamodel.odata.helper;
22

3+
import static java.nio.charset.StandardCharsets.UTF_8;
4+
35
import static org.assertj.core.api.Assertions.assertThat;
46
import static org.mockito.Mockito.doReturn;
57
import static org.mockito.Mockito.mock;
@@ -19,7 +21,6 @@
1921
import org.apache.http.message.BasicStatusLine;
2022
import org.junit.jupiter.api.Test;
2123

22-
import com.google.common.base.Charsets;
2324
import com.google.gson.annotations.JsonAdapter;
2425
import com.sap.cloud.sdk.cloudplatform.connectivity.Destination;
2526
import com.sap.cloud.sdk.datamodel.odata.client.ODataProtocol;
@@ -81,7 +82,7 @@ void testEntityResponse()
8182
final HttpResponse response = mock(HttpResponse.class);
8283
doReturn(responseHeaders).when(response).getAllHeaders();
8384
doReturn(responseHeaders).when(response).getHeaders("ETag");
84-
doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity();
85+
doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity();
8586
doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine();
8687

8788
final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response);
@@ -146,7 +147,7 @@ void testResponseIsOnlyEvaluatedOnce()
146147
final HttpResponse response = mock(HttpResponse.class);
147148
doReturn(responseHeaders).when(response).getAllHeaders();
148149
doReturn(responseHeaders).when(response).getHeaders("ETag");
149-
doReturn(new StringEntity("{\"foo\":\"bar\"}", Charsets.UTF_8)).when(response).getEntity();
150+
doReturn(new StringEntity("{\"foo\":\"bar\"}", UTF_8)).when(response).getEntity();
150151
doReturn(new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK")).when(response).getStatusLine();
151152

152153
final ODataRequestResultGeneric result = new ODataRequestResultGeneric(request, response);

datamodel/openapi/openapi-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.mozilla</groupId>
4646
<artifactId>rhino</artifactId>
47-
<version>1.7.15</version>
47+
<version>1.8.0</version>
4848
</dependency>
4949
</dependencies>
5050
</dependencyManagement>

dependency-bundles/bom/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
5555
<!-- @Nonnull/@Nullable annotations -->
5656
<vavr.version>0.10.5</vavr.version>
57-
<guava.version>33.3.1-jre</guava.version>
57+
<guava.version>33.4.0-jre</guava.version>
5858
<!-- collection utilities, @Beta annotation -->
5959
<commons-io.version>2.18.0</commons-io.version>
6060
<!-- Apache file utils -->
@@ -65,7 +65,7 @@
6565
<!-- Resilience & Caching -->
6666
<caffeine.version>3.1.8</caffeine.version>
6767
<jcache.version>1.1.1</jcache.version>
68-
<resilience4j.version>2.2.0</resilience4j.version>
68+
<resilience4j.version>2.3.0</resilience4j.version>
6969
<!-- JSON & XML stuff -->
7070
<gson.version>2.11.0</gson.version>
7171
<jackson.version>2.18.2</jackson.version>
@@ -264,7 +264,7 @@
264264
<dependency>
265265
<groupId>org.checkerframework</groupId>
266266
<artifactId>checker-qual</artifactId>
267-
<version>3.48.3</version>
267+
<version>3.48.4</version>
268268
</dependency>
269269
<!-- 2.10 by Caffeine and 2.11 by Guava -->
270270
<dependency>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@
9797
<spring.version>6.2.1</spring.version>
9898
<spring-security.version>6.1.5</spring-security.version>
9999
<slf4j.version>2.0.16</slf4j.version>
100-
<assertj-core.version>3.26.3</assertj-core.version>
100+
<assertj-core.version>3.27.2</assertj-core.version>
101101
<assertj-vavr.version>0.4.3</assertj-vavr.version>
102-
<mockito.version>5.14.2</mockito.version>
102+
<mockito.version>5.15.2</mockito.version>
103103
<jsonassert.version>1.5.3</jsonassert.version>
104-
<junit.jupiter.version>5.11.3</junit.jupiter.version>
104+
<junit.jupiter.version>5.11.4</junit.jupiter.version>
105105
<codemodel.version>2.6</codemodel.version>
106106
<olingo-v4.version>5.0.0</olingo-v4.version>
107107
<olingo-v2.version>2.0.13</olingo-v2.version>
@@ -119,7 +119,7 @@
119119
<jakarta-activation.version>2.1.0</jakarta-activation.version>
120120
<qdox.version>2.2.0</qdox.version>
121121
<wiremock.version>3.10.0</wiremock.version>
122-
<checkstyle.version>10.21.0</checkstyle.version>
122+
<checkstyle.version>10.21.1</checkstyle.version>
123123
<byte-buddy.version>1.15.11</byte-buddy.version>
124124
<snakeyaml.version>2.3</snakeyaml.version>
125125
<commons-codec.version>1.17.1</commons-codec.version>

0 commit comments

Comments
 (0)