Skip to content

Commit e5f10aa

Browse files
authored
Merge pull request #1924 from marklogic/feature/update-develop
MLE-27841 Merge master into develop, bump to 8.2-SNAPSHOT
2 parents b0eca28 + 0e194ca commit e5f10aa

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

NOTICE.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Progress MarkLogic Java Client
1+
Progress MarkLogic Java Client 8.1.0
22

33
Portions of the Products include certain open source and commercial third-party
44
components listed below ("Third-Party Components"). The authors of the
@@ -71,9 +71,9 @@ conditions:
7171

7272
(1) Apache License 2.0:
7373

74-
Progress MarkLogic Java Client incorporates Jetbrains annotations
75-
13.0, OkHttp 5.3.2, OkHttp Logging Interceptor 5.3.2, Zero-allocation Hashing
76-
2026.0, jackson-annotations 2.21, jackson-bom 2.21.1, jackson-core 2.21.1,
74+
Progress MarkLogic Java Client 8.1.0 incorporates Jetbrains annotations 13.0,
75+
OkHttp 5.3.2, OkHttp Logging Interceptor 5.3.2, Zero-allocation Hashing 2026.0,
76+
jackson-annotations 2.21, jackson-bom 2.21.1, jackson-core 2.21.1,
7777
jackson-databind 2.21.1, jackson-dataformat-csv 2.21.1, jackson-dataformat-yaml
7878
2.21.1, jackson-module-kotlin 2.21.1, java-json-canonicalization 1.1,
7979
kotlin-reflect 2.1.21, okhttp-digest 3.1.1, and squareokio 3.16.4.
@@ -386,7 +386,7 @@ Contents of NOTICE text file for jackson-module-kotlin 2.21.1:
386386

387387
(2) BSD 3-Clause "New" or "Revised" License:
388388

389-
Progress MarkLogic Java Client incorporates Jakarta Activation 2.0.1.
389+
Progress MarkLogic Java Client 8.1.0 incorporates Jakarta Activation 2.0.1.
390390

391391
Copyright (c) , Oracle and/or its affiliates All rights reserved.
392392

@@ -421,9 +421,9 @@ Progress MarkLogic Java Client incorporates Jakarta Activation 2.0.1.
421421

422422
(3) Eclipse Distribution License - v 1.0:
423423

424-
Progress MarkLogic Java Client incorporates Angus Activation
425-
Registries 2.0.3, JAXB CORE 4.0.6, JAXB Runtime 4.0.6, Jakarta Activation API
426-
2.1.4, TXW2 Runtime 4.0.6, istack common utility code runtime 4.1.2, and
424+
Progress MarkLogic Java Client 8.1.0 incorporates Angus Activation Registries
425+
2.0.3, JAXB CORE 4.0.6, JAXB Runtime 4.0.6, Jakarta Activation API 2.1.4, TXW2
426+
Runtime 4.0.6, istack common utility code runtime 4.1.2, and
427427
jakarta.xml.bind:jakarta.xml.bind-api 4.0.5.
428428

429429
Eclipse Distribution License - v 1.0
@@ -462,7 +462,7 @@ jakarta.xml.bind:jakarta.xml.bind-api 4.0.5.
462462

463463
(4) Eclipse Public License 2.0:
464464

465-
Progress MarkLogic Java Client incorporates Jakarta Mail 2.0.2.
465+
Progress MarkLogic Java Client 8.1.0 incorporates Jakarta Mail 2.0.2.
466466

467467
Eclipse Public License - v 2.0
468468
==============================
@@ -736,7 +736,7 @@ Progress MarkLogic Java Client incorporates Jakarta Mail 2.0.2.
736736

737737
(5) MIT License:
738738

739-
Progress MarkLogic Java Client incorporates SLF4J API Module 2.0.17.
739+
Progress MarkLogic Java Client 8.1.0 incorporates SLF4J API Module 2.0.17.
740740

741741
The MIT License
742742
===============

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=com.marklogic
2-
version=8.1-SNAPSHOT
2+
version=8.2-SNAPSHOT
33
publishUrl=file:../marklogic-java/releases
44

55
okhttpVersion=5.3.2

0 commit comments

Comments
 (0)