Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a89d34f
Bumped to 7.3-SNAPSHOT
rjrudin Jul 29, 2025
ef7f38f
Merge pull request #1815 from marklogic/feature/merge-master-to-develop
rjrudin Jul 29, 2025
c95e51f
MLE-12345 Polaris fixes
rjrudin Aug 25, 2025
0eb5f56
Merge pull request #1816 from marklogic/feature/polaris
rjrudin Aug 25, 2025
7c377fd
MLE-23032 Bumping to Java 17 and OkHttp 5
rjrudin Jul 22, 2025
902cd4e
Merge pull request #1818 from marklogic/feature/java17
rjrudin Aug 28, 2025
f3ab540
MLE-23032 Fixing Jenkins build for Java 21
rjrudin Aug 29, 2025
f21157b
Merge pull request #1819 from marklogic/feature/java21-fix
rjrudin Aug 29, 2025
75819de
MLE-23230 Trying out retry interceptor
rjrudin Aug 29, 2025
77daa2f
Merge pull request #1820 from marklogic/feature/retry-listener
rjrudin Sep 2, 2025
bf6f5c1
MLE-23230 Tweaking retry interceptor
rjrudin Sep 3, 2025
65e2719
Merge pull request #1821 from marklogic/feature/retry-tweak
rjrudin Sep 4, 2025
9e70443
MLE-23230 Applying RetryInterceptor in test plumbing
rjrudin Sep 19, 2025
38e2e7b
MLE-24405 Cleaned up RESTServices API
rjrudin Sep 22, 2025
b56710a
PDP-536: Adding copyright check
SameeraPriyathamTadikonda Aug 27, 2025
cc05b57
MLE-24405 Refactor: Moved some OkHttp-specific classes
rjrudin Sep 30, 2025
9ee3b91
MLE-24405 Making ClientCookie a real public class
rjrudin Sep 30, 2025
5eaa965
MLE-24504 Bumping all dependencies
rjrudin Sep 30, 2025
4397dc9
MLE-24504 Bumped Jakarta and removed javax.ws
rjrudin Sep 30, 2025
9173770
MLE-24504 Fixing functional tests
rjrudin Sep 30, 2025
8ba60db
MLE-24505 Modernizing all Gradle config
rjrudin Sep 30, 2025
f1542bd
MLE-24505 Configuring custom Test tasks correctly
rjrudin Oct 1, 2025
30cf9ac
MLE-24505 More Gradle tweaks
rjrudin Oct 1, 2025
d8f1519
MLE-24505 Giving Gradle 9.1 a spin
rjrudin Oct 1, 2025
12fb4c1
MLE-24511 Updating a few tests
rjrudin Oct 2, 2025
881a550
MLE-24505 Fixing publishing for the dev tools plugin
rjrudin Oct 6, 2025
ccfd3e7
MLE-24505 Need internal Artifactory for building now
rjrudin Oct 6, 2025
c9817ea
MLE-23230 Better name for retry interceptor
rjrudin Oct 6, 2025
1fe9b82
MLE-24505 Doing full build on PR pipeline
rjrudin Oct 6, 2025
541b720
MLE-24579 Updated disabled test comment
rjrudin Oct 6, 2025
2760447
MLE-24579 Fixed PR test stage
rjrudin Oct 7, 2025
1ca0f9c
MLE-24523 Getting reverse proxy tests running again
rjrudin Oct 7, 2025
26d12a8
MLE-24523 Hopefully fixing okhttp compile error
rjrudin Oct 8, 2025
ec509dd
MLE-24523 Disabling reverse proxy tests in regression build
rjrudin Oct 8, 2025
5818b49
MLE-24523 Bumped OkHttp and Jackson to latest
rjrudin Oct 9, 2025
ce27ad8
MLE-24523 Removing regressions on 10
rjrudin Oct 9, 2025
f99c24e
MLE-24523 Removing deprecated items
rjrudin Oct 9, 2025
e835c37
Bumped to 8.0.0
rjrudin Oct 9, 2025
af2b8d3
Modified Java requirements in README
rjrudin Oct 10, 2025
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: 2010

# 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, Jenkinsfile, gradle/*, docker-compose.yaml, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defines environment variables for docker-compose.
# Can be overridden via e.g. `MARKLOGIC_TAG=latest-10.0 docker-compose up -d --build`.
MARKLOGIC_IMAGE=progressofficial/marklogic-db:latest
MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12

# This image should be used instead of the above image when testing functions that only work with MarkLogic 12.
#MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
# Latest public release
#MARKLOGIC_IMAGE=progressofficial/marklogic-db:latest
9 changes: 8 additions & 1 deletion .github/workflows/pr-workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 🏷️ JIRA ID Validator
name: PR Workflow

on:
# Using pull_request_target instead of pull_request to handle PRs from forks
Expand All @@ -14,3 +14,10 @@ jobs:
with:
# Pass the PR title from the event context
pr-title: ${{ github.event.pull_request.title }}
copyright-validation:
name: © Validate Copyright Headers
uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
permissions:
contents: read
pull-requests: write
issues: write
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/generate

.vscode
docker/

.kotlin

dep.txt
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ To build the client locally, complete the following steps:

1. Clone this repository on your machine.
2. Choose the appropriate branch (usually develop)
3. Ensure you are using Java 8 or Java 11 or Java 17 (the JVM version used to compile should not matter as compiler flags
are set to ensure the compiled code will run on Java 8; Jenkins pipelines also exist to ensure that the tests pass on
Java 8, 11, and 17, and thus they should for you locally as well; note that if you load the project into an IDE, you
should use Java 8 in case your IDE does not process the build.gradle config that conditionally brings in JAXB dependencies
required by Java 9+.)
3. Ensure you are using Java 17.
4. Verify that you can build the client by running `./gradlew build -x test`

"Running the tests" in the context of developing and submitting a pull request refers to running the tests found
Expand Down
Loading