Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .copyrightconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ startyear: 2023
# - 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, CONTRIBUTING.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, docs/**, *.json, *.txt
filesexcluded: .github/*, README.md, CONTRIBUTING.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, docs/**, *.json, *.txt, CODEOWNERS
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Each line is a file pattern followed by one or more owners.

# These owners will be the default owners for everything in the repo.
* @anu3990 @billfarber @rjrudin @stevebio
* @billfarber @rjrudin @stevebio
6 changes: 5 additions & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ These options define how the connector connects and authenticates with MarkLogic
| spark.marklogic.client.password | Required for `basic` and `digest` authentication. |
| spark.marklogic.client.certificate.file | Required for `certificate` authentication; the path to a certificate file. |
| spark.marklogic.client.certificate.password | Required for `certificate` authentication; the password for accessing the certificate file. |
| spark.marklogic.client.cloud.apiKey | Required for MarkLogic `cloud` authentication. |
| spark.marklogic.client.cloud.apiKey | Required for Progress Data Cloud (PDC) `cloud` authentication. |
| spark.marklogic.client.kerberos.principal | Required for `kerberos` authentication. |
| spark.marklogic.client.saml.token | Required for `saml` authentication. |
| spark.marklogic.client.sslEnabled | If 'true', an SSL connection is created using the JVM's default SSL context.
Expand All @@ -50,6 +50,10 @@ These options define how the connector connects and authenticates with MarkLogic
| spark.marklogic.client.ssl.keystore.algorithm | Java keystore algorithm for 2-way SSL; defaults to "SunX509"; since 2.1.0. |
| spark.marklogic.client.uri | Shortcut for setting the host, port, username, and password when using `basic` or `digest` authentication. See below for more information. |

If you are using the connector with a MarkLogic server hosted in Progress Data Cloud (PDC), please see
the related [Flux documentation](https://marklogic.github.io/flux/common-options.html) on how to configure the
values for the MarkLogic host, base path, and cloud API key.

### Connecting with a client URI

The `spark.marklogic.client.uri` is a convenience for the common case of using `basic` or `digest` authentication.
Expand Down