This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push: new e1e2b47 Fixup #1193 Debezium SQL Server Connector native support new 3b7fbdd Merge pull request #1304 from ppalaga/200603-debezium-mssql e1e2b47 is described below commit e1e2b476d6a9859c09c92c275d02f6d5ff3fdd8a Author: Peter Palaga <ppal...@redhat.com> AuthorDate: Wed Jun 3 14:38:10 2020 +0200 Fixup #1193 Debezium SQL Server Connector native support --- .../ROOT/pages/extensions/debezium-sqlserver.adoc | 7 ++++--- .../runtime/src/main/doc/usage.adoc | 7 ++++--- integration-tests/debezium/.gitignore | 2 +- integration-tests/debezium/README.adoc | 23 +++++++++++++++++++++- .../debezium/src/main/doc/testing.adoc | 7 ------- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/docs/modules/ROOT/pages/extensions/debezium-sqlserver.adoc b/docs/modules/ROOT/pages/extensions/debezium-sqlserver.adoc index d26d95d..32d7747 100644 --- a/docs/modules/ROOT/pages/extensions/debezium-sqlserver.adoc +++ b/docs/modules/ROOT/pages/extensions/debezium-sqlserver.adoc @@ -29,9 +29,10 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ == Usage -SQL server may require encryption. In that case `quarkus.ssl.native=false` parameter has to be added during execution. -See https://quarkus.io/guides/native-and-ssl for more details. - +Depending on its configuration, SQL server may require SSL encryption on JDBC connections. In such a case, you will need +to add `quarkus.ssl.native=true` to your `application.properties`. +See also https://quarkus.io/guides/native-and-ssl[Quarkus native SSL guide] and xref:user-guide/native-mode.html[Native mode] +section of Camel Quarkus user guide. == Camel Quarkus limitations diff --git a/extensions/debezium-sqlserver/runtime/src/main/doc/usage.adoc b/extensions/debezium-sqlserver/runtime/src/main/doc/usage.adoc index 0473be3..a4cb901 100644 --- a/extensions/debezium-sqlserver/runtime/src/main/doc/usage.adoc +++ b/extensions/debezium-sqlserver/runtime/src/main/doc/usage.adoc @@ -1,3 +1,4 @@ -SQL server may require encryption. In that case `quarkus.ssl.native=false` parameter has to be added during execution. -See https://quarkus.io/guides/native-and-ssl for more details. - +Depending on its configuration, SQL server may require SSL encryption on JDBC connections. In such a case, you will need +to add `quarkus.ssl.native=true` to your `application.properties`. +See also https://quarkus.io/guides/native-and-ssl[Quarkus native SSL guide] and xref:user-guide/native-mode.html[Native mode] +section of Camel Quarkus user guide. diff --git a/integration-tests/debezium/.gitignore b/integration-tests/debezium/.gitignore index 71fd93b..4ab462c 100644 --- a/integration-tests/debezium/.gitignore +++ b/integration-tests/debezium/.gitignore @@ -1,2 +1,2 @@ -libs/mysql-connector-java-*.jar +libs/mysql-connector-java*.jar src/test/resources/*-license-* \ No newline at end of file diff --git a/integration-tests/debezium/README.adoc b/integration-tests/debezium/README.adoc index 5f0d7c8..fc1a656 100644 --- a/integration-tests/debezium/README.adoc +++ b/integration-tests/debezium/README.adoc @@ -1,3 +1,24 @@ +== MySQL + To run the MySQL Debezium integration tests you have to store the driver jar under `libs/mysql-connector-java.jar` in the current Maven module. The path can be changed by setting the -`mysql.driver.file` property on the command line. \ No newline at end of file +`mysql.driver.file` property on the command line. + +== MS SQL Server + +We cannot enable starting the container hosting the MS SQL test instance by default, because it requires expressing +consent with its EULA by placing a specific file on a specific location. The Apache Software Foundation's policy +prevents us of doing it unconditionally for anybody who clones this repository. + +Therefore, to execute the MS SQL Server integration tests you need to accept the +https://go.microsoft.com/fwlink/?linkid=857698[EULA] by creating file `integration-tests/debezium/src/test/resources/container-license-acceptance.txt` with content `mcr.microsoft.com/mssql/server:2017-CU12` +in the current Maven module. + +On a Unix-like system, you can run + +[source,shell] +---- +$ echo "mcr.microsoft.com/mssql/server:2017-CU12" > integration-tests/debezium/src/test/resources/container-license-acceptance.txt +---- + +For more details see https://www.testcontainers.org/modules/databases/mssqlserver/ \ No newline at end of file diff --git a/integration-tests/debezium/src/main/doc/testing.adoc b/integration-tests/debezium/src/main/doc/testing.adoc deleted file mode 100644 index acd42ee..0000000 --- a/integration-tests/debezium/src/main/doc/testing.adoc +++ /dev/null @@ -1,7 +0,0 @@ -We can not start SQL container for legal reasons. - -To execute integration tests you are required to accept an EULA for SQL container image. Please add file named -`container-license-acceptance.txt` with content `mcr.microsoft.com/mssql/server:2017-CU12` into the test resource -folder (`integration-tests/debezium/src/test/resources`). - -For more details see https://www.testcontainers.org/modules/databases/mssqlserver/ \ No newline at end of file