Skip to content

Commit c29f1ec

Browse files
committed
Upgrade infrastructure dependencies.
[#522] Signed-off-by: Mark Paluch <[email protected]>
1 parent 823ee66 commit c29f1ec

File tree

6 files changed

+16
-35
lines changed

6 files changed

+16
-35
lines changed

pom.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@
3232
<url>https://github.com/pgjdbc/r2dbc-postgresql</url>
3333

3434
<properties>
35-
<assertj.version>3.22.0</assertj.version>
35+
<assertj.version>3.23.1</assertj.version>
3636
<awaitility.version>4.2.0</awaitility.version>
3737
<blockhound.version>1.0.6.RELEASE</blockhound.version>
3838
<hikari-cp.version>4.0.3</hikari-cp.version>
3939
<java.version>1.8</java.version>
4040
<jsr305.version>3.0.2</jsr305.version>
4141
<junit.version>5.8.2</junit.version>
42-
<jmh.version>1.33</jmh.version>
42+
<jmh.version>1.35</jmh.version>
4343
<mbr.version>0.3.0.RELEASE</mbr.version>
4444
<logback.version>1.2.9</logback.version>
45-
<mockito.version>4.4.0</mockito.version>
46-
<netty.version>4.1.77.Final</netty.version>
47-
<postgresql.version>42.3.3</postgresql.version>
45+
<mockito.version>4.6.1</mockito.version>
46+
<netty.version>4.1.78.Final</netty.version>
47+
<postgresql.version>42.4.0</postgresql.version>
4848
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050
<r2dbc-spi.version>1.0.0.RELEASE</r2dbc-spi.version>
5151
<reactor.version>2022.0.0-M2</reactor.version>
5252
<scram-client.version>2.1</scram-client.version>
53-
<spring-framework.version>5.3.19</spring-framework.version>
54-
<testcontainers.version>1.16.3</testcontainers.version>
53+
<spring-framework.version>5.3.21</spring-framework.version>
54+
<testcontainers.version>1.17.2</testcontainers.version>
5555
<jts-core.version>1.18.2</jts-core.version>
5656
</properties>
5757

@@ -263,7 +263,7 @@
263263
<plugin>
264264
<groupId>org.apache.maven.plugins</groupId>
265265
<artifactId>maven-compiler-plugin</artifactId>
266-
<version>3.8.1</version>
266+
<version>3.10.1</version>
267267
<configuration>
268268
<compilerArgs>
269269
<arg>-Werror</arg>
@@ -281,7 +281,7 @@
281281
<plugin>
282282
<groupId>org.apache.maven.plugins</groupId>
283283
<artifactId>maven-jar-plugin</artifactId>
284-
<version>3.2.1</version>
284+
<version>3.2.2</version>
285285
<configuration>
286286
<archive>
287287
<manifest>
@@ -303,7 +303,7 @@
303303
<plugin>
304304
<groupId>org.apache.maven.plugins</groupId>
305305
<artifactId>maven-enforcer-plugin</artifactId>
306-
<version>3.0.0</version>
306+
<version>3.1.0</version>
307307
<executions>
308308
<execution>
309309
<id>enforce-no-snapshots</id>
@@ -324,7 +324,7 @@
324324
<plugin>
325325
<groupId>org.apache.maven.plugins</groupId>
326326
<artifactId>maven-javadoc-plugin</artifactId>
327-
<version>3.3.1</version>
327+
<version>3.4.0</version>
328328
<configuration>
329329
<excludePackageNames>
330330
io.r2dbc.postgresql.authentication,io.r2dbc.postgresql.client,io.r2dbc.postgresql.message,io.r2dbc.postgresql.util
@@ -599,7 +599,7 @@
599599
<plugin>
600600
<groupId>org.sonatype.plugins</groupId>
601601
<artifactId>nexus-staging-maven-plugin</artifactId>
602-
<version>1.6.8</version>
602+
<version>1.6.13</version>
603603
<extensions>true</extensions>
604604
<configuration>
605605
<serverId>sonatype</serverId>

src/test/java/io/r2dbc/postgresql/client/HighAvailabilityClusterIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ private PostgresqlConnectionFactory multiHostConnectionFactory(MultiHostConnecti
193193
PostgreSQLContainer<?> firstServer = servers[0];
194194
PostgresqlConnectionConfiguration.Builder builder = PostgresqlConnectionConfiguration.builder();
195195
for (PostgreSQLContainer<?> server : servers) {
196-
builder.addHost(server.getContainerIpAddress(), server.getMappedPort(5432));
196+
builder.addHost(server.getHost(), server.getMappedPort(5432));
197197
}
198198
PostgresqlConnectionConfiguration configuration = builder
199199
.targetServerType(targetServerType)

src/test/java/io/r2dbc/postgresql/feature/RefCursorIntegrationTests.java

-19
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.r2dbc.spi.R2dbcNonTransientResourceException;
2323
import org.junit.jupiter.api.BeforeEach;
2424
import org.junit.jupiter.api.Test;
25-
import org.postgresql.jdbc.PgResultSet;
2625
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
2726
import org.springframework.transaction.support.TransactionTemplate;
2827
import reactor.test.StepVerifier;
@@ -82,24 +81,6 @@ void fetchCursorWithoutTxShouldFail() {
8281
.verifyError(R2dbcNonTransientResourceException.class);
8382
}
8483

85-
@Test
86-
void shouldReturnSingleRefCursorFromJdbc() {
87-
88-
DataSourceTransactionManager tm = new DataSourceTransactionManager(SERVER.getDataSource());
89-
90-
TransactionTemplate tt = new TransactionTemplate(tm);
91-
92-
Map<String, Object> object = tt.execute(transactionStatus -> {
93-
return SERVER.getJdbcOperations().queryForMap("SELECT show_cities()");
94-
});
95-
96-
assertThat(object).containsKey("show_cities");
97-
assertThat(object.get("show_cities")).isInstanceOf(PgResultSet.class);
98-
99-
PgResultSet rs = (PgResultSet) object.get("show_cities");
100-
assertThat(rs.getRefCursor()).isNotEmpty();
101-
}
102-
10384
@Test
10485
void shouldReturnSingleRefCursor() {
10586

src/test/java/io/r2dbc/postgresql/util/PgBouncer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void close() {
5151
}
5252

5353
public String getHost() {
54-
return this.container.getContainerIpAddress();
54+
return this.container.getHost();
5555
}
5656

5757
public int getPort() {

src/test/java/io/r2dbc/postgresql/util/PgPool.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void close() {
5252
}
5353

5454
public String getHost() {
55-
return this.container.getContainerIpAddress();
55+
return this.container.getHost();
5656
}
5757

5858
public int getPort() {

src/test/java/io/r2dbc/postgresql/util/PostgresqlServerExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ static class TestContainer implements DatabaseContainer {
306306

307307
@Override
308308
public String getHost() {
309-
return this.container.getContainerIpAddress();
309+
return this.container.getHost();
310310
}
311311

312312
@Override

0 commit comments

Comments
 (0)