Skip to content

Commit 32948cd

Browse files
rjrudinrjrudin
authored
Merge pull request #240 from marklogic/develop
MLE-12345 Merging develop into master for 2.0.0 release
2 parents 5c0312c + a4d0ae9 commit 32948cd

28 files changed

+456
-624
lines changed

‎.copyrightconfig‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# COPYRIGHT VALIDATION CONFIG
2+
# ---------------------------------
3+
# Required start year (keep fixed; end year auto-updates in check output)
4+
startyear: 2019
5+
6+
# Optional exclusions list (comma-separated). Leave commented if none.
7+
# Rules:
8+
# - Relative paths (no leading ./)
9+
# - Simple * wildcard only (no recursive **)
10+
# - Use sparingly (third_party, generated, binary assets)
11+
# - Dotfiles already skipped automatically
12+
# Enable by removing the leading '# ' from the next line and editing values.
13+
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14+
filesexcluded: .github/*, README.md, CONTRIBUTING.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, docs/**, test-app/docker-compose.yml, docker/**, *.txt

‎.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
2+
MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs

‎.github/workflows/jekyll-gh-pages.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
33

44
on:
5-
# Runs on pushes targeting the default branch
65
push:
7-
branches: ["develop"]
6+
branches: ["main"]
87

98
# Allows you to run this workflow manually from the Actions tab
109
workflow_dispatch:
@@ -21,21 +20,20 @@ concurrency:
2120
cancel-in-progress: true
2221

2322
jobs:
24-
# Build job
2523
build:
2624
runs-on: ubuntu-latest
2725
steps:
2826
- name: Checkout
29-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
3028
- name: Setup Pages
31-
uses: actions/configure-pages@v3
29+
uses: actions/configure-pages@v5
3230
- name: Build with Jekyll
3331
uses: actions/jekyll-build-pages@v1
3432
with:
3533
source: ./docs/
3634
destination: ./_site
3735
- name: Upload artifact
38-
uses: actions/upload-pages-artifact@v1
36+
uses: actions/upload-pages-artifact@v3
3937

4038
# Deployment job
4139
deploy:
@@ -47,4 +45,4 @@ jobs:
4745
steps:
4846
- name: Deploy to GitHub Pages
4947
id: deployment
50-
uses: actions/deploy-pages@v1
48+
uses: actions/deploy-pages@v4

‎.github/workflows/pr-workflow.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 🏷️ JIRA ID Validator
1+
name: PR Workflow
22

33
on:
44
# Using pull_request_target instead of pull_request to handle PRs from forks
@@ -14,3 +14,10 @@ jobs:
1414
with:
1515
# Pass the PR title from the event context
1616
pr-title: ${{ github.event.pull_request.title }}
17+
copyright-validation:
18+
name: © Validate Copyright Headers
19+
uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
20+
permissions:
21+
contents: read
22+
pull-requests: write
23+
issues: write

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
build
55
out
66
gradle-local.properties
7-
docker
7+
docker/confluent-marklogic-components/marklogic-kafka-marklogic-connector*
8+
docker/marklogic
89

910
bin
1011
.vscode

‎CONTRIBUTING.md‎

Lines changed: 84 additions & 94 deletions
Large diffs are not rendered by default.

‎Jenkinsfile‎

Lines changed: 59 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,74 @@
11
@Library('shared-libraries') _
2+
3+
def runtests(String marklogicVersion) {
4+
cleanupDocker()
5+
sh label:'mlsetup', script: '''#!/bin/bash
6+
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
7+
sudo /usr/local/sbin/mladmin remove
8+
docker-compose down -v || true
9+
sudo /usr/local/sbin/mladmin cleandata
10+
cd kafka-connector
11+
MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE='''+marklogicVersion+''' docker-compose up -d --build
12+
sleep 60s;
13+
'''
14+
sh label:'deploy project', script: '''#!/bin/bash
15+
export JAVA_HOME=$JAVA17_HOME_DIR
16+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
17+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
18+
cd kafka-connector
19+
./gradlew hubInit
20+
./gradlew mlTestConnections
21+
./gradlew -i mlDeploy
22+
'''
23+
sh label:'test', script: '''#!/bin/bash
24+
export JAVA_HOME=$JAVA17_HOME_DIR
25+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
26+
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
27+
cd kafka-connector
28+
./gradlew test || true
29+
'''
30+
junit '**/build/**/*.xml'
31+
}
32+
233
pipeline{
334
agent {label 'devExpLinuxPool'}
435
options {
536
checkoutToSubdirectory 'kafka-connector'
637
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
738
}
839
environment{
9-
JAVA_HOME_DIR="/home/builder/java/jdk-11.0.2"
40+
JAVA17_HOME_DIR="/home/builder/java/jdk-17.0.2"
1041
GRADLE_DIR =".gradle"
11-
DMC_USER = credentials('MLBUILD_USER')
12-
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
1342
}
1443
stages{
15-
stage('tests'){
44+
stage('test-ML12'){
45+
steps{
46+
runtests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12")
47+
}
48+
post{
49+
always{
50+
updateWorkspacePermissions()
51+
sh label:'mlcleanup', script: '''#!/bin/bash
52+
cd kafka-connector
53+
docker-compose down -v || true
54+
'''
55+
cleanupDocker()
56+
}
57+
}
58+
}
59+
stage('test-ML11'){
1660
steps{
17-
copyRPM 'Release','11.3.0'
18-
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
19-
sh label:'setup', script: '''#!/bin/bash
20-
cd kafka-connector/test-app
21-
echo mlPassword=admin >> gradle-local.properties
22-
'''
23-
sh label:'deploy project', script: '''#!/bin/bash
24-
export JAVA_HOME=$JAVA_HOME_DIR
25-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
26-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
27-
cd kafka-connector/test-app
28-
./gradlew hubInit
29-
./gradlew mlDeploy -PmlPassword=admin
30-
'''
31-
sh label:'test', script: '''#!/bin/bash
32-
export JAVA_HOME=$JAVA_HOME_DIR
33-
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
34-
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
35-
cd kafka-connector
36-
./gradlew test || true
37-
'''
38-
junit '**/build/**/*.xml'
61+
runtests("ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11")
62+
}
63+
post{
64+
always{
65+
updateWorkspacePermissions()
66+
sh label:'mlcleanup', script: '''#!/bin/bash
67+
cd kafka-connector
68+
docker-compose down -v || true
69+
'''
70+
cleanupDocker()
71+
}
3972
}
4073
}
4174
}

‎NOTICE.txt‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,47 @@
1-
MarkLogic® Connector for Kafka
1+
Progress® MarkLogic® Connector for Kafka v1.11.0
22

3-
Copyright © 2019-2025 MarkLogic Corporation. All Rights Reserved.
3+
Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
44

55
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.
66

7-
Third Party Notices
7+
-----------------------------------------------------------------------
88

9-
marklogic-data-hub 6.1.1 (Apache-2.0)
10-
ml-app-deployer 5.0.0 (Apache-2.0)
11-
jackson-dataformat-csv 2.17.2 (Apache-2.0)
9+
The following is a list of the third-party components used by Progress® MarkLogic® Connector for Kafka v1.11.0 (last updated October 16, 2025):
10+
11+
Summary
12+
13+
marklogic-data-hub 6.2.1 (Apache-2.0)
14+
ml-gradle 6.1.0 (Apache-2.0)
15+
jackson-dataformat-csv 2.20.2 (Apache-2.0)
16+
17+
-----------------------------------------------------------------------
1218

1319
Common Licenses
1420

1521
Apache License 2.0 (Apache-2.0)
1622

17-
Third-Party Components
23+
-----------------------------------------------------------------------
1824

19-
The following is a list of the third-party components used by the MarkLogic® Connector for Kafka 1.11.0 (last updated August 12, 2025):
20-
21-
marklogic-data-hub 6.1.1 (Apache-2.0)
25+
marklogic-data-hub 6.2.1 (Apache-2.0)
2226
https://repo1.maven.org/maven2/com/marklogic/marklogic-data-hub/
27+
2328
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
2429

25-
ml-app-deployer 5.0.0 (Apache-2.0)
26-
https://repo1.maven.org/maven2/com/marklogic/ml-app-deployer/
30+
ml-gradle 6.1.0 (Apache-2.0)
31+
https://repo1.maven.org/maven2/com/marklogic/ml-gradle/
32+
2733
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
2834

29-
jackson-dataformat-csv 2.17.2 (Apache-2.0)
35+
jackson-dataformat-csv 2.20.2 (Apache-2.0)
3036
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-csv/
37+
3138
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
3239

40+
-----------------------------------------------------------------------
41+
3342
Common Licenses
3443

35-
This section shows the text of common third-party licenses used by MarkLogic® Connector for Kafka 1.11.0 (last updated August 12, 2025):
44+
This section shows the text of common third-party licenses used by Progress® MarkLogic® Connector for Kafka v1.11.0 (last updated October 16, 2025):
3645

3746
Apache License 2.0 (Apache-2.0)
3847
https://spdx.org/licenses/Apache-2.0.html
@@ -110,3 +119,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
110119
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
111120
See the License for the specific language governing permissions and
112121
limitations under the License.
122+

0 commit comments

Comments
 (0)