Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
452 commits
Select commit Hold shift + click to select a range
c9591f9
Checking in the nightly xcc - 20260202
Feb 2, 2026
0cf8ffe
Checking in the nightly xcc - 20260203
Feb 3, 2026
2a62d87
Checking in the nightly xcc - 20260204
Feb 4, 2026
2979ea0
Checking in the nightly xcc - 20260205
Feb 5, 2026
403d944
Checking in the nightly xcc - 20260206
Feb 6, 2026
e909269
Checking in the nightly xcc - 20260207
Feb 7, 2026
7945ae5
Checking in the nightly xcc - 20260208
Feb 8, 2026
efc4444
Checking in the nightly xcc - 20260209
Feb 9, 2026
41c697a
Checking in the nightly xcc - 20260210
Feb 10, 2026
5f0eb0a
Checking in the nightly xcc - 20260211
Feb 11, 2026
ff8b6eb
Checking in the nightly xcc - 20260212
Feb 12, 2026
bc6a1aa
Checking in the nightly xcc - 20260213
Feb 13, 2026
b78d171
Checking in the nightly xcc - 20260214
Feb 14, 2026
f6a1e3f
Checking in the nightly xcc - 20260215
Feb 15, 2026
e228cb4
Checking in the nightly xcc - 20260216
Feb 16, 2026
6b2c060
Checking in the nightly xcc - 20260217
Feb 17, 2026
0ef4c99
MLE-26838: Added null check for conf.getStrings() method
SiddharthMaheshB Feb 5, 2026
3e102b5
Checking in the nightly xcc - 20260218
Feb 18, 2026
4f31f03
MLE-26862: Changed .equals() to notequals() to handle null cases
SiddharthMaheshB Feb 17, 2026
4591abe
MLE-26842: Added null checks to DOM methods
SiddharthMaheshB Feb 17, 2026
b1d8e0a
MLE-26845: Added null check for File/Path parents directories
SiddharthMaheshB Feb 19, 2026
e50dae8
MLE-26849: Added null check for Exception messages
SiddharthMaheshB Feb 19, 2026
1e75a78
Checking in the nightly xcc - 20260219
Feb 19, 2026
e6cc858
Checking in the nightly xcc - 20260219
Feb 19, 2026
a1f5d18
MLE-26857: Added null check for getData related functions
SiddharthMaheshB Feb 20, 2026
8de79e6
Checking in the nightly xcc - 20260220
Feb 20, 2026
b0f1de6
Checking in the nightly xcc - 20260221
Feb 21, 2026
38749fb
Checking in the nightly xcc - 20260222
Feb 22, 2026
d8070c5
Checking in the nightly xcc - 20260223
Feb 23, 2026
8a65ca8
Checking in the nightly xcc - 20260224
Feb 24, 2026
fce9660
Merge pull request #565 from SiddharthMaheshB/develop
SiddharthMaheshB Feb 25, 2026
889c49b
MLE-26840: Added null checks for result.next()
SiddharthMaheshB Feb 20, 2026
7a743a8
MLE-26861: Added null checks to resolve Polaris flagged null pointer …
SiddharthMaheshB Feb 25, 2026
d7e2a1a
Checking in the nightly xcc - 20260225
Feb 25, 2026
6a6d101
Checking in the nightly xcc - 20260226
Feb 26, 2026
28ff632
Checking in the nightly xcc - 20260227
Feb 27, 2026
6a2a4d9
MLE-27155 : (CVE) MLCP - Apache Avro 1.11.4 - 7.3 HIGH (#566) (#570)
abika5 Feb 27, 2026
26e4ac8
Checking in the nightly xcc - 20260228
Feb 28, 2026
1950770
Checking in the nightly xcc - 20260301
Mar 1, 2026
4fa02f8
Checking in the nightly xcc - 20260302
Mar 2, 2026
39d05c8
Checking in the nightly xcc - 20260303
Mar 3, 2026
885f3f7
Checking in the nightly xcc - 20260304
Mar 4, 2026
33029b6
Merge branch 'marklogic:develop' into develop
SiddharthMaheshB Mar 4, 2026
0488b8b
Checking in the nightly xcc - 20260305
Mar 5, 2026
c04cdc0
Checking in the nightly xcc - 20260306
Mar 6, 2026
bd4006a
Checking in the nightly xcc - 20260307
Mar 7, 2026
00aa0f2
Checking in the nightly xcc - 20260308
Mar 8, 2026
9fd2b42
Checking in the nightly xcc - 20260309
Mar 9, 2026
4449178
Checking in the nightly xcc - 20260310
Mar 10, 2026
e632814
Checking in the nightly xcc - 20260311
Mar 11, 2026
c35c265
Checking in the nightly xcc - 20260312
Mar 12, 2026
8beb3d3
Checking in the nightly xcc - 20260313
Mar 13, 2026
488c694
Checking in the nightly xcc - 20260314
Mar 14, 2026
ee52639
Checking in the nightly xcc - 20260316
Mar 16, 2026
2f0f4a8
Checking in the nightly xcc - 20260317
Mar 17, 2026
9047b5f
Checking in the nightly xcc - 20260318
Mar 18, 2026
7f1949c
Checking in the nightly xcc - 20260319
Mar 19, 2026
61fb50e
Checking in the nightly xcc - 20260320
Mar 20, 2026
7e2486f
Checking in the nightly xcc - 20260321
Mar 21, 2026
44b4099
Merge pull request #576 from SiddharthMaheshB/develop
SiddharthMaheshB Mar 23, 2026
0d9e5a6
Checking in the nightly xcc - 20260323
Mar 23, 2026
3c0a49b
Checking in the nightly xcc - 20260324
Mar 24, 2026
97f0c65
Checking in the nightly xcc - 20260325
Mar 25, 2026
097e720
Checking in the nightly xcc - 20260326
Mar 26, 2026
19bcde9
Checking in the nightly xcc - 20260327
Mar 27, 2026
3350787
Checking in the nightly xcc - 20260328
Mar 28, 2026
d91721e
Checking in the nightly xcc - 20260329
Mar 29, 2026
c3b1402
MLE-27553 MLE-27554 MLE-27555 MLE-27556: Fix XXE Injection - XML Exte…
vshaniga Mar 30, 2026
599e569
MLE-27557: Fix weak crypto - replace insecure TLSv1 with TLSv1.3 in C…
vshaniga Mar 25, 2026
a973220
Checking in the nightly xcc - 20260330
Mar 30, 2026
f1694e1
Merge pull request #579 from vshaniga/MLE-27557-weak-crypto-fix
vshaniga Mar 31, 2026
e5a5e18
Checking in the nightly xcc - 20260331
Mar 31, 2026
68463da
MLE-26867: Fix potential divide by zero issue identified by Polaris
SiddharthMaheshB Apr 1, 2026
b7155a4
MLE-26865: replaced pool.wait()/notify() with CountDownLatch to addre…
SiddharthMaheshB Apr 1, 2026
141431c
Checking in the nightly xcc - 20260401
Apr 1, 2026
49371d1
Checking in the nightly xcc - 20260402
Apr 2, 2026
9b3c171
Merge pull request #581 from SiddharthMaheshB/develop
SiddharthMaheshB Apr 2, 2026
6e8a31f
Checking in the nightly xcc - 20260403
Apr 3, 2026
d59da1e
Checking in the nightly xcc - 20260404
Apr 4, 2026
c80f918
Checking in the nightly xcc - 20260405
Apr 5, 2026
14fb0c8
Checking in the nightly xcc - 20260406
Apr 6, 2026
ebcec77
Checking in the nightly xcc - 20260407
Apr 7, 2026
5f7118a
Checking in the nightly xcc - 20260408
Apr 8, 2026
89ed2d7
PDP-1182: Remove per-repo pr-workflow.yaml
SameeraPriyathamTadikonda Apr 9, 2026
4f67f19
Checking in the nightly xcc - 20260409
Apr 9, 2026
4fc3ea5
Merge pull request #585 from marklogic/PDP-1182-remove-pr-workflow-fr…
GAdityaVarma Apr 9, 2026
cfaaa85
Checking in the nightly xcc - 20260410
Apr 10, 2026
bcac6ab
Checking in the nightly xcc - 20260411
Apr 11, 2026
035a7f2
Checking in the nightly xcc - 20260412
Apr 12, 2026
4cafd31
Checking in the nightly xcc - 20260413
Apr 13, 2026
d02d827
Checking in the nightly xcc - 20260414
Apr 14, 2026
2934067
MLE-28401: Add missing guard for logging retry message (#592)
vzhang-progress Apr 14, 2026
5501643
Checking in the nightly xcc - 20260415
Apr 15, 2026
37afb47
Checking in the nightly xcc - 20260416
Apr 16, 2026
8778cc2
Checking in the nightly xcc - 20260417
Apr 17, 2026
bfce88e
Checking in the nightly xcc - 20260418
Apr 18, 2026
eae632a
Checking in the nightly xcc - 20260419
Apr 19, 2026
c15714a
Checking in the nightly xcc - 20260420
Apr 20, 2026
6572636
Checking in the nightly xcc - 20260421
Apr 21, 2026
e1ecb32
Checking in the nightly xcc - 20260422
Apr 22, 2026
a58ffc1
Checking in the nightly xcc - 20260423
Apr 23, 2026
b1a9170
Checking in the nightly xcc - 20260424
Apr 24, 2026
94ce68b
MLE-26818 MLE-26835: Fix Polaris Unwritten Field and Useless Call
vshaniga Apr 22, 2026
c4fc66d
MLE-26816 MLE-26817: Fix Polaris copy-paste error and comparing incom…
vshaniga Apr 22, 2026
f8bbd14
Checking in the nightly xcc - 20260425
Apr 25, 2026
bdeebc6
Checking in the nightly xcc - 20260426
Apr 26, 2026
ff45e6f
Merge pull request #596 from vshaniga/MLE-26816-fix-polaris-copy-past…
vshaniga Apr 27, 2026
5250d1a
Merge pull request #595 from vshaniga/MLE-26818-fix-polaris-unwritten…
vshaniga Apr 27, 2026
799e4b4
Checking in the nightly xcc - 20260427
Apr 27, 2026
0c06869
MLE-26858 MLE-26901 MLE-26837: Fix Polaris bitwise shift, null-like v…
vshaniga Apr 27, 2026
fffec5c
Checking in the nightly xcc - 20260428
Apr 28, 2026
8f25938
Merge pull request #598 from vshaniga/MLE-26858-polaris-cwe-fixes
vshaniga Apr 29, 2026
d2a160e
Checking in the nightly xcc - 20260429
Apr 29, 2026
7b6d6b4
Checking in the nightly xcc - 20260430
Apr 30, 2026
8318d74
MLE-26902: Fix bad use of null-like value and insufficient logging
vshaniga Apr 30, 2026
a474e38
Checking in the nightly xcc - 20260501
May 1, 2026
0c04cf2
Checking in the nightly xcc - 20260502
May 2, 2026
4388e15
Merge pull request #601 from vshaniga/MLE-26902-fix-bad-use-of-null-v…
vshaniga May 4, 2026
07301b7
Checking in the nightly xcc - 20260504
May 4, 2026
2a22bcf
MLE-28226, MLE-28260: Fix silent NPE in getSslContext() and IndexOutO…
May 4, 2026
c44e043
Merge pull request #600 from tposham/develop
vshaniga May 5, 2026
fd3550b
Checking in the nightly xcc - 20260505
May 5, 2026
2055d30
Checking in the nightly xcc - 20260506
May 6, 2026
fc38b43
Checking in the nightly xcc - 20260507
May 7, 2026
d32917d
Checking in the nightly xcc - 20260508
May 8, 2026
f9ae9ee
Checking in the nightly xcc - 20260509
May 9, 2026
6e0ae94
Checking in the nightly xcc - 20260510
May 10, 2026
799c5b2
Checking in the nightly xcc - 20260511
May 11, 2026
f5ec681
Checking in the nightly xcc - 20260512
May 12, 2026
ebab020
Checking in the nightly xcc - 20260513
May 13, 2026
8730ee1
Checking in the nightly xcc - 20260514
May 14, 2026
ad068af
Checking in the nightly xcc - 20260515
May 15, 2026
2388c2c
Checking in the nightly xcc - 20260516
May 16, 2026
e2985b1
Checking in the nightly xcc - 20260517
May 17, 2026
1036aee
Checking in the nightly xcc - 20260518
May 18, 2026
5c5fed4
Checking in the nightly xcc - 20260519
May 19, 2026
7b3727b
Checking in the nightly xcc - 20260520
May 20, 2026
515253e
Checking in the nightly xcc - 20260521
May 21, 2026
6497e7d
Checking in the nightly xcc - 20260522
May 22, 2026
ec9bcb9
Checking in the nightly xcc - 20260523
May 23, 2026
416e98b
Checking in the nightly xcc - 20260525
May 25, 2026
9dd870f
Checking in the nightly xcc - 20260526
May 26, 2026
cd79244
MLE-28100 MLE-29561: fix ResourceSequence leak in ContentOutputFormat…
vshaniga May 27, 2026
a7052d2
Checking in the nightly xcc - 20260527
May 27, 2026
d142f65
Checking in the nightly xcc - 20260528
May 28, 2026
61bd72f
Checking in the nightly xcc - 20260529
May 29, 2026
b541023
Checking in the nightly xcc - 20260530
May 30, 2026
5d22611
Checking in the nightly xcc - 20260531
May 31, 2026
c40c7ba
Checking in the nightly xcc - 20260601
Jun 1, 2026
5a0936c
Checking in the nightly xcc - 20260602
Jun 2, 2026
bf0a9d2
Checking in the nightly xcc - 20260603
Jun 3, 2026
eb776eb
Checking in the nightly xcc - 20260604
Jun 4, 2026
b2f867b
Checking in the nightly xcc - 20260605
Jun 5, 2026
a83de22
Checking in the nightly xcc - 20260606
Jun 6, 2026
fa87fa7
Checking in the nightly xcc - 20260607
Jun 7, 2026
164ead2
Checking in the nightly xcc - 20260608
Jun 8, 2026
9f3d9f6
Checking in the nightly xcc - 20260609
Jun 9, 2026
c9b76d8
Checking in the nightly xcc - 20260610
Jun 10, 2026
efea024
Checking in the nightly xcc - 20260611
Jun 11, 2026
2f0286d
Checking in the nightly xcc - 20260612
Jun 12, 2026
f2b4706
Checking in the nightly xcc - 20260613
Jun 13, 2026
9a04a4d
Checking in the nightly xcc - 20260614
Jun 14, 2026
7c6d8e1
Checking in the nightly xcc - 20260615
Jun 15, 2026
0332572
Checking in the nightly xcc - 20260616
Jun 16, 2026
edb97e2
Checking in the nightly xcc - 20260617
Jun 17, 2026
d4434bc
Checking in the nightly xcc - 20260618
Jun 18, 2026
15cbec4
Checking in the nightly xcc - 20260619
Jun 19, 2026
79b66a2
Checking in the nightly xcc - 20260620
Jun 20, 2026
82ae239
Checking in the nightly xcc - 20260621
Jun 21, 2026
17e98dd
Checking in the nightly xcc - 20260622
Jun 22, 2026
7367550
Checking in the nightly xcc - 20260623
Jun 23, 2026
aeb1ed2
Checking in the nightly xcc - 20260624
Jun 24, 2026
0caf633
Checking in the nightly xcc - 20260625
Jun 25, 2026
6676214
Checking in the nightly xcc - 20260626
Jun 26, 2026
f328eec
MLE-30494: Support isolated HTTP and XDBC requests (#608)
vzhang-progress Jun 26, 2026
da03c10
Checking in the nightly xcc - 20260627
Jun 27, 2026
64f0a39
Checking in the nightly xcc - 20260628
Jun 28, 2026
b470e7d
Checking in the nightly xcc - 20260629
Jun 29, 2026
196391e
Checking in the nightly xcc - 20260630
Jun 30, 2026
6dc1758
Checking in the nightly xcc - 20260701
Jul 1, 2026
c790bea
Checking in the nightly xcc - 20260702
Jul 2, 2026
b57c198
Checking in the nightly xcc - 20260703
Jul 3, 2026
8993943
Checking in the nightly xcc - 20260704
Jul 4, 2026
81cdf99
Checking in the nightly xcc - 20260705
Jul 5, 2026
c911706
Checking in the nightly xcc - 20260706
Jul 6, 2026
fe17c9f
Checking in the nightly xcc - 20260707
Jul 7, 2026
594d838
Checking in the nightly xcc - 20260708
Jul 8, 2026
a7a929b
Checking in the nightly xcc - 20260709
Jul 9, 2026
9a8a607
Checking in the nightly xcc - 20260710
Jul 10, 2026
437bce1
Checking in the nightly xcc - 20260713
Jul 13, 2026
a3fe918
Checking in the nightly xcc - 20260714
Jul 14, 2026
39b0d29
Checking in the nightly xcc - 20260715
Jul 15, 2026
5ae3b76
Checking in the nightly xcc - 20260716
Jul 16, 2026
3bf04f8
Checking in the nightly xcc - 20260717
Jul 17, 2026
97c058f
Checking in the nightly xcc - 20260719
Jul 19, 2026
d67257e
Checking in the nightly xcc - 20260720
Jul 20, 2026
66bb85c
Checking in the nightly xcc - 20260721
Jul 21, 2026
6e062bf
Checking in the nightly xcc - 20260722
Jul 22, 2026
15185e3
Checking in the nightly xcc - 20260723
Jul 23, 2026
5505d5a
Checking in the nightly xcc - 20260724
Jul 24, 2026
757c6ec
MLE-31423: Change xdmp:is-forwarded to xdmp:request-forwarded (#611)
vzhang-progress Jul 24, 2026
6fdb1b8
Checking in the nightly xcc - 20260725
Jul 25, 2026
7102b63
Checking in the nightly xcc - 20260726
Jul 26, 2026
a7c218d
Checking in the nightly xcc - 20260727
Jul 27, 2026
1936026
Checking in the nightly xcc - 20260728
Jul 28, 2026
80c9780
Checking in the nightly xcc - 20260729
Jul 29, 2026
1e0d9bc
Checking in the nightly xcc - 20260730
Jul 30, 2026
0007dde
Checking in the nightly xcc - 20260731
Jul 31, 2026
f6f24dd
Checking in the nightly xcc - 20260801
Aug 1, 2026
e7378f8
Checking in the nightly xcc - 20260802
Aug 2, 2026
261dd0f
Checking in the nightly xcc - 20260803
Aug 3, 2026
2acdeb2
Checking in the nightly xcc - 20260804
Aug 4, 2026
98786fe
Checking in the nightly xcc - 20260805
Aug 5, 2026
02a83c9
Checking in the nightly xcc - 20260806
Aug 6, 2026
9be93fe
Checking in the nightly xcc - 20260807
Aug 7, 2026
d049fa8
Checking in the nightly xcc - 20260808
Aug 8, 2026
f45b3ec
Checking in the nightly xcc - 20260809
Aug 9, 2026
7ebae10
Checking in the nightly xcc - 20260810
Aug 10, 2026
e4c4f5d
Checking in the nightly xcc - 20260811
Aug 11, 2026
f7a7727
Checking in the nightly xcc - 20260812
Aug 12, 2026
8490d52
Checking in the nightly xcc - 20260813
Aug 13, 2026
61b49c5
Checking in the nightly xcc - 20260814
Aug 14, 2026
d89dcaa
Checking in the nightly xcc - 20260815
Aug 15, 2026
1e80642
Checking in the nightly xcc - 20260816
Aug 16, 2026
3a70bf5
Checking in the nightly xcc - 20260817
Aug 17, 2026
9e70f82
Checking in the nightly xcc - 20260818
Aug 18, 2026
f917499
Checking in the nightly xcc - 20260819
Aug 19, 2026
3777028
Checking in the nightly xcc - 20260820
Aug 20, 2026
b40efdc
Checking in the nightly xcc - 20260821
Aug 21, 2026
be3766c
Checking in the nightly xcc - 20260822
Aug 22, 2026
f9191ab
Checking in the nightly xcc - 20260823
Aug 23, 2026
bc90060
Checking in the nightly xcc - 20260824
Aug 24, 2026
17c8275
Checking in the nightly xcc - 20260825
Aug 25, 2026
f401ab7
Checking in the nightly xcc - 20260826
Aug 26, 2026
5b72420
Checking in the nightly xcc - 20260827
Aug 27, 2026
0c67c6e
Checking in the nightly xcc - 20260828
Aug 28, 2026
21cc45d
Checking in the nightly xcc - 20260829
Aug 29, 2026
40934b1
Checking in the nightly xcc - 20260830
Aug 30, 2026
0a1611c
Checking in the nightly xcc - 20260831
Aug 31, 2026
21d33da
Checking in the nightly xcc - 20260901
Sep 1, 2026
267211c
MLE-32209: Bulk copyright update for 12.1.0 release (#616)
vzhang-progress Sep 1, 2026
d7e5559
MLE-27590: Update README for 12.1.0 release (#618)
vzhang-progress Sep 1, 2026
f497984
Checking in the nightly xcc - 20260902
Sep 2, 2026
0c214da
Checking in the nightly xcc - 20260903
Sep 3, 2026
a45743d
MLE-27599: Checkin product notice for 12.1.0 (#623)
vzhang-progress Sep 3, 2026
6dc837e
MLE-27612: branching 12.1.0
Sep 4, 2026
500d534
Merge pull request #626 from marklogic/MLE-27612-branching-12.1.0
yakov-feldman Sep 4, 2026
b6564e7
MLE-27615: replace XCC jar
Sep 4, 2026
920186d
Merge pull request #627 from marklogic/MLE-27615-builds-12.1.0
yakov-feldman Sep 4, 2026
3c1ca49
Merge remote-tracking branch 'origin/main' into MLE-27876-merge-relea…
Copilot Sep 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .copyrightconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# COPYRIGHT VALIDATION CONFIG
# ---------------------------------
# Required start year (keep fixed; end year auto-updates in check output)
startyear: 2011

# Optional exclusions list (comma-separated). Leave commented if none.
# Rules:
# - Relative paths (no leading ./)
# - Simple * wildcard only (no recursive **)
# - Use sparingly (third_party, generated, binary assets)
# - Dotfiles already skipped automatically
# Enable by removing the leading '# ' from the next line and editing values.
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
filesexcluded: .github/*, README.md
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
target
deliverable
.idea
.vscode
2,115 changes: 1,056 additions & 1,059 deletions NOTICE.txt

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@ The MarkLogic Connector for Hadoop is an extension to Hadoop’s MapReduce frame

## Release Notes

### What's New in mlcp 12.1

- Added support for isolated HTTP and XDBC requests. **Note:** as a result of this change, older versions of mlcp are no longer compatible with MarkLogic Server 12.1.0 and beyond; please refer to the [release notes](https://docs.progress.com/bundle/marklogic-server-whats-new-12/page/topics/release-notes.html) for details.
- Upgraded Apache Avro to address a known security vulnerability.
- Strengthened TLS security by removing support for the outdated TLSv1 protocol.
- Fixed several security and stability issues.
- Various reliability and robustness improvements based on static code analysis.

### What's New in mlcp 12.0.1

- No new updates

### What's New in mlcp 12.0.0

- Replaced the commons-csv-marklogic library with the standard Apache Commons CSV library for improved compatibility and maintainability
- Replaced the commons-csv-marklogic library with the standard Apache Commons CSV library for improved compatibility and maintainability.
- Upgraded commons-csv and commons-io libraries to the latest stable versions.
- Upgraded commons-beanutils, xstream and avro libraries to mitigate security vulnerabilities.
- Removed unused dependencies: hadoop-shaded-protobuf_3_25, jena-shaded-guava.
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.marklogic</groupId>
<artifactId>mlcp</artifactId>
<version>12.0.1</version>
<version>12.1.0</version>
<name>MarkLogic Content Pump</name>
<description>MarkLogic Content Pump</description>
<url>https://github.com/marklogic/marklogic-contentpump</url>
Expand All @@ -17,7 +17,7 @@
</licenses>

<properties>
<versionString>12.0.1</versionString>
<versionString>12.1.0</versionString>
<xccVersion>${versionString}</xccVersion>
<hadoopVersion>3.4.0</hadoopVersion>
<jacksonVersion>2.17.1</jacksonVersion>
Expand Down Expand Up @@ -1615,7 +1615,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.11.4</version>
<version>1.11.5</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand Down
Binary file removed src/lib/marklogic-xcc-12.0.1.jar
Binary file not shown.
Binary file added src/lib/marklogic-xcc-12.1.0.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/com/marklogic/contentpump/AggregateXMLReader.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2026 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.
Expand Down Expand Up @@ -110,6 +110,16 @@ public void initialize(InputSplit inSplit, TaskAttemptContext context)
initAggConf(context);

f = XMLInputFactory.newInstance();
try {
f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
} catch (IllegalArgumentException e) {
LOG.warn("Failed configuring XXE-prevention security property IS_SUPPORTING_EXTERNAL_ENTITIES on XMLInputFactory", e);
}
try {
f.setProperty(XMLInputFactory.SUPPORT_DTD, false);
} catch (IllegalArgumentException e) {
LOG.warn("Failed configuring XXE-prevention security property SUPPORT_DTD on XMLInputFactory", e);
Comment thread
yakov-feldman marked this conversation as resolved.
}
setFile(((FileSplit) inSplit).getPath());
fs = file.getFileSystem(context.getConfiguration());
FileStatus status = fs.getFileStatus(file);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2015 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2015 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2017 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.
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/marklogic/contentpump/ColumnDataType.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2026 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.
Expand Down Expand Up @@ -35,7 +35,7 @@ public Object parse(String s) throws Exception {
NUMBER {
@Override
public Object parse(String s) throws Exception {
s.trim();
s = s.trim();
if ("".equals(s)) {
throw new Exception("missing value");
}
Expand All @@ -46,14 +46,14 @@ public Object parse(String s) throws Exception {
BOOLEAN {
@Override
public Object parse(String s) throws Exception {
s.trim();
s = s.trim();
if ("".equals(s)) {
throw new Exception("missing value");
} else if (!"true".equalsIgnoreCase(s) &&
!"false".equalsIgnoreCase(s)) {
throw new ParseException("", 0);
}
return new Boolean(s);
return Boolean.valueOf(s);
}

};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2026 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.
Expand Down Expand Up @@ -69,6 +69,16 @@ public void initialize(InputSplit inSplit, TaskAttemptContext context)
initConfig(context);
initAggConf(context);
f = XMLInputFactory.newInstance();
try {
f.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
} catch (IllegalArgumentException e) {
LOG.warn("Failed configuring XXE-prevention security property IS_SUPPORTING_EXTERNAL_ENTITIES on XMLInputFactory", e);
}
try {
f.setProperty(XMLInputFactory.SUPPORT_DTD, false);
} catch (IllegalArgumentException e) {
LOG.warn("Failed configuring XXE-prevention security property SUPPORT_DTD on XMLInputFactory", e);
Comment thread
yakov-feldman marked this conversation as resolved.
}
setFile(((FileSplit) inSplit).getPath());
fs = file.getFileSystem(context.getConfiguration());

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2015 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2015 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2017 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2017 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2023 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.
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/marklogic/contentpump/ContentPump.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2026 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.
Expand Down Expand Up @@ -333,7 +333,11 @@ public boolean accept(File dir, String name) {

// set lib jars
StringBuilder jars = new StringBuilder();
for (File jar : cpHomeDir.listFiles(filter)) {
File[] libJars = cpHomeDir.listFiles(filter);
if (libJars == null) {
throw new RuntimeException("Unable to list library jars in directory: " + cpHomeDir.getAbsolutePath());
}
for (File jar : libJars) {
if (jars.length() > 0) {
jars.append(',');
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2013 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2020 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2016 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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2024 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
* Copyright (c) 2011-2021 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.
Expand Down
Loading
Loading