diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e40eb8b2..80ffc306 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -173,7 +173,7 @@ In the Control Center GUI, you can verify the MarkLogic Kafka connector instance 3. Click on the "marklogic-purchases-sink" connector You can then verify that data is being written to MarkLogic by using MarkLogic's qconsole application to inspect the -contents of the `kafka-test-content` database. +contents of the `data-hub-FINAL` database. ### Load a MarkLogic Kafka source connector instance You can also load an instance of the MarkLogic Kafka source connector that will read rows from the `demo/purchases` diff --git a/build.gradle b/build.gradle index f61c1c74..178efdb3 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,14 @@ repositories { configurations { documentation assets + + // Force v3.18 of commons-lang3 to avoid security vulnerabilities, without also + // upgrading ml-app-deployer to 6.0.0, which we are not ready to do yet. + configurations.all { + resolutionStrategy { + force 'org.apache.commons:commons-lang3:3.18.0' + } + } } ext { diff --git a/src/test/java/com/marklogic/kafka/connect/source/debug/InsertAuthorsTest.java b/src/test/java/com/marklogic/kafka/connect/source/debug/InsertAuthorsTest.java index a4a23b78..ed199aca 100644 --- a/src/test/java/com/marklogic/kafka/connect/source/debug/InsertAuthorsTest.java +++ b/src/test/java/com/marklogic/kafka/connect/source/debug/InsertAuthorsTest.java @@ -34,41 +34,44 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** - * Convenience program for inserting a new author into the kafka-test-content database to facilitate testing the - * source connector on the authors TDE. This reuses the test plumbing so we don't have to collect host/port/etc - * information, but it adjusts the DatabaseClient config to use port 8018 instead of 8019 so that documents are - * inserted into the kafka-test-content database instead of kafka-test-test-content. + * Convenience program for inserting a new author into the data-hub-STAGING + * database to facilitate testing the + * source connector on the authors TDE. This reuses the test plumbing so we + * don't have to collect host/port/etc + * information, but it adjusts the DatabaseClient config to use port 8010 + * instead of 8011 so that documents are + * inserted into the data-hub-STAGING database instead of data-hub-FINAL. */ class InsertAuthorsTest extends AbstractIntegrationTest { // Only intended for inserting new authors with a user-provided ID. Can easily expand this to make the data more // random and/or controlled by the user. private final static String CITATIONS_DOC = "\n" + - " \n" + - " %%AUTHOR_ID%%\n" + - "
\n" + - " \n" + - " 61296-004\n" + - " \n" + - " 44\n" + - " \n" + - " 2022-07-13\n" + - " 2022\n" + - " 07\n" + - " 13\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " LastName%%AUTHOR_ID%%\n" + - " ForeName%%AUTHOR_ID%%\n" + - " \n" + - " \n" + - "
\n" + - "
\n" + - "
\n"; + " \n" + + " %%AUTHOR_ID%%\n" + + "
\n" + + " \n" + + " 61296-004\n" + + " \n" + + " 44\n" + + " \n" + + " 2022-07-13\n" + + " 2022\n" + + " 07\n" + + " 13\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " LastName%%AUTHOR_ID%%\n" + + " ForeName%%AUTHOR_ID%%\n" + + " \n" + + " \n" + + "
\n" + + "
\n" + + "\n"; @Autowired SimpleTestConfig testConfig; diff --git a/test-app/build.gradle b/test-app/build.gradle index 8cd3110d..14dcf498 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -42,7 +42,7 @@ task loadMarkLogicEmployeesSourceConnector(type: Exec) { task insertAuthors(type: Test) { useJUnitPlatform() systemProperty "AUTHOR_IDS", authorIds - description = "Insert a new author into the kafka-test-content database via a new citations XML document; " + + description = "Insert a new author into the data-hub-STAGING database via a new citations XML document; " + "use e.g. -PauthorIds=7,8,9 to insert 3 new authors with IDs of 7, 8, and 9" include "com/marklogic/kafka/connect/source/debug/InsertAuthorsTest.class" }