Skip to content

Commit 5cc5254

Browse files
mp911demp911de
committed
Upgrade dependencies.
AWS Java SDK 2.20.152, HTTP Client 5.2.1, HTTP Core 5.2.3, Jackson 2.15.2, Jetty Reactive HTTP Client 4.0, Kotlin 1.8.22, Kotlin Coroutines 1.7.3, Mockito 5.5.0, Netty 4.1.98.Final, Spring Data 2023.0.0-M3, Spring Security 6.2.0-M3, Reactor 2023.0.0-M3. Closes gh-817
1 parent c9a2dec commit 5cc5254

File tree

2 files changed

+42
-47
lines changed

2 files changed

+42
-47
lines changed

‎pom.xml‎

Lines changed: 41 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,29 @@
2020
<properties>
2121
<antora.version>0.0.3</antora.version>
2222
<assertj-core.version>3.24.2</assertj-core.version>
23-
<aws-java-sdk.version>2.18.24</aws-java-sdk.version>
23+
<aws-java-sdk.version>2.20.152</aws-java-sdk.version>
2424
<bcpkix-jdk15on.version>1.70</bcpkix-jdk15on.version>
2525
<google-api-services-iam.version>v1-rev20221013-2.0.0
2626
</google-api-services-iam.version>
27-
<google-cloud-iamcredentials.version>2.6.0</google-cloud-iamcredentials.version>
28-
<google-auth-library-oauth2-http.version>1.13.0
27+
<google-cloud-iamcredentials.version>2.24.0</google-cloud-iamcredentials.version>
28+
<google-auth-library-oauth2-http.version>1.19.0
2929
</google-auth-library-oauth2-http.version>
30-
<httpclient.version>5.1.4</httpclient.version>
31-
<httpcore.version>5.1.4</httpcore.version>
32-
<jackson-databind.version>2.14.3</jackson-databind.version>
33-
<jetty-reactive-httpclient.version>3.0.8</jetty-reactive-httpclient.version>
30+
<httpclient5.version>5.2.1</httpclient5.version>
31+
<httpcore5.version>5.2.3</httpcore5.version>
32+
<jackson-databind.version>2.15.2</jackson-databind.version>
33+
<jetty-reactive-httpclient.version>4.0.0</jetty-reactive-httpclient.version>
3434
<json-path.version>2.8.0</json-path.version>
35-
<junit.version>5.9.2</junit.version>
36-
<kotlin.version>1.7.21</kotlin.version>
37-
<kotlin-coroutines.version>1.6.4</kotlin-coroutines.version>
38-
<mockk.version>1.13.5</mockk.version>
39-
<mockito-core.version>4.9.0</mockito-core.version>
40-
<netty.version>4.1.93.Final</netty.version>
35+
<junit.version>5.10.0</junit.version>
36+
<kotlin.version>1.8.22</kotlin.version>
37+
<kotlin-coroutines.version>1.7.3</kotlin-coroutines.version>
38+
<mockk.version>1.13.7</mockk.version>
39+
<mockito-core.version>5.5.0</mockito-core.version>
40+
<netty.version>4.1.98.Final</netty.version>
4141
<okhttp3.version>3.14.9</okhttp3.version>
42-
<spring.version>6.0.10</spring.version>
43-
<spring-asciidoctor-backends.version>0.0.4</spring-asciidoctor-backends.version>
44-
<spring-data-bom.version>2023.0.1</spring-data-bom.version>
45-
<spring-security-bom.version>6.0.2</spring-security-bom.version>
46-
<reactor.version>2022.0.8</reactor.version>
42+
<spring.version>6.1.0-M5</spring.version>
43+
<spring-data-bom.version>2023.1.0-M3</spring-data-bom.version>
44+
<spring-security-bom.version>6.2.0-M3</spring-security-bom.version>
45+
<reactor.version>2023.0.0-M3</reactor.version>
4746

4847
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4948
<java.version>17</java.version>
@@ -94,7 +93,7 @@
9493
<name>Apache License, Version 2.0</name>
9594
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
9695
<comments>
97-
Copyright 2016-2022 the original author or authors.
96+
Copyright 2016-2023 the original author or authors.
9897

9998
Licensed under the Apache License, Version 2.0 (the "License");
10099
you may not use this file except in compliance with the License.
@@ -181,7 +180,7 @@
181180
<dependency>
182181
<groupId>org.apache.httpcomponents.client5</groupId>
183182
<artifactId>httpclient5</artifactId>
184-
<version>${httpclient.version}</version>
183+
<version>${httpclient5.version}</version>
185184
<optional>true</optional>
186185
<exclusions>
187186
<exclusion>
@@ -194,14 +193,14 @@
194193
<dependency>
195194
<groupId>org.apache.httpcomponents.core5</groupId>
196195
<artifactId>httpcore5</artifactId>
197-
<version>${httpcore.version}</version>
196+
<version>${httpcore5.version}</version>
198197
<optional>true</optional>
199198
</dependency>
200199

201200
<dependency>
202201
<groupId>org.apache.httpcomponents.core5</groupId>
203202
<artifactId>httpcore5-reactive</artifactId>
204-
<version>${httpcore.version}</version>
203+
<version>${httpcore5.version}</version>
205204
<optional>true</optional>
206205
</dependency>
207206

@@ -542,7 +541,6 @@
542541
<version>3.3.1</version>
543542
</plugin>
544543

545-
546544
<plugin>
547545
<groupId>org.apache.maven.plugins</groupId>
548546
<artifactId>maven-jar-plugin</artifactId>
@@ -564,31 +562,31 @@
564562
<plugin>
565563
<groupId>org.apache.maven.plugins</groupId>
566564
<artifactId>maven-enforcer-plugin</artifactId>
567-
<version>3.3.0</version>
565+
<version>3.4.1</version>
568566
</plugin>
569567

570568
<plugin>
571569
<groupId>org.apache.maven.plugins</groupId>
572570
<artifactId>maven-surefire-plugin</artifactId>
573-
<version>3.0.0</version>
571+
<version>3.1.2</version>
574572
</plugin>
575573

576574
<plugin>
577575
<groupId>org.apache.maven.plugins</groupId>
578576
<artifactId>maven-failsafe-plugin</artifactId>
579-
<version>3.0.0</version>
577+
<version>3.1.2</version>
580578
</plugin>
581579

582580
<plugin>
583581
<groupId>org.apache.maven.plugins</groupId>
584582
<artifactId>maven-source-plugin</artifactId>
585-
<version>3.2.1</version>
583+
<version>3.3.0</version>
586584
</plugin>
587585

588586
<plugin>
589587
<groupId>org.apache.maven.plugins</groupId>
590588
<artifactId>maven-javadoc-plugin</artifactId>
591-
<version>3.5.0</version>
589+
<version>3.6.0</version>
592590
<configuration>
593591
<locale>en_US</locale>
594592
<breakiterator>true</breakiterator>
@@ -628,7 +626,7 @@
628626
<plugin>
629627
<groupId>org.apache.maven.plugins</groupId>
630628
<artifactId>maven-release-plugin</artifactId>
631-
<version>3.0.0</version>
629+
<version>3.0.1</version>
632630
</plugin>
633631

634632
<plugin>
@@ -640,25 +638,13 @@
640638
<plugin>
641639
<groupId>org.apache.maven.plugins</groupId>
642640
<artifactId>maven-dependency-plugin</artifactId>
643-
<version>3.5.0</version>
644-
</plugin>
645-
646-
<plugin>
647-
<groupId>org.apache.maven.plugins</groupId>
648-
<artifactId>maven-site-plugin</artifactId>
649-
<version>3.8.2</version>
641+
<version>3.6.0</version>
650642
</plugin>
651643

652644
<plugin>
653645
<groupId>org.apache.maven.plugins</groupId>
654646
<artifactId>maven-gpg-plugin</artifactId>
655-
<version>3.0.1</version>
656-
</plugin>
657-
658-
<plugin>
659-
<groupId>org.asciidoctor</groupId>
660-
<artifactId>asciidoctor-maven-plugin</artifactId>
661-
<version>2.2.3</version>
647+
<version>3.1.0</version>
662648
</plugin>
663649

664650
<plugin>
@@ -676,7 +662,7 @@
676662
<plugin>
677663
<groupId>org.apache.maven.plugins</groupId>
678664
<artifactId>maven-assembly-plugin</artifactId>
679-
<version>3.5.0</version>
665+
<version>3.6.0</version>
680666
</plugin>
681667

682668
<plugin>
@@ -688,7 +674,7 @@
688674
<plugin>
689675
<groupId>org.codehaus.mojo</groupId>
690676
<artifactId>flatten-maven-plugin</artifactId>
691-
<version>1.4.1</version>
677+
<version>1.5.0</version>
692678
</plugin>
693679

694680
</plugins>
@@ -701,7 +687,7 @@
701687
<id>springNext</id>
702688

703689
<properties>
704-
<spring.version>6.0.0-SNAPSHOT</spring.version>
690+
<spring.version>6.1.0-SNAPSHOT</spring.version>
705691
</properties>
706692

707693
<repositories>
@@ -1014,11 +1000,20 @@
10141000
</profile>
10151001
</profiles>
10161002

1003+
<repositories>
1004+
<repository>
1005+
<id>spring-milestone</id>
1006+
<url>https://repo.spring.io/milestone</url>
1007+
</repository>
1008+
</repositories>
1009+
10171010
<pluginRepositories>
10181011
<pluginRepository>
10191012
<id>spring-plugins-release</id>
10201013
<url>https://repo.spring.io/plugins-release</url>
10211014
</pluginRepository>
10221015
</pluginRepositories>
10231016

1017+
1018+
10241019
</project>

‎spring-vault-core/src/main/java/org/springframework/vault/client/ClientHttpConnectorFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.hc.client5.http.impl.routing.SystemDefaultRoutePlanner;
3434
import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
3535
import org.apache.hc.core5.util.Timeout;
36-
import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
36+
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
3737
import org.eclipse.jetty.io.ClientConnector;
3838
import org.eclipse.jetty.util.ssl.SslContextFactory;
3939
import reactor.netty.http.Http11SslContextSpec;

0 commit comments

Comments
 (0)