Conversation
Merging this to main to get it published immediately.
Forgot to adjust these from "3.5.6" to "latest", which is 4.1.0 now
MLE-28021 Merge 2.1.0 into main
|
Copyright Validation Results ⏭️ Skipped (Excluded) Files
✅ All files have valid copyright headers! |
|
| Type | Meaning | Action Required |
|---|---|---|
| Verified | Confirmed active credential | Must remove & rotate - PR blocked |
| Unverified | Potential secret pattern | Review recommended - PR can proceed |
Check the workflow run logs for details.
Verified secrets are confirmed active by TruffleHog. Unverified secrets match known patterns but couldn't be validated.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR appears to be a “merge main → develop” sync that bumps the build version to the next snapshot, updates documentation to reference the latest released artifacts, and refreshes the checked-in Javadoc site for the 2.1.0 API.
Changes:
- Bump project version to
2.2-SNAPSHOTand pin the MarkLogic Spark connector to3.1.0. - Update docs to reference
2.1.0release artifacts and fix a minor typo. - Regenerate/publish Javadoc assets for the
flux-cli 2.1.0API, including a new deprecated list page and newStructuredDataImporterAPI docs.
Reviewed changes
Copilot reviewed 97 out of 98 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| gradle.properties | Bumps Flux snapshot version and pins connector version to a release. |
| docs/spark-integration.md | Updates Spark-submit examples to reference the 2.1.0 “all” jar. |
| docs/import/import-files/archives.md | Fixes a typo (“ready” → “read”). |
| docs/import/embedder/embedding-query.md | Updates referenced embedder JAR version to 2.1.0. |
| docs/import/embedder/embedder.md | Updates referenced embedder JAR versions to 2.1.0. |
| docs/getting-started.md | Updates referenced Flux zip/directory name to 2.1.0. |
| docs/assets/javadoc/type-search-index.js | Regenerated Javadoc search index (includes new API types). |
| docs/assets/javadoc/serialized-form.html | Regenerated Javadoc HTML for 2.1.0 API (adds “Deprecated” nav link). |
| docs/assets/javadoc/overview-tree.html | Regenerated Javadoc class hierarchy for 2.1.0 API (includes new structured importer hierarchy). |
| docs/assets/javadoc/index.html | Regenerated Javadoc index title/version to 2.1.0. |
| docs/assets/javadoc/index-all.html | Regenerated Javadoc symbol index (adds deprecation blocks + new API entries). |
| docs/assets/javadoc/help-doc.html | Regenerated Javadoc help (adds deprecated API section). |
| docs/assets/javadoc/deprecated-list.html | New Javadoc “Deprecated API” page for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/package-tree.html | Regenerated package tree page (adds Deprecated link + structured importer hierarchy). |
| docs/assets/javadoc/com/marklogic/flux/api/package-summary.html | Regenerated package summary (adds Deprecated link + new API types). |
| docs/assets/javadoc/com/marklogic/flux/api/WriteStructuredDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/WriteSparkFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/WriteFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/WriteDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/TdeOptions.html | Regenerated Javadoc and includes new includeIncrementalWriteColumns() method docs. |
| docs/assets/javadoc/com/marklogic/flux/api/StructuredDataImporter.html | New Javadoc page documenting StructuredDataImporter. |
| docs/assets/javadoc/com/marklogic/flux/api/StructuredDataImporter.GroupByOptions.html | New Javadoc page documenting StructuredDataImporter.GroupByOptions. |
| docs/assets/javadoc/com/marklogic/flux/api/SslHostnameVerifier.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/SplitterOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/SplitterOptions.ChunkDocumentType.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/SaveMode.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/Reprocessor.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/Reprocessor.WriteOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/Reprocessor.ReadOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ReadTabularFilesOptions.html | Regenerated Javadoc (adds drop(...) + marks older group/aggregate APIs deprecated). |
| docs/assets/javadoc/com/marklogic/flux/api/ReadRowsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ReadFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ReadDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesImporter.WriteTriplesDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesImporter.ReadRdfFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesExporter.WriteRdfFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/RdfFilesExporter.ReadTriplesDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ParquetFilesImporter.html | Regenerated Javadoc (now extends StructuredDataImporter). |
| docs/assets/javadoc/com/marklogic/flux/api/ParquetFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/OrcFilesImporter.html | Regenerated Javadoc (now extends StructuredDataImporter). |
| docs/assets/javadoc/com/marklogic/flux/api/OrcFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/MlcpArchiveFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/MlcpArchiveFilesImporter.ReadMlcpArchiveFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/JsonLinesFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/JsonLinesFilesExporter.WriteJsonLinesFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/JdbcOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/JdbcImporter.html | Regenerated Javadoc (now extends StructuredDataImporter). |
| docs/assets/javadoc/com/marklogic/flux/api/JdbcImporter.ReadJdbcOptions.html | Regenerated Javadoc (adds drop(...) + deprecations). |
| docs/assets/javadoc/com/marklogic/flux/api/JdbcExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/JdbcExporter.WriteRowsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/GenericFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/GenericFilesImporter.WriteGenericDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/GenericFilesImporter.ReadGenericFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/GenericFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/GenericFilesExporter.WriteGenericFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/FluxException.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/Flux.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/Executor.html | Regenerated Javadoc (lists StructuredDataImporter as a subinterface). |
| docs/assets/javadoc/com/marklogic/flux/api/EmbedderOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DocumentType.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DocumentCopier.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DocumentCopier.CopyWriteDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DocumentCopier.CopyReadDocumentsOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DelimitedFilesImporter.html | Regenerated Javadoc (now extends StructuredDataImporter). |
| docs/assets/javadoc/com/marklogic/flux/api/DelimitedFilesImporter.ReadDelimitedFilesOptions.html | Regenerated Javadoc (adds drop(...) + deprecations). |
| docs/assets/javadoc/com/marklogic/flux/api/DelimitedFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/DelimitedFilesExporter.WriteDelimitedFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CustomRowsExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CustomImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CustomImporter.CustomReadOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CustomExportWriteOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CustomDocumentsExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ConnectionOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/CompressionType.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ClassifierOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AzureStorageType.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AzureStorageOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AvroFilesImporter.html | Regenerated Javadoc (now extends StructuredDataImporter). |
| docs/assets/javadoc/com/marklogic/flux/api/AvroFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AuthenticationType.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesImporter.WriteArchiveDocumentsOptions.html | Regenerated Javadoc (adds streamingTransformBinaryWithExtension(...) docs). |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesImporter.ReadArchiveFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesExporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesExporter.WriteArchiveFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/ArchiveFilesExporter.ReadArchiveDocumentOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AggregateXmlFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AggregateXmlFilesImporter.ReadXmlFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AggregateJsonFilesImporter.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/com/marklogic/flux/api/AggregateJsonFilesImporter.ReadJsonFilesOptions.html | Regenerated Javadoc page header/nav for 2.1.0. |
| docs/assets/javadoc/allpackages-index.html | Regenerated Javadoc package index (adds Deprecated link). |
| docs/assets/javadoc/allclasses-index.html | Regenerated Javadoc class index (adds new API types). |
| CONTRIBUTING.md | Updates spark-submit example jar names to match 2.2-SNAPSHOT. |
| .copyrightconfig | Adds *.html to excluded files. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+38
to
40
| To use Flux with `spark-submit`, first download the `marklogic-flux-2.1.0-all.jar` file from the | ||
| [GitHub release page](https://github.com/marklogic/flux/releases/tag/2.0.0). This jar file includes Flux and all of | ||
| its dependencies, excluding those of Spark itself, which will be provided via the Spark cluster that you connect to |
| # 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/*, *.yml, *.gradle, gradlew, gradlew.bat, *.json, *.xml, *.txt, **/test/resources/**, docs/**, flux-cli/hadoop/*, CODEOWNERS, *.properties, *.md, *.xqy, *version, *.lock | ||
| filesexcluded: .github/*, README.md, CONTRIBUTING.md, Jenkinsfile, gradle/*, *.yml, *.gradle, gradlew, gradlew.bat, *.json, *.xml, *.txt, **/test/resources/**, docs/**, flux-cli/hadoop/*, CODEOWNERS, *.properties, *.md, *.xqy, *version, *.lock, *.html |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.