MLE-23466 - Merge develop into master

Author: BillFarber

.github/workflows/pr-workflow.yaml

@@ -0,0 +1,16 @@
+name: 🏷️ JIRA ID Validator
+
+on:
+  # Using pull_request_target instead of pull_request to handle PRs from forks
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize]
+    # No branch filtering - will run on all PRs
+
+jobs:
+  jira-pr-check:
+    name: 🏷️ Validate JIRA ticket ID
+    # Use the reusable workflow from the central repository
+    uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main
+    with:
+      # Pass the PR title from the event context
+      pr-title: ${{ github.event.pull_request.title }}

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`

Jenkinsfile

@@ -6,26 +6,27 @@ pipeline{
     buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
   }
   environment{
-    JAVA_HOME_DIR="/home/builder/java/openjdk-1.8.0-262"
+    JAVA_HOME_DIR="/home/builder/java/jdk-11.0.2"
     GRADLE_DIR   =".gradle"
     DMC_USER     = credentials('MLBUILD_USER')
     DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
   }
   stages{
     stage('tests'){
       steps{
-        copyRPM 'Release','11.0.0'
+        copyRPM 'Release','11.3.0'
         setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
         sh label:'setup', script: '''#!/bin/bash
-        cd kafka-connector
+        cd kafka-connector/test-app
         echo mlPassword=admin >> gradle-local.properties
         '''
         sh label:'deploy project', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
-          cd kafka-connector
-          ./gradlew mlDeploy
+          cd kafka-connector/test-app
+          ./gradlew hubInit
+          ./gradlew mlDeploy -PmlPassword=admin
         '''
         sh label:'test', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2023 MarkLogic Corporation.
+Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

NOTICE.txt

@@ -1,47 +1,17 @@
 MarkLogic® Connector for Kafka
 
-Copyright © 2024 MarkLogic Corporation. All Rights Reserved.
+Copyright © 2019-2025 MarkLogic Corporation. All Rights Reserved.
 
 To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by Progress Software Corporation. To obtain such source code, send an email to [email protected]. Please specify the product and version for which you are requesting source code.
 
-Summary
+Third Party Notices
 
 marklogic-data-hub 6.1.1 (Apache-2.0)
 ml-app-deployer 5.0.0 (Apache-2.0)
 jackson-dataformat-csv 2.17.2 (Apache-2.0)
 
 Common Licenses
 
-Apache License 2.0 (Apache-2.0)
-
-Third-Party Components
-
-The following is a list of the third-party components used by MarkLogic® Connector for Kafka v1.10.0 (last updated November 1, 2024):
-
-marklogic-data-hub 6.1.1 (Apache-2.0)
-https://repo1.maven.org/maven2/com/marklogic/marklogic-data-hub/6.1.1/
-For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
-
-ml-app-deployer 5.0.0 (Apache-2.0)
-https://repo1.maven.org/maven2/com/marklogic/ml-app-deployer/5.0.0/
-For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
-
-jackson-dataformat-csv 2.17.2 (Apache-2.0)
-https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/2.17.2/
-For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
-
-Copyright Statements
-Copyright ©2009 FasterXML, LLC
-
-License Text (http://spdx.org/licenses/Apache-2.0)
-Made available under the Apache License 2.0. See Appendix for full text.
-
-Source materials are available for download at: https://github.com/FasterXML/jackson-databind
-
-Common Licenses
-
-This section shows the text of common third-party licenses used by MarkLogic® Connector for Kafka v1.10.0 (last updated November 1, 2024):
-
 Apache License 2.0 (Apache-2.0)
 https://spdx.org/licenses/Apache-2.0.html
 

build.gradle

@@ -4,7 +4,6 @@ plugins {
   id 'com.gradleup.shadow' version '8.3.4'
 
   // Only used for testing
-  id 'com.marklogic.ml-gradle' version '5.0.0'
   id 'jacoco'
   id "org.sonarqube" version "5.1.0.4882"
 
@@ -27,16 +26,29 @@ repositories {
 configurations {
   documentation
   assets
+
+  configurations.all {
+    resolutionStrategy {
+      // Force v4.5.0 of commons-collections4 to avoid CVEs in v4.4.0 from transitive dependecies:
+      // CVE-2025-48924 (https://www.cve.org/CVERecord?id=CVE-2025-48924) and
+      // CVE-2020-15250 (https://www.cve.org/CVERecord?id=CVE-2020-15250)
+      force "org.apache.commons:commons-collections4:4.5.0"
+
+      // Force v3.18 of commons-lang3 to avoid CVE-2025-48924
+      // (https://www.cve.org/CVERecord?id=CVE-2025-48924), without also
+      // upgrading ml-app-deployer to 6.0.0, which we are not ready to do yet.
+      force 'org.apache.commons:commons-lang3:3.18.0'
+    }
+  }
 }
 
 ext {
-  // Even though Kafka Connect 3.7.0 is out, we're staying with 3.6.1 in order to continue
-  // using the third-party Kafka JUnit tool. See https://github.com/mguenther/kafka-junit?tab=readme-ov-file
-  kafkaVersion = "3.8.1"
+  kafkaVersion = "3.9.1"
 }
 
 dependencies {
-  compileOnly "org.apache.kafka:connect-runtime:${kafkaVersion}"
+  def kafkaConnectRuntime = "org.apache.kafka:connect-runtime:${kafkaVersion}"
+  compileOnly kafkaConnectRuntime
   compileOnly "org.slf4j:slf4j-api:1.7.36"
 
   // Force DHF to use the latest version of ml-app-deployer, which minimizes security vulnerabilities
@@ -60,16 +72,20 @@ dependencies {
   testImplementation 'com.marklogic:marklogic-junit5:1.5.0'
 
   testImplementation "org.apache.kafka:connect-json:${kafkaVersion}"
-
-  // Can be deleted when the disabled kafka-junit tests are deleted.
-  testImplementation 'net.mguenther.kafka:kafka-junit:3.6.0'
+  testImplementation kafkaConnectRuntime
 
   testImplementation "org.apache.avro:avro-compiler:1.12.0"
 
   // Forcing logback to be used for test logging
-  testImplementation "ch.qos.logback:logback-classic:1.3.14"
+  testImplementation "ch.qos.logback:logback-classic:1.5.18"
   testImplementation "org.slf4j:jcl-over-slf4j:2.0.16"
 
+	// Automatic loading of test framework implementation dependencies is deprecated.
+	// https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
+	// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
+	// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
+
   documentation files('LICENSE.txt')
   documentation files('NOTICE.txt')
   documentation files('README.md')

config/marklogic-sink.properties

@@ -53,7 +53,7 @@ ml.connection.password=
 # Set to 'true' to customize how an SSL connection is created. Only supported if securityContextType is 'BASIC' or 'DIGEST'.
 # ml.connection.enableCustomSsl=true
 # The TLS version to use for custom SSL
-# ml.connection.customSsl.tlsVersion=TLSv1.2
+# ml.connection.customSsl.tlsVersion=TLS
 # The host verification strategy for custom SSL; either 'ANY', 'COMMON', or 'STRICT'
 # ml.connection.customSsl.hostNameVerifier=ANY
 # Set this to true for 2-way SSL; defaults to 1-way SSL

config/marklogic-source.properties

@@ -47,7 +47,7 @@ ml.connection.password=kafkatest
 # Set to 'true' to customize how an SSL connection is created. Only supported if securityContextType is 'BASIC' or 'DIGEST'.
 # ml.connection.enableCustomSsl=true
 # The TLS version to use for custom SSL
-# ml.connection.customSsl.tlsVersion=TLSv1.2
+# ml.connection.customSsl.tlsVersion=TLS
 # The host verification strategy for custom SSL; either 'ANY', 'COMMON', or 'STRICT'
 # ml.connection.customSsl.hostNameVerifier=ANY
 # Set this to true for 2-way SSL; defaults to 1-way SSL

docs/configuring-the-connector.md

@@ -94,7 +94,7 @@ The MarkLogic connector provides two options for configuring the usage of SSL wh
 
 If a custom SSL approach is used, you can use the following properties to configure this approach:
 
-- `ml.connection.customSsl.tlsVersion` = the TLS version to use for constructing an `SSLContext`. Defaults to `TLSv1.2`.
+- `ml.connection.customSsl.tlsVersion` = the TLS version to use for constructing an `SSLContext`. Defaults to `TLS`, permitting the JVM to use the highest version possible.
 - `ml.connection.customSsl.mutualAuth` = `true` to configure mutual, or "2-way", SSL authentication
 
 If `ml.connection.customSsl.mutualAuth` is set to `true`, you must also configure these properties:

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=1.10.0
+version=1.11.0
 
 # For the Confluent Connector Archive
 componentOwner=marklogic