inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-9: Updated the distribution to get the files from the new jar.

Browse Source
This commit is contained in:
Gethin James
2016-06-03 14:33:30 +02:00
parent dc18f87f98
commit 685a4eac8a
3 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
search-services/packaging/build.sh
View File

@@ -1,7 +1,7 @@
#! /bin/bash #! /bin/bash
rm -rf target/alfresco-solr rm -rf target/alfresco-solr
rm -rf target/solr-* rm -rf target/solr-*
export SOLR_VER=5.1-K_2-SNAPSHOT export SOLR_VER=1.0-SNAPSHOT
docker build --build-arg SOLR_ZIP=target/alfresco-solr-${SOLR_VER}.zip -t dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber} -t dockerreg.alfresco.com/alfresco-solr:latest . docker build --build-arg SOLR_ZIP=target/alfresco-solr-${SOLR_VER}.zip -t dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber} -t dockerreg.alfresco.com/alfresco-solr:latest .
echo "Now type: docker run --rm -p 8983:8983 dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber}" echo "Now type: docker run --rm -p 8983:8983 dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber}"

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

@@ -19,16 +19,9 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-solr6</artifactId> <artifactId>alfresco-solr6</artifactId>
<version>${alfresco-solr.version}</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr6</artifactId>
<version>${alfresco-solr.version}</version>
<classifier>config-sharding</classifier>
<type>zip</type>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>alfresco-solr-${project.version}</finalName> <finalName>alfresco-solr-${project.version}</finalName>
@@ -57,6 +50,25 @@
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>unpack-solr-config</id>
<phase>validate</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr6</artifactId>
<version>${project.version}</version>
<classifier>classes</classifier>
<outputDirectory>${project.build.directory}</outputDirectory>
<includes>solr/instance/**/*</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>

21
search-services/packaging/src/assembly/solr-distribution.xml
View File

@@ -11,6 +11,16 @@
<directory>target/solr-${solr.version}</directory> <directory>target/solr-${solr.version}</directory>
<outputDirectory>solr</outputDirectory> <outputDirectory>solr</outputDirectory>
</fileSet> </fileSet>
<!-- Solr config -->
<fileSet>
<directory>target/solr/instance</directory>
<outputDirectory>solr/server/solr/</outputDirectory>
<excludes>
<exclude>**/workspace-SpacesStore/**</exclude>
<exclude>**/archive-SpacesStore/**</exclude>
<exclude>context.xml</exclude>
</excludes>
</fileSet>
<!-- Just create an empty data directory --> <!-- Just create an empty data directory -->
<fileSet> <fileSet>
<directory>src/assembly</directory> <directory>src/assembly</directory>
@@ -21,14 +31,17 @@
</fileSet> </fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<!-- Solr config -->
<dependencySet> <!--dependencySet>
<includes> <includes>
<include>*:alfresco-solr6:zip:config*</include> <include>org.alfresco:alfresco-solr6:jar:classes*</include>
</includes> </includes>
<outputDirectory>solr/server/solr/</outputDirectory> <outputDirectory>solr/server/solr/</outputDirectory>
<unpack>true</unpack> <unpack>true</unpack>
<unpackOptions> <unpackOptions>
<includes>
<include>solr/instance/**.*</include>
</includes>
<excludes> <excludes>
<exclude>**/workspace-SpacesStore/**</exclude> <exclude>**/workspace-SpacesStore/**</exclude>
<exclude>**/archive-SpacesStore/**</exclude> <exclude>**/archive-SpacesStore/**</exclude>
@@ -37,7 +50,7 @@
</unpackOptions> </unpackOptions>
<useStrictFiltering>true</useStrictFiltering> <useStrictFiltering>true</useStrictFiltering>
<useProjectArtifact>false</useProjectArtifact> <useProjectArtifact>false</useProjectArtifact>
</dependencySet> </dependencySet-->
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.alfresco:alfresco-solr6:war</include> <include>org.alfresco:alfresco-solr6:war</include>