Skip to content

Commit 94076df

Browse files
committed
Updated NOTICE file for 2.6.0
Also bumped reference to version in docs. Will bump actual version on release branch.
1 parent 63b4d09 commit 94076df

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

NOTICE.txt

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@ Third Party Notices
1313
jackson-dataformat-xml 2.15.2 (Apache-2.0)
1414
jdom2 2.0.6.1 (Apache-2.0)
1515
jena-arq 4.10.0 (Apache-2.0)
16-
langchain4j 0.35.0 (Apache-2.0)
16+
langchain4j 1.0.0-beta2 (Apache-2.0)
1717
marklogic-client-api 7.1.0 (Apache-2.0)
1818
okhttp 4.12.0 (Apache-2.0)
19+
Semaphore-CS-Client 5.6.1 (Apache-2.0)
20+
Semaphore-Cloud-Client 5.6.1 (Apache-2.0)
21+
tika-core 3.1.0 (Apache-2.0)
1922

2023
Common Licenses
2124

2225
Apache License 2.0 (Apache-2.0)
2326

2427
Third-Party Components
2528

26-
The following is a list of the third-party components used by the MarkLogic® Spark connector 2.5.1 (last updated January 7, 2025):
29+
The following is a list of the third-party components used by the MarkLogic® Spark connector 2.6.0 (last updated May 1, 2025):
2730

2831
jackson-dataformat-xml 2.15.2 (Apache-2.0)
2932
https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/
@@ -37,7 +40,7 @@ jena-arq 4.10.0 (Apache-2.0)
3740
https://repo1.maven.org/maven2/org/apache/jena/jena-arq/
3841
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
3942

40-
langchain4j 0.35.0 (Apache-2.0)
43+
langchain4j 1.0.0-beta2 (Apache-2.0)
4144
https://repo1.maven.org/maven2/dev/langchain4j/langchain4j/
4245
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
4346

@@ -49,10 +52,21 @@ okhttp 4.12.0 (Apache-2.0)
4952
https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp/
5053
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
5154

55+
Semaphore-CS-Client 5.6.1 (Apache-2.0)
56+
https://repo1.maven.org/maven2/com/smartlogic/csclient/Semaphore-CS-Client/
57+
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
58+
59+
Semaphore-CS-Client 5.6.1 (Apache-2.0)
60+
https://repo1.maven.org/maven2/com/smartlogic/cloud/Semaphore-Cloud-Client/
61+
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
62+
63+
tika-core 3.1.0 (Apache-2.0)
64+
https://repo1.maven.org/maven2/org/apache/tika/tika-core/
65+
For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
5266

5367
Common Licenses
5468

55-
The following is a list of the third-party components used by the MarkLogic® Spark connector 2.5.1 (last updated January 7, 2025):
69+
The following is a list of the third-party components used by the MarkLogic® Spark connector 2.6.0 (last updated May 1, 2025):
5670

5771
Apache License 2.0 (Apache-2.0)
5872
https://spdx.org/licenses/Apache-2.0.html

docs/getting-started/jupyter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ connector and also to initialize Spark:
3232

3333
```
3434
import os
35-
os.environ['PYSPARK_SUBMIT_ARGS'] = '--jars "/path/to/marklogic-spark-connector-2.5.1.jar" pyspark-shell'
35+
os.environ['PYSPARK_SUBMIT_ARGS'] = '--jars "/path/to/marklogic-spark-connector-2.6.0.jar" pyspark-shell'
3636
3737
from pyspark.sql import SparkSession
3838
spark = SparkSession.builder.master("local[*]").appName('My Notebook').getOrCreate()
3939
spark.sparkContext.setLogLevel("WARN")
4040
spark
4141
```
4242

43-
The path of `/path/to/marklogic-spark-connector-2.5.1.jar` should be changed to match the location of the connector
43+
The path of `/path/to/marklogic-spark-connector-2.6.0.jar` should be changed to match the location of the connector
4444
jar on your filesystem. You are free to customize the `spark` variable in any manner you see fit as well.
4545

4646
Now that you have an initialized Spark session, you can run any of the examples found in the

docs/getting-started/pyspark.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ shell by pressing `ctrl-D`.
3030

3131
Run PySpark from the directory that you downloaded the connector to per the [setup instructions](setup.md):
3232

33-
pyspark --jars marklogic-spark-connector-2.5.1.jar
33+
pyspark --jars marklogic-spark-connector-2.6.0.jar
3434

3535
The `--jars` command line option is PySpark's method for utilizing Spark connectors. Each Spark environment should have
3636
a similar mechanism for including third party connectors; please see the documentation for your particular Spark

docs/getting-started/setup.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ have an instance of MarkLogic running, you can skip step 4 below, but ensure tha
3131
extracted directory contains valid connection properties for your instance of MarkLogic.
3232

3333
1. From [this repository's Releases page](https://github.com/marklogic/marklogic-spark-connector/releases), select
34-
the latest release and download the `marklogic-spark-getting-started-2.5.1.zip` file.
34+
the latest release and download the `marklogic-spark-getting-started-2.6.0.zip` file.
3535
2. Extract the contents of the downloaded zip file.
3636
3. Open a terminal window and go to the directory created by extracting the zip file; the directory should have a
37-
name of "marklogic-spark-getting-started-2.5.1".
37+
name of "marklogic-spark-getting-started-2.6.0".
3838
4. Run `docker-compose up -d` to start an instance of MarkLogic
3939
5. Ensure that the `./gradlew` file is executable; depending on your operating system, you may need to run
4040
`chmod 755 gradlew` to make the file executable.

examples/entity-aggregation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88

99
dependencies {
1010
implementation 'org.apache.spark:spark-sql_2.12:3.5.5'
11-
implementation "com.marklogic:marklogic-spark-connector:2.5.1"
11+
implementation "com.marklogic:marklogic-spark-connector:2.6.0"
1212
implementation "org.postgresql:postgresql:42.7.4"
1313
}
1414

examples/getting-started/marklogic-spark-getting-started.ipynb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"source": [
1010
"# Make the MarkLogic connector available to the underlying PySpark application.\n",
1111
"import os\n",
12-
"os.environ['PYSPARK_SUBMIT_ARGS'] = '--jars \"marklogic-spark-connector-2.5.1.jar\" pyspark-shell'\n",
12+
"os.environ['PYSPARK_SUBMIT_ARGS'] = '--jars \"marklogic-spark-connector-2.6.0.jar\" pyspark-shell'\n",
1313
"\n",
1414
"# Define the connection details for the getting-started example application.\n",
1515
"client_uri = \"spark-example-user:password@localhost:8003\"\n",
@@ -64,9 +64,9 @@
6464
"metadata": {},
6565
"outputs": [],
6666
"source": [
67-
"# Group employees by State and then calculate the max base salary across each department, sorting on \n",
68-
"# the max base salary in the Engineering department. Then plot the data by converting the Spark DataFrame to \n",
69-
"# a pandas DataFrame - https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.plot.html . \n",
67+
"# Group employees by State and then calculate the max base salary across each department, sorting on\n",
68+
"# the max base salary in the Engineering department. Then plot the data by converting the Spark DataFrame to\n",
69+
"# a pandas DataFrame - https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.plot.html .\n",
7070
"\n",
7171
"from pyspark.sql.functions import desc\n",
7272
"df.groupBy(\"State\") \\\n",

examples/java-dependency/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88

99
dependencies {
1010
implementation 'org.apache.spark:spark-sql_2.12:3.5.5'
11-
implementation 'com.marklogic:marklogic-spark-connector:2.5.1'
11+
implementation 'com.marklogic:marklogic-spark-connector:2.6.0'
1212
}
1313

1414
task runApp(type: JavaExec) {

0 commit comments

Comments
 (0)