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 'feature/SEARCH-1906_Solr6.6.5-patched.1' into 'master'

Browse Source 
Feature/search 1906 solr6.6.5 patched.1

See merge request search_discovery/insightengine!211
This commit is contained in:
Tom Page
2019-11-05 09:29:02 +00:00
parent 42ba382761 c32ff1a922
commit c5e6fa3983
3 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -29,7 +29,7 @@
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>
<solr.base.version>6.6.5</solr.base.version> <solr.base.version>6.6.5</solr.base.version>
<solr.version>${solr.base.version}-patched</solr.version> <solr.version>${solr.base.version}-patched.1</solr.version>
<!-- The location to download the solr zip file from. --> <!-- The location to download the solr zip file from. -->
<!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> --> <!-- <solr.zip>https://archive.apache.org/dist/lucene/solr/${solr.version}/solr-${solr.version}.zip</solr.zip> -->
<!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched --> <!-- Solr startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->

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

@@ -163,13 +163,13 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.5.4.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.5.4.jar" />
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar" />
<delete file="${project.build.directory}/solr-6.6.5-patched/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.5.4.jar" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.5.4.jar" />
<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-${solr.version}/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-${solr.version}/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-${solr.version}/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" /> <delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/dom4j-1.6.1.jar" />
</target> </target>
</configuration> </configuration>
</execution> </execution>

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

@@ -74,6 +74,19 @@ guessencoding-1.4.jar http://docs.codehaus.org/display/GUESSENC/
xml-apis-1.4.01.jar https://github.com/FasterXML/jackson xml-apis-1.4.01.jar https://github.com/FasterXML/jackson
jug-2.0.0-asl.jar http://jug.safehaus.org/ jug-2.0.0-asl.jar http://jug.safehaus.org/
acegi-security-0.8.2_patched.jar http://sourceforge.net/projects/acegisecurity/ acegi-security-0.8.2_patched.jar http://sourceforge.net/projects/acegisecurity/
jetty-continuation-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-deploy-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-http-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-io-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-jmx-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-rewrite-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-security-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-server-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-servlet-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-servlets-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-util-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-webapp-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
jetty-xml-9.3.27.v20190418.jar https://www.eclipse.org/jetty/licenses.html
=== CDDL 1.0 === === CDDL 1.0 ===
@@ -148,19 +161,6 @@ javax.servlet-api-3.1.0.jar
jcl-over-slf4j-1.7.7.jar jcl-over-slf4j-1.7.7.jar
jdom-1.0.jar jdom-1.0.jar
jempbox-1.8.13.jar jempbox-1.8.13.jar
jetty-continuation-9.3.14.v20161028.jar
jetty-deploy-9.3.14.v20161028.jar
jetty-http-9.3.14.v20161028.jar
jetty-io-9.3.14.v20161028.jar
jetty-jmx-9.3.14.v20161028.jar
jetty-rewrite-9.3.14.v20161028.jar
jetty-security-9.3.14.v20161028.jar
jetty-server-9.3.14.v20161028.jar
jetty-servlet-9.3.14.v20161028.jar
jetty-servlets-9.3.14.v20161028.jar
jetty-util-9.3.14.v20161028.jar
jetty-webapp-9.3.14.v20161028.jar
jetty-xml-9.3.14.v20161028.jar
jmatio-1.2.jar jmatio-1.2.jar
joda-time-2.2.jar joda-time-2.2.jar
jsonic-1.2.7.jar jsonic-1.2.7.jar
@@ -168,28 +168,28 @@ jul-to-slf4j-1.7.7.jar
juniversalchardet-1.0.3.jar juniversalchardet-1.0.3.jar
langdetect-1.1-20120112.jar langdetect-1.1-20120112.jar
log4j-1.2.17.jar log4j-1.2.17.jar
lucene-analyzers-common-6.6.5-patched.jar lucene-analyzers-common-6.6.5-patched.1.jar
lucene-analyzers-icu-6.6.5-patched.jar lucene-analyzers-icu-6.6.5-patched.1.jar
lucene-analyzers-kuromoji-6.6.5-patched.jar lucene-analyzers-kuromoji-6.6.5-patched.1.jar
lucene-analyzers-morfologik-6.6.5-patched.jar lucene-analyzers-morfologik-6.6.5-patched.1.jar
lucene-analyzers-phonetic-6.6.5-patched.jar lucene-analyzers-phonetic-6.6.5-patched.1.jar
lucene-analyzers-smartcn-6.6.5-patched.jar lucene-analyzers-smartcn-6.6.5-patched.1.jar
lucene-analyzers-stempel-6.6.5-patched.jar lucene-analyzers-stempel-6.6.5-patched.1.jar
lucene-backward-codecs-6.6.5-patched.jar lucene-backward-codecs-6.6.5-patched.1.jar
lucene-classification-6.6.5-patched.jar lucene-classification-6.6.5-patched.1.jar
lucene-codecs-6.6.5-patched.jar lucene-codecs-6.6.5-patched.1.jar
lucene-core-6.6.5-patched.jar lucene-core-6.6.5-patched.1.jar
lucene-expressions-6.6.5-patched.jar lucene-expressions-6.6.5-patched.1.jar
lucene-grouping-6.6.5-patched.jar lucene-grouping-6.6.5-patched.1.jar
lucene-highlighter-6.6.5-patched.jar lucene-highlighter-6.6.5-patched.1.jar
lucene-join-6.6.5-patched.jar lucene-join-6.6.5-patched.1.jar
lucene-memory-6.6.5-patched.jar lucene-memory-6.6.5-patched.1.jar
lucene-misc-6.6.5-patched.jar lucene-misc-6.6.5-patched.1.jar
lucene-queries-6.6.5-patched.jar lucene-queries-6.6.5-patched.1.jar
lucene-queryparser-6.6.5-patched.jar lucene-queryparser-6.6.5-patched.1.jar
lucene-sandbox-6.6.5-patched.jar lucene-sandbox-6.6.5-patched.1.jar
lucene-spatial-extras-6.6.5-patched.jar lucene-spatial-extras-6.6.5-patched.1.jar
lucene-suggest-6.6.5-patched.jar lucene-suggest-6.6.5-patched.1.jar
metadata-extractor-2.9.1.jar metadata-extractor-2.9.1.jar
metrics-core-3.2.2.jar metrics-core-3.2.2.jar
metrics-ganglia-3.2.2.jar metrics-ganglia-3.2.2.jar
@@ -213,11 +213,11 @@ rome-1.5.1.jar
simple-xml-2.7.1.jar simple-xml-2.7.1.jar
slf4j-api-1.7.7.jar slf4j-api-1.7.7.jar
slf4j-log4j12-1.7.7.jar slf4j-log4j12-1.7.7.jar
solr-analysis-extras-6.6.5-patched.jar solr-analysis-extras-6.6.5-patched.1.jar
solr-clustering-6.6.5-patched.jar solr-clustering-6.6.5-patched.1.jar
solr-core-6.6.5-patched.jar solr-core-6.6.5-patched.1.jar
solr-langid-6.6.5-patched.jar solr-langid-6.6.5-patched.1.jar
solr-solrj-6.6.5-patched.jar solr-solrj-6.6.5-patched.1.jar
spatial4j-0.6.jar spatial4j-0.6.jar
start.jar start.jar
stax2-api-3.1.4.jar stax2-api-3.1.4.jar