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

SEARCH-996 Update solr and alfresco-solrclient.

Browse Source 
Update to Solr 6.6.5 and alfresco-solrclient 6.7 (which brings in
alfresco-datamodel 6.25).  This should fix several vulnerabilities
flagged by Whitesource.

Create build config to allow specifying the URL to download the solr
zip file from (in case we need to provide a patched version).
This commit is contained in:
Tom Page
2018-09-06 14:10:23 +01:00
parent 7baa878635
commit e01c33815e
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,28 +50,28 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>download-maven-plugin</artifactId>
<version>1.4.1</version>
<executions> <executions>
<execution> <execution>
<id>unpack-solr-war</id> <id>unpack-solr-war</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>unpack</goal> <goal>wget</goal>
</goals> </goals>
<configuration> <configuration>
<artifactItems> <url>${solr.zip}</url>
<artifactItem> <unpack>true</unpack>
<groupId>org.apache.solr</groupId> <outputDirectory>${project.build.directory}</outputDirectory>
<artifactId>solr</artifactId>
<version>${solr.version}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}</outputDirectory>
<excludes>**/*solr.xml</excludes>
</artifactItem>
</artifactItems>
</configuration> </configuration>
</execution> </execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution> <execution>
<id>unpack-solr-config</id> <id>unpack-solr-config</id>
<phase>validate</phase> <phase>validate</phase>

6
search-services/pom.xml
View File

@@ -11,8 +11,10 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Solr Search parent</name> <name>Alfresco Solr Search parent</name>
<properties> <properties>
<solr.version>6.6.0</solr.version> <solr.version>6.6.5</solr.version>
<alfresco-solrclient.version>6.5</alfresco-solrclient.version> <alfresco-solrclient.version>6.7</alfresco-solrclient.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>
</properties> </properties>
<distributionManagement> <distributionManagement>
<repository> <repository>