Bumped to 1.1.0

Bumped connector dependency to 2.4.0. Fixed a few issues in the NOTICE file.

Author: rjrudin

CONTRIBUTING.md

@@ -256,15 +256,15 @@ are all synonyms):
 
     ./gradlew shadowJar
 
-This will produce an assembly jar at `./flux-cli/build/libs/marklogic-flux-1.0.0-all.jar`.
+This will produce an assembly jar at `./flux-cli/build/libs/marklogic-flux-1.1.0-all.jar`.
 
 You can now run any CLI command via spark-submit. This is an example of previewing an import of files - change the value
 of `--path`, as an absolute path is needed, and of course change the value of `--master` to match that of your Spark
 cluster:
 
 ```
 $SPARK_HOME/bin/spark-submit --class com.marklogic.flux.spark.Submit \
---master spark://NYWHYC3G0W:7077 flux-cli/build/libs/marklogic-flux-1.1.0-SNAPSHOT-all.jar \
+--master spark://NYWHYC3G0W:7077 flux-cli/build/libs/marklogic-flux-1.1.0-all.jar \
 import-files --path /Users/rudin/workspace/flux/flux-cli/src/test/resources/mixed-files \
 --connection-string "admin:admin@localhost:8000" \
 --preview 5 --preview-drop content
@@ -281,7 +281,7 @@ to something you can access):
 $SPARK_HOME/bin/spark-submit --class com.marklogic.flux.spark.Submit \
 --packages org.apache.hadoop:hadoop-aws:3.3.4,org.apache.hadoop:hadoop-client:3.3.4 \
 --master spark://NYWHYC3G0W:7077 \
-flux-cli/build/libs/marklogic-flux-1.1.0-SNAPSHOT-all.jar \
+flux-cli/build/libs/marklogic-flux-1.1.0-all.jar \
 import-files --path "s3a://changeme/" \
 --connection-string "admin:admin@localhost:8000" \
 --s3-add-credentials \

NOTICE.txt

@@ -6,13 +6,13 @@ To the extent required by the applicable open-source license, a complete machine
 
 Third Party Notices
 
-aws-java-sdk-s3 1.12.367 (Apache-2.0)
-hadoop-aws 3.3.6 (Apache-2.0)
-hadoop-client 3.3.6 (Apache-2.0)
-marklogic-spark-connector 2.3.0 (Apache-2.0)
+aws-java-sdk-s3 1.12.262 (Apache-2.0)
+hadoop-aws 3.3.4 (Apache-2.0)
+hadoop-client 3.3.4 (Apache-2.0)
+marklogic-spark-connector 2.4.0 (Apache-2.0)
 picocli 4.7.6 (Apache-2.0)
-spark-avro_2.12 3.4.3 (Apache-2.0)
-spark-sql_2.12 3.4.3 (Apache-2.0)
+spark-avro_2.12 3.5.3 (Apache-2.0)
+spark-sql_2.12 3.5.3 (Apache-2.0)
 
 Common Licenses
 
@@ -22,32 +22,32 @@ Third-Party Components
 
 The following is a list of the third-party components used by MarkLogic® Flux™ v1 (last updated July 2, 2024):
 
-aws-java-sdk-s3 1.12.367 (Apache-2.0)
+aws-java-sdk-s3 1.12.262 (Apache-2.0)
 https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-s3
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
 
-hadoop-aws 3.3.6 (Apache-2.0)
+hadoop-aws 3.3.4 (Apache-2.0)
 https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-aws
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-hadoop-client 3.3.6 (Apache-2.0)
+hadoop-client 3.3.4 (Apache-2.0)
 https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-client
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-marklogic-spark-connector 2.3 (Apache-2.0)
+marklogic-spark-connector 2.34.0(Apache-2.0)
 https://repo1.maven.org/maven2/com/marklogic/marklogic-spark-connector
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
 picocli 4.7.6 (Apache-2.0)
 https://repo1.maven.org/maven2/info/picocli/picocli
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-spark-avro_2.12 3.4.3 (Apache-2.0)
+spark-avro_2.12 3.5.3 (Apache-2.0)
 https://repo1.maven.org/maven2/org/apache/spark/spark-avro_2.12
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-spark-sql_2.12 3.4.3 (Apache-2.0)
+spark-sql_2.12 3.5.3 (Apache-2.0)
 https://repo1.maven.org/maven2/org/apache/spark/spark-sql_2.12
 For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 

build.gradle

@@ -10,10 +10,10 @@ subprojects {
 
   repositories {
     mavenCentral()
-    mavenLocal()
-    maven {
-      url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
-    }
+//    mavenLocal()
+//    maven {
+//      url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+//    }
   }
 
   test {

docs/api.md

@@ -22,15 +22,15 @@ To add Flux as a dependency to your application, add the following to your Maven
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>flux-api</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 </dependency>
 ```
 
 Or if you are using Gradle, add the following to your `build.gradle` file:
 
 ```
 dependencies {
-  implementation "com.marklogic:flux-api:1.0.0"
+  implementation "com.marklogic:flux-api:1.1.0"
 }
 ```
 
@@ -97,7 +97,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "com.marklogic:flux-api:1.0.0"
+    classpath "com.marklogic:flux-api:1.1.0"
   }
 }
 ```
@@ -139,7 +139,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath "com.marklogic:flux-api:1.0.0"
+    classpath "com.marklogic:flux-api:1.1.0"
     classpath("com.marklogic:ml-gradle:4.8.0") {
       exclude group: "com.fasterxml.jackson.databind"
       exclude group: "com.fasterxml.jackson.core"

docs/getting-started.md

@@ -15,18 +15,18 @@ This guide describes how to get started with Flux with some examples demonstrati
 ## Setup
 
 You can download the latest release of the Flux application zip from [the latest Flux release page](https://github.com/marklogic/flux/releases). 
-The Flux application zip is titled `marklogic-flux-1.0.0.zip`. You can extract this zip to any location on your 
+The Flux application zip is titled `marklogic-flux-1.1.0.zip`. You can extract this zip to any location on your 
 filesystem that you prefer.
 
 ### Deploying the example application
 
 The examples in this guide, along with examples found throughout this documentation, depend on a small MarkLogic 
 application that can be deployed to your own instance of MarkLogic server. The application can be downloaded from 
 [the latest Flux release page](https://github.com/marklogic/flux/releases) in a zip titled 
-`marklogic-flux-getting-started-1.0.0.zip`. To use Flux with this example application, perform the following steps:
+`marklogic-flux-getting-started-1.1.0.zip`. To use Flux with this example application, perform the following steps:
 
-1. Extract the `marklogic-flux-getting-started-1.0.0.zip` file to any location on your local filesystem.
-2. Run `cd marklogic-flux-getting-started-1.0.0` to change to the directory created by extracting the ZIP file.
+1. Extract the `marklogic-flux-getting-started-1.1.0.zip` file to any location on your local filesystem.
+2. Run `cd marklogic-flux-getting-started-1.1.0` to change to the directory created by extracting the ZIP file.
 3. Create a file named `gradle-local.properties` and add `mlPassword=your MarkLogic admin user password` to it.
 4. Examine the contents of the `gradle.properties` file to ensure that the value of `mlHost` points to your MarkLogic 
 server and that the value of `mlRestPort` is a port available for a new MarkLogic app server to use.
@@ -38,15 +38,15 @@ privileges for running the examples in this guide. Finally, the application incl
 [MarkLogic TDE template](https://docs.marklogic.com/guide/app-dev/TDE) that creates a view in MarkLogic for the purpose
 of demonstrating commands that utilize a [MarkLogic Optic query](https://docs.marklogic.com/guide/app-dev/OpticAPI).
 
-It is recommended to extract the Flux application zip into the `marklogic-flux-getting-started-1.0.0` directory so that 
+It is recommended to extract the Flux application zip into the `marklogic-flux-getting-started-1.1.0` directory so that 
 you can easily execute the examples in this guide. After extracting the application zip, the directory should have a 
 structure similar to this (not all files may be shown):
 
 ```
-./marklogic-flux-getting-started-1.0.0
+./marklogic-flux-getting-started-1.1.0
     build.gradle
     ./data
-    ./marklogic-flux-1.0.0
+    ./marklogic-flux-1.1.0
     ./gradle
     gradle.properties
     gradlew
@@ -59,7 +59,7 @@ structure similar to this (not all files may be shown):
 You can run Flux without any options to see the list of available commands. If you are using Flux to run these examples, 
 first change your current directory to where you extract Flux:
 
-    cd marklogic-flux-1.0.0
+    cd marklogic-flux-1.1.0
 
 And then run the Flux executable without any options:
 

docs/spark-integration.md

@@ -15,7 +15,7 @@ require more system resources than what are available when running Flux as a com
 
 ## Spark security notice
 
-As of August 2024 and the Flux 1.0.0 release, all public releases of Apache Spark 3.4.x through 3.5.1 depend on 
+As of October 2024 and the Flux 1.1.0 release, all public releases of Apache Spark 3.4.x through 3.5.3 depend on 
 Apache Hadoop 3.3.4. This version of Hadoop has a 
 [CVE filed against it](https://nvd.nist.gov/vuln/detail/CVE-2023-26031). The CVE involves Spark running with a 
 YARN cluster manager and the YARN cluster "is accepting work from remote (authenticated) users". 
@@ -35,8 +35,8 @@ Flux integrates with [spark-submit](https://spark.apache.org/docs/latest/submitt
 submit a Flux command invocation to a remote Spark cluster. Every Flux command is a Spark application, and thus every
 Flux command, along with all of its option, can be invoked via `spark-submit`. 
 
-To use Flux with `spark-submit`, first download the `marklogic-flux-1.0.0-all.jar` file from the 
-[GitHub release page](https://github.com/marklogic/flux/releases/tag/1.0.0). This jar file includes Flux and all of 
+To use Flux with `spark-submit`, first download the `marklogic-flux-1.1.0-all.jar` file from the 
+[GitHub release page](https://github.com/marklogic/flux/releases/tag/1.1.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 
 via `spark-submit`. 
 
@@ -48,7 +48,7 @@ The following shows a notional example of running the Flux `import-files` comman
 ```
 $SPARK_HOME/bin/spark-submit --class com.marklogic.flux.spark.Submit \
     --master spark://changeme:7077 \
-    marklogic-flux-1.0.0-all.jar \
+    marklogic-flux-1.1.0-all.jar \
     import-files \
     --path path/to/data \
     --connection-string user:password@host:8000 \
@@ -59,7 +59,7 @@ $SPARK_HOME/bin/spark-submit --class com.marklogic.flux.spark.Submit \
 ```
 $SPARK_HOME\bin\spark-submit --class com.marklogic.flux.spark.Submit ^
     --master spark://changeme:7077 ^
-    marklogic-flux-1.0.0-all.jar ^
+    marklogic-flux-1.1.0-all.jar ^
     import-files ^
     --path path/to/data ^
     --connection-string user:password@host:8000 ^

examples/client-project/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     mavenLocal()
   }
   dependencies {
-    classpath "com.marklogic:flux-api:1.0.0"
+    classpath "com.marklogic:flux-api:1.1.0"
 
     // Demonstrates removing the Jackson libraries that otherwise cause a conflict with
     // Spark, which requires Jackson >= 2.14.0 and < 2.15.0.
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-  implementation "com.marklogic:flux-api:1.0.0"
+  implementation "com.marklogic:flux-api:1.1.0"
 }
 
 tasks.register("runApp", JavaExec) {

flux-cli/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     // The rocksdbjni dependency weighs in at 50mb and so far does not appear necessary for our use of Spark.
     exclude module: "rocksdbjni"
   }
-  implementation "com.marklogic:marklogic-spark-connector:2.4-SNAPSHOT"
+  implementation "com.marklogic:marklogic-spark-connector:2.4.0"
   implementation "info.picocli:picocli:4.7.6"
 
   // Spark 3.4.3 depends on Hadoop 3.3.4, which depends on AWS SDK 1.12.262. As of August 2024, all public releases of
@@ -75,7 +75,7 @@ dependencies {
   // Forcing HttpClient to use this to address https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518 .
   testImplementation 'commons-codec:commons-codec:1.17.1'
 
-  shadowDependencies "com.marklogic:marklogic-spark-connector:2.4-SNAPSHOT"
+  shadowDependencies "com.marklogic:marklogic-spark-connector:2.4.0"
   shadowDependencies "info.picocli:picocli:4.7.6"
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-version=1.1.0-SNAPSHOT
+version=1.1.0
 
 # Define these on the command line to publish to OSSRH
 # See https://central.sonatype.org/publish/publish-gradle/#credentials for more information