This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new cb125d72d7 Remove redundant debezium-sqlserver & debezium-mysql test
profiles
cb125d72d7 is described below
commit cb125d72d78cc895b7b4e88ab74ecf95356bbcab
Author: James Netherton <[email protected]>
AuthorDate: Thu Aug 7 14:27:17 2025 +0100
Remove redundant debezium-sqlserver & debezium-mysql test profiles
---
integration-test-groups/debezium/mssql/pom.xml | 40 ++++------
.../resources/container-license-acceptance.txt | 1 +
integration-test-groups/debezium/mysql/pom.xml | 31 ++------
integration-tests/debezium-grouped/pom.xml | 86 ++++++++++++----------
4 files changed, 72 insertions(+), 86 deletions(-)
diff --git a/integration-test-groups/debezium/mssql/pom.xml
b/integration-test-groups/debezium/mssql/pom.xml
index 1d4a9f7461..a0f970c552 100644
--- a/integration-test-groups/debezium/mssql/pom.xml
+++ b/integration-test-groups/debezium/mssql/pom.xml
@@ -31,17 +31,10 @@
<name>Camel Quarkus :: Integration Tests :: Debezium MSSQL</name>
<description>Integration tests for Debezium - MSSQL Database</description>
- <properties>
- <sqlserver.EULA.accepted>true</sqlserver.EULA.accepted>
- <!-- You are required to accept an EULA for SQL container image. We
cannot do it by default for legal reasons. -->
- <!-- See
https://camel.apache.org/camel-quarkus/latest/extensions/debezium-sqlserver.html#_integration-testing
for more details -->
-
<sqlserver.EULA>src/test/resources/container-license-acceptance.txt</sqlserver.EULA>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-mongodb</artifactId>
+ <artifactId>camel-quarkus-debezium-sqlserver</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -55,9 +48,13 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
</dependency>
+ <!-- Required since it's excluded from the runtime classpath by
default -->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ </dependency>
<!-- test dependencies -->
-
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
@@ -102,6 +99,15 @@
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
+
<profiles>
<!-- https://github.com/apache/camel-quarkus/issues/4638
<profile>
@@ -132,20 +138,6 @@
</build>
</profile>
-->
- <profile>
- <id>sqlserver</id>
- <activation>
- <file>
- <exists>${sqlserver.EULA}</exists>
- </file>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-sqlserver</artifactId>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>virtualDependencies</id>
<activation>
@@ -157,7 +149,7 @@
<!-- The following dependencies guarantee that this module is
built after them. You can update them by running `mvn process-resources
-Pformat -N` from the source tree root directory -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-debezium-mongodb-deployment</artifactId>
+
<artifactId>camel-quarkus-debezium-sqlserver-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
diff --git
a/integration-test-groups/debezium/mssql/src/test/resources/container-license-acceptance.txt
b/integration-test-groups/debezium/mssql/src/test/resources/container-license-acceptance.txt
new file mode 100644
index 0000000000..8121614585
--- /dev/null
+++
b/integration-test-groups/debezium/mssql/src/test/resources/container-license-acceptance.txt
@@ -0,0 +1 @@
+${sql-server.container.image}
diff --git a/integration-test-groups/debezium/mysql/pom.xml
b/integration-test-groups/debezium/mysql/pom.xml
index 0dcfa9c04f..e52511d959 100644
--- a/integration-test-groups/debezium/mysql/pom.xml
+++ b/integration-test-groups/debezium/mysql/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-mongodb</artifactId>
+ <artifactId>camel-quarkus-debezium-mysql</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -49,8 +49,13 @@
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
</dependency>
- <!-- test dependencies -->
+ <!-- Required since it's excluded from the runtime classpath by
default -->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ </dependency>
+ <!-- test dependencies -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
@@ -125,26 +130,6 @@
</build>
</profile>
-->
- <profile>
- <id>mysqlDriver</id>
- <activation>
- <property>
- <name>mysql.driver.file</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-mysql</artifactId>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <scope>system</scope>
- <systemPath>${mysql.driver.file}</systemPath>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>virtualDependencies</id>
<activation>
@@ -156,7 +141,7 @@
<!-- The following dependencies guarantee that this module is
built after them. You can update them by running `mvn process-resources
-Pformat -N` from the source tree root directory -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-debezium-mongodb-deployment</artifactId>
+
<artifactId>camel-quarkus-debezium-mysql-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
diff --git a/integration-tests/debezium-grouped/pom.xml
b/integration-tests/debezium-grouped/pom.xml
index b119db062a..1f73605f78 100644
--- a/integration-tests/debezium-grouped/pom.xml
+++ b/integration-tests/debezium-grouped/pom.xml
@@ -43,17 +43,24 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-postgres</artifactId>
+ <artifactId>camel-quarkus-debezium-mongodb</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-mongodb</artifactId>
+ <artifactId>camel-quarkus-debezium-mysql</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-debezium-oracle</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-debezium-postgres</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+ <artifactId>camel-quarkus-debezium-sqlserver</artifactId>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy</artifactId>
@@ -62,14 +69,17 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jackson</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
</dependency>
+ <!-- Required since it's excluded from the runtime classpath by
default -->
+ <dependency>
+ <groupId>com.mysql</groupId>
+ <artifactId>mysql-connector-j</artifactId>
+ </dependency>
<!-- test dependencies -->
-
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-support-debezium</artifactId>
@@ -159,6 +169,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -216,40 +232,6 @@
</build>
</profile>
-->
- <profile>
- <id>mysqlDriver</id>
- <activation>
- <property>
- <name>mysql.driver.file</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-mysql</artifactId>
- </dependency>
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <scope>system</scope>
- <systemPath>${mysql.driver.file}</systemPath>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>sqlserver</id>
- <activation>
- <file>
- <exists>${sqlserver.EULA}</exists>
- </file>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-debezium-sqlserver</artifactId>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>virtualDependencies</id>
<activation>
@@ -272,6 +254,19 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-debezium-mysql-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-debezium-postgres-deployment</artifactId>
@@ -298,6 +293,19 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-debezium-sqlserver-deployment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</profile>
<profile>