Fix packaging to work with alfresco-solr in jar format

This commit is contained in:
Michael Suzuki
2016-06-08 14:50:09 +01:00
parent 0f69dbaf35
commit 10949630c9
4 changed files with 1640 additions and 62 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -15,13 +15,13 @@
</parent>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solrclient</artifactId>
<version>${alfresco-solr.version}</version>
</dependency>
<!-- provided dependencies -->
<dependency>
<groupId>org.apache.lucene</groupId>
@@ -29,7 +29,7 @@
<version>${solr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
@@ -42,40 +42,40 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-analysis-extras</artifactId>
<version>${solr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-langid</artifactId>
<version>${solr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-clustering</artifactId>
<version>${solr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<!-- NLP -->
<dependency>
@@ -83,7 +83,7 @@
<artifactId>nlp4j</artifactId>
<version>RELEASE</version>
</dependency>
<dependency>
<groupId>edu.emory.mathcs.nlp</groupId>
<artifactId>nlp4j-english</artifactId>
@@ -97,32 +97,41 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>${solr.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-impl</artifactId>
<version>0.11.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>alfresco-solr</finalName>
<resources>
<resource>
<targetPath>webapp</targetPath>
<directory>src/main/webapp</directory>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<!-- Set to compile with java 8 -->
<plugin>
@@ -165,22 +174,19 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
<archiveClasses>true</archiveClasses>
<webXml>src\main\webapp\WEB-INF\web.xml</webXml>
</configuration>
<!-- This allows overlays to be prepared on the FS for minification and faster run -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
<id>prepare-exploded-war</id>
<phase>package</phase>
<goals>
<goal>exploded</goal>
<goal>shade</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>
</plugin>

View File

@@ -61,8 +61,7 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}</outputDirectory>
<includes>solr/instance/**/*</includes>
<outputDirectory>${project.build.directory}/alfresco-solr</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>

View File

@@ -4,12 +4,15 @@
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<!-- Solr war dependency unpacked earlier to get rid of the root dir -->
<fileSet>
<directory>target/solr-${solr.version}</directory>
<outputDirectory>solr</outputDirectory>
<excludes>
<exclude>**/web.xml</exclude>
</excludes>
</fileSet>
<!-- Solr config -->
<fileSet>
@@ -29,42 +32,39 @@
<exclude>*</exclude>
</excludes>
</fileSet>
</fileSets>
<dependencySets>
<!--dependencySet>
<!-- Include all classes from alfresco-solr -->
<fileSet>
<directory>target/alfresco-solr</directory>
<outputDirectory>solr/server/solr-webapp/webapp/WEB-INF/classes</outputDirectory>
<includes>
<include>org.alfresco:alfresco-solr6:jar:classes*</include>
</includes>
<outputDirectory>solr/server/solr/</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<includes>
<include>solr/instance/**.*</include>
</includes>
<excludes>
<exclude>**/workspace-SpacesStore/**</exclude>
<exclude>**/archive-SpacesStore/**</exclude>
<exclude>context.xml</exclude>
</excludes>
</unpackOptions>
<useStrictFiltering>true</useStrictFiltering>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet-->
<dependencySet>
<includes>
<include>org.alfresco:alfresco-solr:jar</include>
<include>**/*</include>
</includes>
<excludes>
<exclude>solr</exclude>
<exclude>webapp</exclude>
</excludes>
</fileSet>
<!-- Replace web.xml with alfresco solr config -->
<fileSet>
<directory>target/alfresco-solr/webapp</directory>
<outputDirectory>solr/server/solr-webapp/webapp</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<includes>
<include>WEB-INF/lib/*.jar</include>
</includes>
</unpackOptions>
<useStrictFiltering>true</useStrictFiltering>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
<includes>
<include>**/web.xml</include>
</includes>
</fileSet>
<!-- Port over solr alfresco stores -->
<fileSet>
<directory>target/alfresco-solr/solr</directory>
<outputDirectory>solr/server/solr/</outputDirectory>
<includes>
<include>instance/**.*</include>
</includes>
<excludes>
<exclude>**/workspace-SpacesStore/**</exclude>
<exclude>**/archive-SpacesStore/**</exclude>
<exclude>context.xml</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>