Skip to content

Commit b949dda

Browse files
Naroskmos
authored andcommitted
debezium/dbz#1606 Update to Quarkus 3.31.3
Signed-off-by: Chris Cranford <chris@hibernate.org>
1 parent bb16a08 commit b949dda

File tree

15 files changed

+68
-32
lines changed

15 files changed

+68
-32
lines changed

debezium-quarkus-outbox-reactive/integration-tests/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106

107107
<dependency>
108108
<groupId>org.testcontainers</groupId>
109-
<artifactId>postgresql</artifactId>
109+
<artifactId>testcontainers-postgresql</artifactId>
110110
<scope>test</scope>
111111
</dependency>
112112

@@ -123,6 +123,7 @@
123123
<groupId>io.quarkus</groupId>
124124
<artifactId>quarkus-maven-plugin</artifactId>
125125
<version>${quarkus.version}</version>
126+
<extensions>true</extensions>
126127
<executions>
127128
<execution>
128129
<goals>
@@ -174,6 +175,7 @@
174175
<plugin>
175176
<groupId>io.quarkus</groupId>
176177
<artifactId>quarkus-maven-plugin</artifactId>
178+
<extensions>true</extensions>
177179
<executions>
178180
<execution>
179181
<id>native-image</id>

debezium-quarkus-outbox-reactive/integration-tests/src/test/java/io/debezium/outbox/reactive/quarkus/it/TestAsserts.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package io.debezium.outbox.reactive.quarkus.it;
77

8-
import static org.junit.Assert.assertEquals;
9-
import static org.junit.Assert.assertNull;
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.jupiter.api.Assertions.assertNull;
1010

1111
import org.hibernate.persister.entity.EntityPersister;
1212

debezium-quarkus-outbox/integration-tests/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
<dependency>
8989
<groupId>org.testcontainers</groupId>
90-
<artifactId>postgresql</artifactId>
90+
<artifactId>testcontainers-postgresql</artifactId>
9191
<scope>test</scope>
9292
</dependency>
9393

@@ -104,6 +104,7 @@
104104
<groupId>io.quarkus</groupId>
105105
<artifactId>quarkus-maven-plugin</artifactId>
106106
<version>${quarkus.version}</version>
107+
<extensions>true</extensions>
107108
<executions>
108109
<execution>
109110
<goals>
@@ -158,6 +159,7 @@
158159
<plugin>
159160
<groupId>io.quarkus</groupId>
160161
<artifactId>quarkus-maven-plugin</artifactId>
162+
<extensions>true</extensions>
161163
<executions>
162164
<execution>
163165
<id>native-image</id>

debezium-quarkus-outbox/integration-tests/src/test/java/io/debezium/outbox/quarkus/it/TestAsserts.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package io.debezium.outbox.quarkus.it;
77

8-
import static org.junit.Assert.assertEquals;
9-
import static org.junit.Assert.assertNull;
8+
import static org.junit.jupiter.api.Assertions.assertEquals;
9+
import static org.junit.jupiter.api.Assertions.assertNull;
1010

1111
import org.hibernate.persister.entity.EntityPersister;
1212

debezium-quarkus-parent/debezium-quarkus-db2-parent/integration-tests/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<groupId>io.debezium.quarkus</groupId>
2121
<artifactId>debezium-quarkus-db2</artifactId>
2222
</dependency>
23+
<dependency>
24+
<groupId>org.lz4</groupId>
25+
<artifactId>lz4-java</artifactId>
26+
<version>1.8.0</version>
27+
</dependency>
2328
</dependencies>
2429

2530
<build>
@@ -59,6 +64,7 @@
5964
<plugin>
6065
<groupId>io.quarkus</groupId>
6166
<artifactId>quarkus-maven-plugin</artifactId>
67+
<extensions>true</extensions>
6268
<executions>
6369
<execution>
6470
<goals>

debezium-quarkus-parent/debezium-quarkus-mariadb-parent/deployment/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>org.testcontainers</groupId>
34-
<artifactId>mariadb</artifactId>
34+
<artifactId>testcontainers-mariadb</artifactId>
3535
<exclusions>
3636
<exclusion>
3737
<groupId>junit</groupId>

debezium-quarkus-parent/debezium-quarkus-mariadb-parent/deployment/src/main/java/io/quarkus/debezium/mariadb/deployment/MariaDbEngineProcessor.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,14 @@ private static class DebeziumMariaDbContainer<SELF extends MariaDBContainer<SELF
171171
public static final String CONNECTION_STRING = "jdbc:mariadb://" + LOCALHOST + ":3306/debezium";
172172
public static final String SERVICE_NAME = "debezium-devservices-mariadb";
173173

174-
private final MariaDBContainer<SELF> container;
175174
private final String username;
176175
private final String database;
177176

178177
private DebeziumMariaDbContainer(String user, String password, String database) {
179-
this.username = user;
180-
this.database = database;
181-
this.container = new MariaDBContainer<SELF>(
182-
DockerImageName.parse(IMAGE).asCompatibleSubstituteFor("mariadb"))
183-
.withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
184-
.withPortBindings(new PortBinding(Ports.Binding.bindPort(3306), new ExposedPort(3306))))
178+
super(DockerImageName.parse(IMAGE).asCompatibleSubstituteFor("mariadb"));
179+
180+
withCreateContainerCmdModifier(cmd -> cmd.getHostConfig()
181+
.withPortBindings(new PortBinding(Ports.Binding.bindPort(3306), new ExposedPort(3306))))
185182
.withUsername(user)
186183
.withPassword(password)
187184
.withCopyToContainer(Transferable.of("""
@@ -197,16 +194,19 @@ private DebeziumMariaDbContainer(String user, String password, String database)
197194
default_authentication_plugin = mysql_native_password
198195
"""), "/etc/mysql/conf.d/mariadb.cnf")
199196
.withEnv("MARIADB_ROOT_PASSWORD", password);
197+
198+
this.username = user;
199+
this.database = database;
200200
}
201201

202202
@Override
203203
public void start() {
204-
container.start();
204+
super.start();
205205

206206
try {
207-
container.execInContainer("mariadb",
207+
execInContainer("mariadb",
208208
"-uroot",
209-
"-p" + container.getPassword(),
209+
"-p" + getPassword(),
210210
"-e",
211211
MessageFormat.format("""
212212
CREATE DATABASE {0};
@@ -220,17 +220,12 @@ public void start() {
220220
}
221221

222222
public String getConnectionInfo() {
223-
return container.getJdbcUrl();
224-
}
225-
226-
@Override
227-
public String getContainerId() {
228-
return container.getContainerId();
223+
return getJdbcUrl();
229224
}
230225

231226
@Override
232227
public void close() {
233-
container.stop();
228+
stop();
234229
}
235230

236231
}

debezium-quarkus-parent/debezium-quarkus-mariadb-parent/integration-tests/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
<artifactId>assertj-core</artifactId>
7070
<scope>test</scope>
7171
</dependency>
72+
<dependency>
73+
<groupId>org.lz4</groupId>
74+
<artifactId>lz4-java</artifactId>
75+
<version>1.8.0</version>
76+
</dependency>
7277
</dependencies>
7378

7479
<build>
@@ -108,6 +113,7 @@
108113
<plugin>
109114
<groupId>io.quarkus</groupId>
110115
<artifactId>quarkus-maven-plugin</artifactId>
116+
<extensions>true</extensions>
111117
<executions>
112118
<execution>
113119
<goals>

debezium-quarkus-parent/debezium-quarkus-mongodb-parent/integration-tests/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<artifactId>assertj-core</artifactId>
5959
<scope>test</scope>
6060
</dependency>
61+
<dependency>
62+
<groupId>org.lz4</groupId>
63+
<artifactId>lz4-java</artifactId>
64+
<version>1.8.0</version>
65+
</dependency>
6166
</dependencies>
6267

6368
<build>
@@ -97,6 +102,7 @@
97102
<plugin>
98103
<groupId>io.quarkus</groupId>
99104
<artifactId>quarkus-maven-plugin</artifactId>
105+
<extensions>true</extensions>
100106
<executions>
101107
<execution>
102108
<goals>

debezium-quarkus-parent/debezium-quarkus-mongodb-parent/runtime/src/main/java/io/quarkus/debezium/configuration/MongoDbDatasourceRecorder.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import java.util.stream.Collectors;
1414

1515
import io.debezium.runtime.recorder.DatasourceRecorder;
16-
import io.quarkus.mongodb.runtime.MongodbConfig;
16+
import io.quarkus.mongodb.runtime.MongoConfig;
1717
import io.quarkus.runtime.RuntimeValue;
1818
import io.quarkus.runtime.annotations.Recorder;
1919

@@ -25,16 +25,16 @@ public class MongoDbDatasourceRecorder implements DatasourceRecorder<MultiEngine
2525
* of Debezium Engine
2626
*/
2727
public static final String TO_REMOVE = "health";
28-
private final RuntimeValue<MongodbConfig> runtimeConfig;
28+
private final RuntimeValue<MongoConfig> runtimeConfig;
2929

30-
public MongoDbDatasourceRecorder(final RuntimeValue<MongodbConfig> runtimeConfig) {
30+
public MongoDbDatasourceRecorder(final RuntimeValue<MongoConfig> runtimeConfig) {
3131
this.runtimeConfig = runtimeConfig;
3232
}
3333

3434
@Override
3535
public Supplier<MultiEngineMongoDbDatasourceConfiguration> convert(String name, boolean defaultConfiguration) {
3636
Map<String, MongoDbDatasourceConfiguration> configurations = runtimeConfig.getValue()
37-
.mongoClientConfigs()
37+
.clients()
3838
.entrySet().stream()
3939
.filter(entry -> !entry.getKey().equals(TO_REMOVE))
4040
.map(config -> new MongoDbDatasourceConfiguration(
@@ -44,7 +44,8 @@ public Supplier<MultiEngineMongoDbDatasourceConfiguration> convert(String name,
4444
.collect(Collectors.toMap(MongoDbDatasourceConfiguration::getSanitizedName, Function.identity()));
4545

4646
configurations.put(DEFAULT,
47-
new MongoDbDatasourceConfiguration(runtimeConfig.getValue().defaultMongoClientConfig().connectionString().get(),
47+
new MongoDbDatasourceConfiguration(runtimeConfig.getValue().clients()
48+
.get(MongoConfig.DEFAULT_CLIENT_NAME).connectionString().get(),
4849
DEFAULT,
4950
true));
5051

0 commit comments

Comments
 (0)