inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-1748 Ensure we get libs from patched Solr.

Browse Source
This commit is contained in:
Tom Page
2019-07-22 16:15:10 +01:00
parent 492c5a6fa3
commit 797a932ce2
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+9
View File
@@ -26,6 +26,15 @@
<url>https://git.alfresco.com/search_discovery/insightengine.git</url>
<tag>HEAD</tag>
</scm>
<properties>
<solr.base.version>6.6.5</solr.base.version>
<solr.version>${solr.base.version}-patched</solr.version>
<!-- 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 startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
<solr.zip>https://artifacts.alfresco.com/nexus/content/repositories/public/org/apache/solr/solr/solr-${solr.version}/solr-solr-${solr.version}.zip</solr.zip>
<solr.directory>${project.build.directory}/solr-${solr.version}</solr.directory>
</properties>
<modules>
<module>search-services</module>
<module>insight-engine</module>
search-services/packaging/pom.xml
+1 -1
View File
@@ -124,7 +124,7 @@
<version>${project.version}</version>
<classifier>libs</classifier>
<outputDirectory>${project.build.directory}/solr-libs</outputDirectory>
<excludes>**/lucene-analyzers-common-*.jar,**/lucene-analyzers-kuromoji-*.jar,**/lucene-analyzers-phonetic-*.jar,**/lucene-backward-codecs-*.jar,**/lucene-classification-*.jar,**/lucene-codecs-*.jar,**/lucene-core-*.jar,**/lucene-expressions-*.jar,**/lucene-grouping-*.jar,**/lucene-highlighter-*jar,**/lucene-join-*.jar,**/lucene-memory-*.jar,**/lucene-misc-*.jar,**/lucene-queries-*.jar,**/lucene-queryparser-*.jar,**/lucene-sandbox-*.jar,**/lucene-spatial-extras-*.jar,**/lucene-suggest-*.jar,**/solr-core-*.jar,**/solr-solrj-*.jar,**/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</excludes>
</artifactItem>
</artifactItems>
</configuration>
search-services/packaging/src/main/resources/README.MD
+1 -1
View File
@@ -1,6 +1,6 @@
## Alfresco Search Services
Alfresco Search Services ${project.version} using Apache Solr ${solr.version}
Alfresco Search Services ${project.version} using Apache Solr ${solr.base.version}
Find out more about Solr 6 and how to be installed at:
search-services/packaging/src/main/resources/licenses/notice.txt
+7 -7
View File
@@ -169,12 +169,12 @@ juniversalchardet-1.0.3.jar
langdetect-1.1-20120112.jar
log4j-1.2.17.jar
lucene-analyzers-common-6.6.5-patched.jar
lucene-analyzers-icu-6.6.5.jar
lucene-analyzers-icu-6.6.5-patched.jar
lucene-analyzers-kuromoji-6.6.5-patched.jar
lucene-analyzers-morfologik-6.6.5.jar
lucene-analyzers-morfologik-6.6.5-patched.jar
lucene-analyzers-phonetic-6.6.5-patched.jar
lucene-analyzers-smartcn-6.6.5.jar
lucene-analyzers-stempel-6.6.5.jar
lucene-analyzers-smartcn-6.6.5-patched.jar
lucene-analyzers-stempel-6.6.5-patched.jar
lucene-backward-codecs-6.6.5-patched.jar
lucene-classification-6.6.5-patched.jar
lucene-codecs-6.6.5-patched.jar
@@ -213,10 +213,10 @@ rome-1.5.1.jar
simple-xml-2.7.1.jar
slf4j-api-1.7.7.jar
slf4j-log4j12-1.7.7.jar
solr-analysis-extras-6.6.5.jar
solr-clustering-6.6.5.jar
solr-analysis-extras-6.6.5-patched.jar
solr-clustering-6.6.5-patched.jar
solr-core-6.6.5-patched.jar
solr-langid-6.6.5.jar
solr-langid-6.6.5-patched.jar
solr-solrj-6.6.5-patched.jar
spatial4j-0.6.jar
start.jar
search-services/pom.xml
-8
View File
@@ -13,14 +13,6 @@
<version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Solr Search parent</name>
<properties>
<solr.version>6.6.5</solr.version>
<!-- 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 startup scripts do not work with any Java version higher than 9 so the scripts have been patched -->
<solr.zip>https://artifacts.alfresco.com/nexus/content/repositories/public/org/apache/solr/solr/solr-${solr.version}-patched/solr-solr-${solr.version}-patched.zip</solr.zip>
<solr.directory>${project.build.directory}/solr-${solr.version}-patched</solr.directory>
</properties>
<modules>
<module>alfresco-solrclient-lib</module>
<module>alfresco-search</module>