From c1becfd02b9f45e6145528cfa7340400fd6b3132 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2019 09:24:50 +0000 Subject: [PATCH 1/2] Bump alfresco-data-model from 8.43 to 8.44 in /search-services Bumps [alfresco-data-model](https://github.com/Alfresco/alfresco-data-model) from 8.43 to 8.44. - [Release notes](https://github.com/Alfresco/alfresco-data-model/releases) - [Commits](https://github.com/Alfresco/alfresco-data-model/compare/8.43...8.44) Signed-off-by: dependabot-preview[bot] --- search-services/alfresco-solrclient-lib/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml index 1e7212a25..292dcec26 100644 --- a/search-services/alfresco-solrclient-lib/pom.xml +++ b/search-services/alfresco-solrclient-lib/pom.xml @@ -22,7 +22,7 @@ - 8.43 + 8.44 2.10.0.pr1 From 3c8d83f95a6152e44dc0be0894989d43ebb7a1d6 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 24 Jul 2019 10:57:21 +0100 Subject: [PATCH 2/2] Include license for dom4j. --- search-services/packaging/pom.xml | 3 +- .../licenses/3rd-party/BSDlike-Dom4j.txt | 39 +++++++++++++++++++ .../src/main/resources/licenses/notice.txt | 4 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 search-services/packaging/src/main/resources/licenses/3rd-party/BSDlike-Dom4j.txt diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml index 2c395cf32..30fe95987 100644 --- a/search-services/packaging/pom.xml +++ b/search-services/packaging/pom.xml @@ -124,7 +124,7 @@ ${project.version} libs ${project.build.directory}/solr-libs - **/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar + **/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar @@ -169,6 +169,7 @@ + diff --git a/search-services/packaging/src/main/resources/licenses/3rd-party/BSDlike-Dom4j.txt b/search-services/packaging/src/main/resources/licenses/3rd-party/BSDlike-Dom4j.txt new file mode 100644 index 000000000..b9fa09a3c --- /dev/null +++ b/search-services/packaging/src/main/resources/licenses/3rd-party/BSDlike-Dom4j.txt @@ -0,0 +1,39 @@ +Copyright 2001-2016 (C) 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. diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt index 1c2d24860..7c83242c4 100644 --- a/search-services/packaging/src/main/resources/licenses/notice.txt +++ b/search-services/packaging/src/main/resources/licenses/notice.txt @@ -89,7 +89,8 @@ javax.activation-api-1.2.0.jar https://github.com/javaee/activation/blob/master === BSD === -jibx-run-1.3.1.jar http://jibx.sourceforge.net/ +jibx-run-1.3.1.jar http://jibx.sourceforge.net/ +dom4j-2.1.1.jar https://github.com/dom4j/dom4j/blob/master/LICENSE === Part of Apache Solr (Licenses listed separately) === @@ -125,7 +126,6 @@ curator-client-2.8.0.jar curator-framework-2.8.0.jar curator-recipes-2.8.0.jar curvesapi-1.04.jar -dom4j-1.6.1.jar eigenbase-properties-1.1.5.jar fontbox-2.0.6.jar gmetric4j-1.0.7.jar