inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-10-01 14:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dependabot/maven/search-services/org.alfresco-alfresco-data-model-8.44' into 'master'

Browse Source 
Dependabot/maven/search services/org.alfresco alfresco data model 8.44

See merge request search_discovery/insightengine!105
This commit is contained in:
Tom Page
2019-07-24 12:11:51 +01:00
parent 964492d0c3 3c8d83f95a
commit f701c84645
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
search-services/alfresco-solrclient-lib/pom.xml
View File

@@ -22,7 +22,7 @@
</distributionManagement>
<properties>
<dependency.alfresco-data-model.version>8.43</dependency.alfresco-data-model.version>
<dependency.alfresco-data-model.version>8.44</dependency.alfresco-data-model.version>
<dependency.jackson.version>2.10.0.pr1</dependency.jackson.version>
</properties>

3
search-services/packaging/pom.xml
View File

@@ -124,7 +124,7 @@
<version>${project.version}</version>
<classifier>libs</classifier>
<outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
<excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar</excludes>
<excludes>**/jackson-dataformat-smile-*.jar,**/asm-3.3.1.jar,**/jackson-core-asl-*.jar,**/jackson-mapper-asl-*.jar,**/dom4j-1.6.1.jar</excludes>
</artifactItem>
</artifactItems>
</configuration>
@@ -169,6 +169,7 @@
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.5.4.jar" />
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-asl-1.9.13.jar" />
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar" />
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar" />
</target>
</configuration>
</execution>

39
search-services/packaging/src/main/resources/licenses/3rd-party/BSDlike-Dom4j.txt vendored Normal file
View File

@@ -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.

4
search-services/packaging/src/main/resources/licenses/notice.txt
View File

@@ -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