From 0219b61e31b5fd61a0d4d64dfcc8a67395a944ec Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 19 Aug 2024 08:31:15 -0400 Subject: [PATCH] Added more "since" annotations and README content on JAXB Updated NOTICE and two test-related dependencies to patch releases. --- NOTICE.txt | 911 +++++++++--------- README.md | 43 + examples/build.gradle | 2 +- .../client/expression/PlanBuilder.java | 1 + .../client/expression/PlanBuilderBase.java | 1 + .../marklogic/client/expression/VecExpr.java | 2 + .../client/type/PlanSearchOptions.java | 4 +- pom.xml | 11 +- test-app/build.gradle | 4 +- 9 files changed, 509 insertions(+), 470 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 87914076f..18060a760 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,264 +1,360 @@ -MarkLogic® Java Client API +MarkLogic® for Java Client API Copyright © 2024 MarkLogic Corporation. All Rights Reserved. -To the extent required by the applicable open-source license, a complete machine-readable copy of the source code -corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and -shall expire three years following the date of the final distribution of this product version by -Progress Software Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. -Please specify the product and version for which you are requesting source code. +This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by MarkLogic Corporation. To obtain such source code, send an email to Legal-thirdpartyreview@progress.com. Please specify the product and version for which you are requesting source code. + +The following software may be included in this project (last updated October 3, 2023): ------------------------------------------------------------------------- Third Party Components + commons-io 2.11.0 (Apache-2.0) + commons-lang3 3.14.0 (Apache-2.0) + dom4j 2.1.4 (BSD) + gson 2.10.1 (Apache-2.0) + htmlcleaner 2.29 (BSD) + httpclient 4.5.14 (Apache-2.0) + jackson-annotations 2.17.2 (Apache-2.0) + jackson-core 2.17.2 (Apache-2.0) + jackson-databind 2.17.2 (Apache-2.0) + jackson-dataformat-csv 2.17.2 (Apache-2.0) + jackson-module-kotlin 2.17.2 (Apache-2.0) + jakarta.mail 2.0.1 (CDDL-1.1) + javax.ws.rs-api 2.1.1 (CDDL-1.1) + jakarta.xml.bind-api 3.0.1 (CDDL-1.1) + jaxb-core 3.0.2 (CDDL-1.1) + jaxb-runtime 3.0.2 (CDDL-1.1) + jdom2 2.0.6.1 (BSD) + json-schema-validator 1.0.88 (Apache-2.0) + jsonassert 1.5.1 (Apache-2.0) + kotlin-stdlib 1.8.22 (Apache-2.0) + logback-classic 1.3.14 (EPL-1.0) + logging-interceptor 4.12.0 (Apache-2.0) + okhttp 4.12.0 (Apache-2.0) + okhttp-digest 2.7 (Apache-2.0) + okio 3.6.0 (Apache-2.0) + opencsv 4.6 (Apache-2.0) + slf4j-api 1.7.36 (MIT) + spring-jdbc 5.3.39 (Apache-2.0) + undertow-core 2.2.32.Final (Apache-2.0) + undertow-servlet 2.2.32.Final (Apache-2.0) + +Common Licenses + Apache License 2.0 (Apache-2.0) + Common Development and Distribution License 1.1 (CDDL-1.1) + Eclipse Public License 1.0 (EPL-1.0) + + +----------------------------------------- +Third-Party Components + The following is a list of the third-party components used by MarkLogic for Java Client API. + +commons-io 2.11.0 (Apache-2.0) + + https://repo1.maven.org/maven2/commons-io/commons-io + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +commons-lang3 3.14.0 (Apache-2.0) + + https://repo1.maven.org/maven2/org/apache/commons/commons-lang3 + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +dom4j 2.1.4 (BSD) + + https://repo1.maven.org/maven2/org/dom4j/dom4j + + Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved. +Redistribution and use of this software and associated documentation +("Software"), with or without modification, are permitted provided +that the following conditions are met: +1. Redistributions of source code must retain copyright + statements and notices. Redistributions must also contain a + copy of this document. +2. Redistributions in binary form must reproduce the + above copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. +3. The name "DOM4J" must not be used to endorse or promote + products derived from this Software without prior written + permission of MetaStuff, Ltd. For written permission, + please contact dom4j-info@metastuff.com. +4. Products derived from this Software may not be called "DOM4J" + nor may "DOM4J" appear in their names without prior written + permission of MetaStuff, Ltd. DOM4J is a registered + trademark of MetaStuff, Ltd. +5. Due credit should be given to the DOM4J Project - https://dom4j.github.io/ +THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS +“AS IS” AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +gson 2.10.1 (Apache-2.0) + + https://repo1.maven.org/maven2/com/google/code/gson/gson + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +htmlcleaner 2.29 (BSD) + + https://repo1.maven.org/maven2/net/sourceforge/htmlcleaner/htmlcleaner + + Copyright (c) 2006-2023, the HTMLCleaner project All rights reserved. Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +* The name of HtmlCleaner may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Report any issues and contact the developers through Sourceforge at https://sourceforge.net/projects/htmlcleaner/ + +httpclient 4.5.14 (Apache-2.0) + + https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jackson-annotations 2.17.2 (Apache-2.0) + + https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jackson-core 2.17.2 (Apache-2.0) + + https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jackson-databind 2.17.2 (Apache-2.0) + + https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jackson-dataformat-csv 2.17.2 (Apache-2.0) + + https://repo1.maven.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-csv + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jackson-module-kotlin 2.17.2 (Apache-2.0) + + https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin + + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) + +jakarta.mail 2.0.1 (CDDL-1.1) + + https://repo1.maven.org/maven2/com/sun/mail/jakarta.mail + + For the full text of the CDDL-1.1 license, see Common Development and Distribution License 1.1 (CDDL-1.1) + +javax.ws.rs-api 2.1.1 (CDDL-1.1) + + https://repo1.maven.org/maven2/javax/ws/rs/javax.ws.rs-api + + For the full text of the CDDL-1.1 license, see Common Development and Distribution License 1.1 (CDDL-1.1) + +jakarta.xml.bind-api 3.0.1 (CDDL-1.1) + + https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api + + + For the full text of the CDDL-1.1 license, see Common Development and Distribution License 1.1 (CDDL-1.1) + +jaxb-core 3.0.2 (CDDL-1.1) + + https://repo1.maven.org/maven2/org/glassfish/jaxb/jaxb-core + + For the full text of the CDDL-1.1 license, see Common Development and Distribution License 1.1 (CDDL-1.1) + +jaxb-runtime 3.0.2 (CDDL-1.1) + + https://repo1.maven.org/maven2/org/glassfish/jaxb/jaxb-runtime + + For the full text of the CDDL-1.1 license, see Common Development and Distribution License 1.1 (CDDL-1.1) + +jdom2 2.0.6.1 (BSD) -Apache Commons BeanUtils™ 1.9.4 -Attribution Statements -https://commons.apache.org/proper/commons-beanutils/ + https://repo1.maven.org/maven2/org/jdom/jdom2 -Copyright Statements -Copyright (C) 2019, Robert Burrell Donkin, Tim O'Brien, Benedikt Ritter, Stian Soiland-Reyes, David Eric Pugh, Morgan James Delagrange, Yoav Shapira, Martin van den Bemt, Craig McClanahan, Gary Gregory, Geir Magnusson Jr., Stephen Colebourne, Scott Sanders, Niall Pemberton, Rob Tompkins, James Strachan, James Carman, John E. Conlon, The Apache Software Foundation, Dion Gillard, Rodney Waldhoff, Simon Kitching + Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin. All rights reserved. +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. +3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact request_AT_jdom_DOT_org. +4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management, please contact request_AT_jdom_DOT_org. +In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: "This product includes software developed by the JDOM Project (http://www.jdom.org/)." Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. +THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter; jhunter_AT_jdom_DOT_org; and Brett McLaughlin brett_AT_jdom_DOT_org. For more information on the JDOM Project, please see http://www.jdom.org. -License Text (http://spdx.org/licenses/Apache-2.0.html) -Made available under the Apache License 2.0. See Appendix for full text. +json-schema-validator 1.0.88 (Apache-2.0) -Source materials are available for download at: https://commons.apache.org/proper/commons-beanutils/ + https://repo1.maven.org/maven2/com/networknt/json-schema-validator -Apache Commons Codec™ 1.16.0 -Attribution Statements -http://commons.apache.org/proper/commons-codec/ + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java -contains test data from http://aspell.net/test/orig/batch0.tab. -Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) +jsonassert 1.5.1 (Apache-2.0) -The content of package org.apache.commons.codec.language.bm has been translated -from the original php source code available at http://stevemorse.org/phoneticinfo.htm -with permission from the original authors. -Original source copyright: -Copyright (c) 2008 Alexander Beider & Stephen P. Morse. + https://repo1.maven.org/maven2/org/skyscreamer/jsonassert -Copyright Statements -Copyright 2002-2016 The Apache Software Foundation + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://spdx.org/licenses/Apache-2.0.html) -Made available under the Apache License 2.0. See Appendix for full text. +kotlin-stdlib 1.8.22 (Apache-2.0) -Source materials are available for download at: https://mvnrepository.com/artifact/commons-codec/commons-codec/1.4 -Apache Commons Collections™ 3.2.1 -Attribution Statements -https://commons.apache.org/proper/commons-collections/ + https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib -Copyright Statements -Copyright 2001-2018 The Apache Software Foundation + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://spdx.org/licenses/Apache-2.0.html) -Made available under the Apache License 2.0. See Appendix for full text. +logback-classic 1.3.14 (EPL-1.0) -Source materials are available for download at: https://mvnrepository.com/artifact/commons-collections/commons-collections + https://repo1.maven.org/maven2/ch/qos/logback/logback-classic -Apache Commons Lang™ 3.12 -Attribution Statements -http://commons.apache.org/proper/commons-lang/ + Logback LICENSE +Logback: the reliable, generic, fast and flexible logging framework. Copyright (C) 1999-2015, QOS.ch. All rights reserved. This program and the accompanying materials are dual-licensed under either the terms of the Eclipse Public License v1.0 as published by the Eclipse Foundation or (per the licensee's choosing) under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. -This product includes software from the Spring Framework, -under the Apache License 2.0 (see: StringUtils.containsWhitespace()) +For the full text of the EPL-1.0 license, see Eclipse Public License 1.0 (EPL-1.0) -Apache Commons Lang may include the following software under license: -JUnit 3.8.1 (EPL-2.0) - Copyright 2015-2019 the original author or authors. +logging-interceptor 4.12.0 (Apache-2.0) -Copyright Statements -Copyright (C) 2017, The Apache Software Foundation + https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor -License Text (http://spdx.org/licenses/Apache-2.0) -Made available under the Apache License 2.0. See Appendix for full text. + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -Source materials are available for download at: https://github.com/apache/commons-lang +okhttp 4.12.0 (Apache-2.0) -Jackson Annotations 2.17.2 -Attribution Statements -http://wiki.fasterxml.com/JacksonHome + https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp -Copyright Statements -Copyright ©2009 FasterXML, LLC + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://spdx.org/licenses/Apache-2.0) -Made available under the Apache License 2.0. See Appendix for full text. +okhttp-digest 2.7 (Apache-2.0) -Jackson Core 2.17.2 -Attribution Statements -http://wiki.fasterxml.com/JacksonHome + https://repo1.maven.org/maven2/io/github/rburgst/okhttp-digest -Copyright Statements -Copyright ©2009 FasterXML, LLC + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://www.apache.org/licenses/LICENSE-2.0.txt) -Made available under the Apache License 2.0. See Appendix for full text. +okio 3.6.0 (Apache-2.0) -Source materials are available for download at: https://github.com/FasterXML/jackson-core + https://repo1.maven.org/maven2/com/squareup/okio/okio -Jackson Databind 2.17.2 -Attribution Statements -http://wiki.fasterxml.com/JacksonHome + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -Jackson Databind may include the following software under license: -cglib 2.2.2 (Apache-2.0) - Copyright 2004 The Apache Software Foundation -Apache Groovy 1.7.9 (Apache-2.0) - Copyright 2003-2019 The Apache Software Foundation -Hibernate-cglib-repack 2.1_3 (LGPL-2.1) - Copyright (c) 2010 Red Hat, Inc. -Jackson Annotations 2.5.0 (Apache-2.0) - Copyright ©2009 FasterXML, LLC -JSR-275 0.9.2 - © 2019, Oracle Corporation and/or its affiliates. +opencsv 4.6 (Apache-2.0) -Copyright Statements -Copyright ©2009 FasterXML, LLC + https://repo1.maven.org/maven2/com/opencsv/opencsv -License Text (http://www.apache.org/licenses/LICENSE-2.0.txt) -Made available under the Apache License 2.0. See Appendix for full text. + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -Source materials are available for download at: https://github.com/FasterXML/jackson-databind -Jackson Dataformat CSV 2.17.2 -Attribution Statements -https://github.com/FasterXML/jackson-dataformat-csv +slf4j-api 1.7.36 (MIT) -Copyright Statements -Copyright ©2009 FasterXML, LLC + https://repo1.maven.org/maven2/org/slf4j/slf4j-api -License Text (http://spdx.org/licenses/Apache-2.0) -Made available under the Apache License 2.0. See Appendix for full text. + Copyright (c) 2004-2023 QOS.ch All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED “AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Source materials are available for download at: https://github.com/FasterXML/jackson-dataformat-csv +spring-jdbc 5.3.39 (Apache-2.0) -javax.ws.rs-api (JAX-RS API) 2.1.1 -Attribution Statements -https://github.com/jax-rs/api + https://repo1.maven.org/maven2/org/springframework/spring-jdbc -Copyright Statements -Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved. + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://www.spdx.org/licenses/CDDL-1.1.html) -Made available under the Common Development and Distribution License 1.1. See Appendix for full text. +undertow-core 2.2.32.Final (Apache-2.0) -Source materials are available for download at: https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -Java™ Architecture for XML Binding (JAXB) 2.3.2 -Attribution Statements -https://javaee.github.io/jaxb-v2/ + https://repo1.maven.org/maven2/io/undertow/undertow-core -Copyright Statements -Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -License Text (http://www.spdx.org/licenses/CDDL-1.1.html) -Made available under the Common Development and Distribution License 1.1. See Appendix for full text. +undertow-servlet 2.2.32.Final (Apache-2.0) -Source materials are available for download at: https://github.com/javaee/jaxb-v2 + https://repo1.maven.org/maven2/io/undertow/undertow-servlet -JDOM 2.0.6 -Attribution Statements -http://www.jdom.org + For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0) -This product includes software developed by the JDOM Project (http://www.jdom.org/). +----------------------------------------- +Common Licenses -Copyright Statements -Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin. All rights reserved. +This section shows the text of common third-party licenses used by MarkLogic for Java Client API. -License Text (https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt) -Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin. - All rights reserved. +Apache License 2.0 (Apache-2.0) +https://spdx.org/licenses/Apache-2.0.html - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. +1. Definitions. - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact . +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management . +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter and - Brett McLaughlin . For more information - on the JDOM Project, please see . +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. -Source materials are available for download at: https://github.com/hunterhacker/jdom/ -Jersey 1.19.3 -Attribution Statements -https://jersey.java.net/ +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. -%% The following software may be included in this product: ASM - Use of any of this software is governed by the terms of the license below: +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). -Copyright (c) 2000-2005 INRIA, France Telecom -All rights reserved. +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - - -%% The following software may be included in this product: Jettison - Use of any of this software is governed by the terms of the license below: - - -Copyright 2006 Envoi Solutions LLC +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 +http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -266,275 +362,172 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Copyright Statements -Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - -License Text (http://www.spdx.org/licenses/CDDL-1.1.html) -Made available under the Common Development and Distribution License 1.1. See Appendix for full text. -Source materials are available for download at: https://github.com/jersey/jersey/ +==================== + + +Common Development and Distribution License 1.1 (CDDL-1.1) +https://spdx.org/licenses/CDDL-1.1.html + +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) +Version 1.1 + +1. Definitions. +1.1. "Contributor" means each individual or entity that creates or contributes to the creation of Modifications. +1.2. "Contributor Version" means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor. +1.3. "Covered Software" means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof. +1.4. "Executable" means the Covered Software in any form other than Source Code. +1.5. "Initial Developer" means the individual or entity that first makes Original Software available under this License. +1.6. "Larger Work" means a work which combines Covered Software or portions thereof with code not governed by the terms of this License. +1.7. "License" means this document. +1.8. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. +1.9. "Modifications" means the Source Code and Executable form of any of the following: +A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications; +B. Any new file that contains any part of the Original Software or previous Modification; or +C. Any new file that is contributed or otherwise made available under the terms of this License. +1.10. "Original Software" means the Source Code and Executable form of computer software code that is originally released under this License. +1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. +1.12. "Source Code" means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code. +1.13. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. +2. License Grants. +2.1. The Initial Developer Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license: +(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof). +(c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License. +(d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices. +2.2. Contributor Grant. +Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license: +(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and +(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination). +(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party. +(d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor. +3. Distribution Obligations. +3.1. Availability of Source Code. +Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange. +3.2. Modifications. +The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License. +3.3. Required Notices. +You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer. +3.4. Application of Additional Terms. +You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer. +3.5. Distribution of Executable Versions. +You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer. +3.6. Larger Works. +You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software. +4. Versions of the License. +4.1. New Versions. +Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License. +4.2. Effect of New Versions. +You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward. +4.3. Modified Versions. +When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License. +5. DISCLAIMER OF WARRANTY. +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +6. TERMINATION. +6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. +6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as "Participant") alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant. +6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. +6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination. +7. LIMITATION OF LIABILITY. +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. +The Covered Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and "commercial computer software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License. + +9. MISCELLANEOUS. +This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. + +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) +The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. + +==================== + +Eclipse Public License 1.0 (EPL-1.0) +https://spdx.org/licenses/EPL-1.0.html + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. + + b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + + c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + + d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +3. REQUIREMENTS +A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: + + a) it complies with the terms and conditions of this Agreement; and + + b) its license agreement: + i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and + iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. + +When the Program is made available in source code form: + + a) it must be made available under this Agreement; and + + b) a copy of this Agreement must be included with each copy of the Program. +Contributors may not remove or alter any copyright notices contained within the Program. + +Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +5. NO WARRANTY +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. + + +==================== + -JSONassert 1.5.0 -Attribution Statements -http://jsonassert.skyscreamer.org/ - -Copyright Statements -Copyright © 2017. All rights reserved. - -License Text (http://spdx.org/licenses/Apache-2.0.html) -Made available under the Apache License 2.0. See Appendix for full text. - -Source materials are available for download at: https://github.com/skyscreamer/JSONassert - -JUnit 4.13.1 -Attribution Statements -https://junit.org/ - -JUnit depends on Java Hamcrest -http://hamcrest.org/JavaHamcrest/ -Copyright (c) 2000-2015 www.hamcrest.org. All rights reserved. -Made available under the MIT License. -https://spdx.org/licenses/MIT.html - -Copyright Statements -Copyright (C) 2021, Kevin Cooney, Stefan Birkner, JUnit, David Saff, Marc Philipp - -License Text (http://spdx.org/licenses/EPL-1.0) -Made available under the Eclipse Public License 1.0. See Appendix for full text. - -Source materials are available for download at: https://github.com/junit-team/junit4 - -okhttp 4.12.0 -Copyright Statements -Copyright (C) 2022, Square, Inc. - -License Text (http://www.apache.org/licenses/LICENSE-2.0.txt) - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -slf4j-api 1.7.36 -License Text (http://www.opensource.org/licenses/mit-license.php) -MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/README.md b/README.md index 346265d20..44dd97d16 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,49 @@ Full documentation is available at: * [Java Application Developer's Guide](http://docs.marklogic.com/guide/java) * [JavaDoc](http://docs.marklogic.com/javadoc/client/index.html) +## Including JAXB support + +As of the 7.0.0 release, the client now depends on the [Jakarta XML Binding](https://eclipse-ee4j.github.io/jaxb-ri/) +API instead of the older [JAXB API](https://docs.oracle.com/javase/tutorial/jaxb/intro/). If you are using Java 11 or +higher, you no longer need to declare additional dependencies in order to use Jakarta XML Binding. If you wish to use +the older JAXB APIs - i.e. those in the `javax.xml.bind` package instead of `jakarta.xml.bind` - you are free to +include those as dependencies in your application; they will not conflict with the 7.0.0 release of the Java Client. + +### JAXB support in 6.x releases and older + +If you are using Java Client 6.x or older and also Java 11 or higher, and you wish to use JAXB with the Java client, +you will need to include JAXB API and implementation dependencies as those are no longer included in Java 11 and higher. + +For Maven, include the following in your pom.xml file: + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + org.glassfish.jaxb + jaxb-core + 2.3.0.1 + + +For Gradle, include the following in your build.gradle file (this can be included in the same `dependencies` block +as the one that includes the marklogic-client-api dependency): + + dependencies { + implementation "javax.xml.bind:jaxb-api:2.3.1" + implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2" + implementation "org.glassfish.jaxb:jaxb-core:2.3.0.1" + } + +You are free to use any implementation of JAXB that you wish, but you need to ensure that you're using a JAXB +implementation that corresponds to the `javax.xml.bind` interfaces. + ## Support The MarkLogic Java Client is maintained by [MarkLogic](https://www.marklogic.com/) Engineering and is made available under diff --git a/examples/build.gradle b/examples/build.gradle index 99addca14..57209302e 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -28,6 +28,6 @@ dependencies { api 'com.google.code.gson:gson:2.10.1' api 'net.sourceforge.htmlcleaner:htmlcleaner:2.29' api 'com.opencsv:opencsv:4.6' - api 'org.springframework:spring-jdbc:5.3.29' + api 'org.springframework:spring-jdbc:5.3.39' api 'org.apache.commons:commons-lang3:3.12.0' } diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java index 02d7a9fa5..cba89d86e 100644 --- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java +++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java @@ -75,6 +75,7 @@ protected PlanBuilder( public final SqlExpr sql; /** * Builds expressions with vec server functions. + * @since 7.0.0; requires MarkLogic 12 or higher. */ public final VecExpr vec; /** diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java index f6d3ccc63..e33248b70 100644 --- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java +++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java @@ -53,6 +53,7 @@ public interface PlanBuilderBase { * @param query The cts.query expression for matching the documents. * @param qualifierName Specifies a name for qualifying the column names similar to a view name. * @return a ModifyPlan object + * @since 7.0.0; requires MarkLogic 12 or higher. */ PlanBuilder.AccessPlan fromSearchDocs(CtsQueryExpr query, String qualifierName, PlanSearchOptions options); /** diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java index 483bdac35..839c83fe2 100644 --- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java +++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/VecExpr.java @@ -18,6 +18,8 @@ /** * Builds expressions to call functions in the vec server library for a row * pipeline. + * + * @since 7.0.0; requires MarkLogic 12 or higher. */ public interface VecExpr { /** diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSearchOptions.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSearchOptions.java index 7dcfcdf0a..ef07719c6 100644 --- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSearchOptions.java +++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSearchOptions.java @@ -14,7 +14,7 @@ public interface PlanSearchOptions { XsFloatVal getQualityWeight(); ScoreMethod getScoreMethod(); /** - * @since 7.0.0 + * @since 7.0.0; requires MarkLogic 12 or higher. */ XsDoubleVal getBm25LengthWeight(); /** @@ -27,7 +27,7 @@ public interface PlanSearchOptions { PlanSearchOptions withQualityWeight(XsFloatVal qualityWeight); PlanSearchOptions withScoreMethod(ScoreMethod scoreMethod); /** - * @since 7.0.0 + * @since 7.0.0; requires MarkLogic 12 or higher. */ PlanSearchOptions withBm25LengthWeight(double bm25LengthWeight); enum ScoreMethod { diff --git a/pom.xml b/pom.xml index eb03c64bc..c4999b8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,13 +11,12 @@ It is not intended to be used to build this project. 4.0.0 com.marklogic marklogic-client-api - 6.3.0 + 7.0.0 jakarta.xml.bind jaxb-api 3.0.1 - runtime org.glassfish.jaxb @@ -34,13 +33,13 @@ It is not intended to be used to build this project. com.squareup.okhttp3 okhttp - 4.11.0 + 4.12.0 runtime com.squareup.okhttp3 logging-interceptor - 4.11.0 + 4.12.0 runtime @@ -51,8 +50,8 @@ It is not intended to be used to build this project. com.sun.mail - javax.mail - 1.6.2 + jakarta.mail + 2.0.1 runtime diff --git a/test-app/build.gradle b/test-app/build.gradle index 253dd9917..0c672196c 100644 --- a/test-app/build.gradle +++ b/test-app/build.gradle @@ -5,8 +5,8 @@ plugins { } dependencies { - implementation "io.undertow:undertow-core:2.2.24.Final" - implementation "io.undertow:undertow-servlet:2.2.24.Final" + implementation "io.undertow:undertow-core:2.2.32.Final" + implementation "io.undertow:undertow-servlet:2.2.32.Final" implementation "com.marklogic:ml-javaclient-util:4.8.0" implementation 'org.slf4j:slf4j-api:1.7.36' implementation 'ch.qos.logback:logback-classic:1.3.14'