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 97f94e73f2 Fixes https://github.com/apache/camel-quarkus/issues/9048
97f94e73f2 is described below
commit 97f94e73f2016f8ba9b2e35003a00cf4d522647c
Author: Jiří Ondrušek <[email protected]>
AuthorDate: Tue Sep 1 12:32:36 2026 +0200
Fixes https://github.com/apache/camel-quarkus/issues/9048
Accept the DB2 and MS SQL Server test container licenses via devservices
container-env instead of container-license-acceptance.txt, which is not
reliably visible on the classpath when the tests are executed from the
published test-jar, e.g. in the Quarkus Platform.
Co-authored-by: Claude Fable 5 <[email protected]>
---
integration-test-groups/jdbc/db2/pom.xml | 9 ---------
.../jdbc/db2/src/main/resources/application.properties | 4 ++++
.../jdbc/db2/src/test/resources/container-license-acceptance.txt | 1 -
integration-test-groups/jdbc/mssql/pom.xml | 9 ---------
.../jdbc/mssql/src/main/resources/application.properties | 4 ++++
.../mssql/src/test/resources/container-license-acceptance.txt | 1 -
integration-tests/jdbc-grouped/pom.xml | 8 +-------
7 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/integration-test-groups/jdbc/db2/pom.xml
b/integration-test-groups/jdbc/db2/pom.xml
index da374b90a9..84d6f97b33 100644
--- a/integration-test-groups/jdbc/db2/pom.xml
+++ b/integration-test-groups/jdbc/db2/pom.xml
@@ -106,15 +106,6 @@
</dependency>
</dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
<profiles>
<profile>
<id>native</id>
diff --git
a/integration-test-groups/jdbc/db2/src/main/resources/application.properties
b/integration-test-groups/jdbc/db2/src/main/resources/application.properties
index 29aaface07..349fbe7815 100644
--- a/integration-test-groups/jdbc/db2/src/main/resources/application.properties
+++ b/integration-test-groups/jdbc/db2/src/main/resources/application.properties
@@ -20,6 +20,10 @@
#
quarkus.datasource.db2.db-kind=db2
quarkus.datasource.db2.jdbc.max-size=8
+# Accept the DB2 license via the container environment instead of a
container-license-acceptance.txt file,
+# because the file is not reliably visible on the classpath when the tests are
executed from the published
+# test-jar, e.g. in the Quarkus Platform. See
https://github.com/apache/camel-quarkus/issues/9048
+quarkus.datasource.db2.devservices.container-env."LICENSE"=accept
# To not use anonymous volumes, which have problem on RHEL9 and Podman
# See https://github.com/quarkusio/quarkus/issues/31253#issuecomment-3131458759
quarkus.datasource.db2.devservices.container-env."PERSISTENT_HOME"=false
diff --git
a/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
b/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
deleted file mode 100644
index b09ec0b3d0..0000000000
---
a/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
+++ /dev/null
@@ -1 +0,0 @@
-${db2.container.image}
diff --git a/integration-test-groups/jdbc/mssql/pom.xml
b/integration-test-groups/jdbc/mssql/pom.xml
index 17dab0187f..32ec935594 100644
--- a/integration-test-groups/jdbc/mssql/pom.xml
+++ b/integration-test-groups/jdbc/mssql/pom.xml
@@ -106,15 +106,6 @@
</dependency>
</dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
<profiles>
<profile>
<id>native</id>
diff --git
a/integration-test-groups/jdbc/mssql/src/main/resources/application.properties
b/integration-test-groups/jdbc/mssql/src/main/resources/application.properties
index 1945bd0627..57c1fb13e7 100644
---
a/integration-test-groups/jdbc/mssql/src/main/resources/application.properties
+++
b/integration-test-groups/jdbc/mssql/src/main/resources/application.properties
@@ -21,5 +21,9 @@
quarkus.datasource.mssql.db-kind=mssql
quarkus.datasource.mssql.jdbc.max-size=8
+# Accept the MS SQL Server EULA via the container environment instead of a
container-license-acceptance.txt file,
+# because the file is not reliably visible on the classpath when the tests are
executed from the published
+# test-jar, e.g. in the Quarkus Platform. See
https://github.com/apache/camel-quarkus/issues/9048
+quarkus.datasource.mssql.devservices.container-env."ACCEPT_EULA"=Y
quarkus.native.resources.includes=postgresql.sql,mysql.sql,mariadb.sql,oracle.sql,h2.sql,db2.sql,inserts.sql,mssql.sql,droptables.sql
\ No newline at end of file
diff --git
a/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
b/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
deleted file mode 100644
index 6e344b9b0b..0000000000
---
a/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
+++ /dev/null
@@ -1 +0,0 @@
-${sql-server.container.image}
\ No newline at end of file
diff --git a/integration-tests/jdbc-grouped/pom.xml
b/integration-tests/jdbc-grouped/pom.xml
index a1ae743af8..904db2fc77 100644
--- a/integration-tests/jdbc-grouped/pom.xml
+++ b/integration-tests/jdbc-grouped/pom.xml
@@ -132,12 +132,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -156,7 +150,7 @@
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/jdbc</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
-
<group-tests.concat.rel.paths>src/main/resources/application.properties,src/test/resources/container-license-acceptance.txt</group-tests.concat.rel.paths>
+
<group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
</properties>
</configuration>
</execution>
