Skip to content

Commit 9e91717

Browse files
committed
Merge remote-tracking branch 'origin/master' into savepoints
2 parents 423e572 + 73e9265 commit 9e91717

63 files changed

Lines changed: 361 additions & 340 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
mvn -s .github/maven-ci-settings.xml -q clean install -B $PROFILE_ARG -pl :${{ inputs.module }} -am -DskipTests
4040
- name: Run tests for the target module
4141
run: |
42-
mvn -s .github/maven-ci-settings.xml verify -B $PROFILE_ARG -pl :${{ inputs.module }}
42+
mvn -s .github/maven-ci-settings.xml verify -B -Pcheckstyle $PROFILE_ARG -pl :${{ inputs.module }}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<parent>
2222
<groupId>io.vertx</groupId>
2323
<artifactId>vertx5-parent</artifactId>
24-
<version>12</version>
24+
<version>14</version>
2525
</parent>
2626

2727
<artifactId>vertx-sql-client-parent</artifactId>
28-
<version>5.1.0-SNAPSHOT</version>
28+
<version>5.2.0-SNAPSHOT</version>
2929
<packaging>pom</packaging>
3030

3131
<name>Vertx SQL Client parent</name>

vertx-db2-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>io.vertx</groupId>
1818
<artifactId>vertx-sql-client-parent</artifactId>
19-
<version>5.1.0-SNAPSHOT</version>
19+
<version>5.2.0-SNAPSHOT</version>
2020
</parent>
2121

2222
<artifactId>vertx-db2-client</artifactId>

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2DatabaseMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public boolean isZOS() {
3939
public String productName() {
4040
return productName;
4141
}
42-
42+
4343
@Override
4444
public String fullVersion() {
4545
return fullVersion;

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseCursorDB2CommandMessage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.vertx.db2client.impl.drda.DRDAQueryRequest;
2323
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
2424
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
25-
import io.vertx.sqlclient.codec.CommandResponse;
2625

2726
class CloseCursorDB2CommandMessage extends DB2CommandMessage<Void, CloseCursorCommand> {
2827

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseStatementDB2CommandMessage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import io.netty.buffer.ByteBuf;
1919
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
20-
import io.vertx.sqlclient.codec.CommandResponse;
2120

2221
class CloseStatementDB2CommandMessage extends DB2CommandMessage<Void, CloseStatementCommand> {
2322

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2CommandMessage.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
package io.vertx.db2client.impl.codec;
1717

1818
import io.netty.buffer.ByteBuf;
19-
import io.vertx.core.Handler;
2019
import io.vertx.db2client.impl.command.InitialHandshakeCommand;
2120
import io.vertx.db2client.impl.command.PingCommand;
2221
import io.vertx.sqlclient.codec.CommandMessage;
2322
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
2423
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
2524
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
2625
import io.vertx.sqlclient.spi.protocol.CommandBase;
27-
import io.vertx.sqlclient.codec.CommandResponse;
2826
import io.vertx.sqlclient.spi.protocol.PrepareStatementCommand;
2927
import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
3028

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Decoder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.vertx.core.internal.logging.Logger;
2626
import io.vertx.core.internal.logging.LoggerFactory;
2727
import io.vertx.db2client.DB2Exception;
28-
import io.vertx.sqlclient.codec.CommandResponse;
2928

3029
class DB2Decoder extends ByteToMessageDecoder {
3130

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Encoder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.netty.channel.ChannelHandlerContext;
2121
import io.netty.channel.ChannelOutboundHandlerAdapter;
2222
import io.netty.channel.ChannelPromise;
23-
import io.vertx.core.Completable;
2423
import io.vertx.core.internal.logging.Logger;
2524
import io.vertx.core.internal.logging.LoggerFactory;
2625
import io.vertx.db2client.impl.DB2SocketConnection;

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryDB2CommandMessage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
3030
import io.vertx.sqlclient.Tuple;
3131
import io.vertx.sqlclient.internal.TupleBase;
32-
import io.vertx.sqlclient.codec.CommandResponse;
3332
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
3433

3534
public class ExtendedBatchQueryDB2CommandMessage<R> extends ExtendedQueryDB2CommandBaseMessage<R, ExtendedQueryCommand<R>> {

0 commit comments

Comments
 (0)