Skip to content

chore: [DevOps] bump the production-minor-patch group across 1 directory with 25 updates #661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bot-sdk-js merged 3 commits into from
Dec 9, 2024
+23 −22
Merged

chore: [DevOps] bump the production-minor-patch group across 1 directory with 25 updates #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97edf0b
chore: [DevOps] bump the production-minor-patch group across 1 direct…
dependabot[bot] Dec 9, 2024
4726667
Merge branch 'main' into dependabot/maven/main/production-minor-patch…
newtork Dec 9, 2024
0111a9b
Add suppression
a-d Dec 9, 2024
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
2 changes: 1 addition & 1 deletion archetypes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</extension>
</extensions>
<plugins>
Expand Down
6 changes: 3 additions & 3 deletions cloudplatform/connectivity-ztis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.68.0</version>
<version>1.68.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -73,7 +73,7 @@
<dependency>
<groupId>io.spiffe</groupId>
<artifactId>java-spiffe-core</artifactId>
<version>0.8.9</version>
<version>0.8.11</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
Expand All @@ -84,7 +84,7 @@
<dependency>
<groupId>io.spiffe</groupId>
<artifactId>grpc-netty-linux</artifactId>
<version>0.8.9</version>
<version>0.8.11</version>
<scope>runtime</scope>
</dependency>
<!-- Override grpc versions from spiffe -->
Expand Down
1 change: 1 addition & 0 deletions ...pi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ public <T> T invokeAPI(
// auth headers are added automatically by the SDK
// updateParamsForAuth(authNames, queryParams, headerParams);

@SuppressWarnings( "deprecation" ) // spring-web:6.2.0 and later, works until <7.0.0
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
Comment on lines +696 to 697
Copy link
Contributor

@newtork newtork Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With spring-web:6.2.0 they...

  • deprecated UriComponentsBuilder.fromHttpUrl
  • added UriComponentsBuilder.fromUriString

We cannot simply change API usage, as it would be breaking for all users that have spring-web:6.1.15 and older (2024-11-14).

Screenshot

image

if( queryParams != null ) {
//encode the query parameters in case they contain unsafe characters
Expand Down
14 changes: 7 additions & 7 deletions dependency-bundles/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,27 @@
<x-sap-release-maturity>Stable</x-sap-release-maturity>
<!-- do not modify the following line, it is updated by the versioning script -->
<sdk.version>5.15.0-SNAPSHOT</sdk.version>
<service-binding.version>0.10.5</service-binding.version>
<service-binding.version>0.20.0</service-binding.version>
<!-- HTTP stuff -->
<httpcore.version>4.4.16</httpcore.version>
<httpcore5.version>5.3.1</httpcore5.version>
<httpclient5.version>5.4</httpclient5.version>
<httpclient5.version>5.4.1</httpclient5.version>
<httpcomponents-client.version>4.5.14</httpcomponents-client.version>
<jakarta-servlet.version>6.1.0</jakarta-servlet.version>
<!-- XSUAA -->
<!-- Keep this version consistent with the one from the SAP Java Buildpack (after their 2.0 release) -->
<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
<scp-cf.xsuaa-client.version>3.5.3</scp-cf.xsuaa-client.version>
<scp-cf.xsuaa-client.version>3.5.5</scp-cf.xsuaa-client.version>
<java-jwt.version>4.4.0</java-jwt.version>
<!-- Utility stuff -->
<slf4j.version>2.0.16</slf4j.version>
<lombok.version>1.18.34</lombok.version>
<lombok.version>1.18.36</lombok.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
<!-- @Nonnull/@Nullable annotations -->
<vavr.version>0.10.5</vavr.version>
<guava.version>33.3.1-jre</guava.version>
<!-- collection utilities, @Beta annotation -->
<commons-io.version>2.17.0</commons-io.version>
<commons-io.version>2.18.0</commons-io.version>
<!-- Apache file utils -->
<axis2.version>1.7.9</axis2.version>
<!--Used in essential modules: cloudplatform-connectivity, connectivity-destination-service, odata-client, odata-core, securitys-->
Expand Down Expand Up @@ -264,13 +264,13 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.48.1</version>
<version>3.48.3</version>
</dependency>
<!-- 2.10 by Caffeine and 2.11 by Guava -->
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
<version>2.34.0</version>
<version>2.36.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
22 changes: 11 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,32 +94,32 @@
<!-- Spring dependencies -->
<!-- Keep these versions consistent with the ones from the SAP Java Buildpack (after their 2.0 release) -->
<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
<spring.version>6.1.14</spring.version>
<spring.version>6.2.0</spring.version>
<spring-security.version>6.1.5</spring-security.version>
<slf4j.version>2.0.16</slf4j.version>
<assertj-core.version>3.26.3</assertj-core.version>
<assertj-vavr.version>0.4.3</assertj-vavr.version>
<mockito.version>5.14.2</mockito.version>
<jsonassert.version>1.5.3</jsonassert.version>
<junit.jupiter.version>5.11.2</junit.jupiter.version>
<junit.jupiter.version>5.11.3</junit.jupiter.version>
<codemodel.version>2.6</codemodel.version>
<olingo-v4.version>5.0.0</olingo-v4.version>
<olingo-v2.version>2.0.13</olingo-v2.version>
<maven-plugin.version>3.9.9</maven-plugin.version>
<maven-plugin-annotations.version>3.15.0</maven-plugin-annotations.version>
<maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>
<maven-plugin-testing.version>3.3.0</maven-plugin-testing.version>
<caffeine.version>3.1.8</caffeine.version>
<openapi-generator.version>7.8.0</openapi-generator.version>
<io-swagger-core-v3.version>2.2.25</io-swagger-core-v3.version>
<io-swagger-parser-v3.version>2.1.22</io-swagger-parser-v3.version>
<openapi-generator.version>7.10.0</openapi-generator.version>
<io-swagger-core-v3.version>2.2.26</io-swagger-core-v3.version>
<io-swagger-parser-v3.version>2.1.24</io-swagger-parser-v3.version>
<io-swagger-core.version>1.6.11</io-swagger-core.version>
<!-- sync plexus version with transitive dependency coming from "org.twadata.maven:mojo-executor" -->
<stax2-api.version>4.2.2</stax2-api.version>
<bouncycastle.version>1.78.1</bouncycastle.version>
<bouncycastle.version>1.79</bouncycastle.version>
<jakarta-activation.version>2.1.0</jakarta-activation.version>
<qdox.version>2.1.0</qdox.version>
<wiremock.version>3.9.1</wiremock.version>
<checkstyle.version>10.18.2</checkstyle.version>
<qdox.version>2.2.0</qdox.version>
<wiremock.version>3.10.0</wiremock.version>
<checkstyle.version>10.20.2</checkstyle.version>
<byte-buddy.version>1.15.10</byte-buddy.version>
<snakeyaml.version>2.3</snakeyaml.version>
<commons-codec.version>1.17.1</commons-codec.version>
Expand Down Expand Up @@ -957,7 +957,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<version>1.18.36</version>
</dependency>
</dependencies>
<configuration>
Expand Down
Loading