inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search-813: Updated ASS Version from 1.1.0 to 1.1.1 and Removed Solr4 references from the community packaging project

Browse Source
This commit is contained in:
Meenal Bhave
2018-04-26 14:48:44 +01:00
parent 2cf457bb43
commit e34a851879
5 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
distribution/pom.xml
View File

@@ -55,18 +55,6 @@
<classifier>win64</classifier> <classifier>win64</classifier>
<type>tgz</type> <type>tgz</type>
</dependency> </dependency>
<!-- SOLR Distribution -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- SHARE Distribution --> <!-- SHARE Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@@ -108,12 +96,6 @@
<includes>alfresco/keystore/**</includes> <includes>alfresco/keystore/**</includes>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<type>zip</type>
<outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>

16
distribution/src/assembly/distribution.xml
View File

@@ -32,22 +32,6 @@
</includes> </includes>
</fileSet> </fileSet>
<!-- Solr4 Distribution -->
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>solr4</outputDirectory>
<excludes>
<exclude>solr4.war</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/dependency/solr4</directory>
<outputDirectory>web-server/webapps</outputDirectory>
<includes>
<include>solr4.war</include>
</includes>
</fileSet>
<!-- Share --> <!-- Share -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>

2
docker-compose/.env
View File

@@ -1,4 +1,4 @@
ALFRESCO_TAG=6.0.4-ea ALFRESCO_TAG=6.0.4-ea
SHARE_TAG=6.0.a SHARE_TAG=6.0.a
SOLR6_TAG=1.1.0 SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1 POSTGRES_TAG=10.1

2
docker-compose/test.env
View File

@@ -1,4 +1,4 @@
export ALFRESCO_TAG=latest export ALFRESCO_TAG=latest
export SHARE_TAG=6.0.a export SHARE_TAG=6.0.a
export SOLR6_TAG=1.1.0 export SOLR6_TAG=1.1.1
export POSTGRES_TAG=10.1 export POSTGRES_TAG=10.1

9
pom.xml
View File

@@ -88,9 +88,6 @@
<!-- Alfresco Office Services Module --> <!-- Alfresco Office Services Module -->
<alfresco.aos-module.version>1.2.0-RC2</alfresco.aos-module.version> <alfresco.aos-module.version>1.2.0-RC2</alfresco.aos-module.version>
<!-- Deprecated SOLR4 app, still packaged for downward compatibility -->
<alfresco.solr4.version>6.7</alfresco.solr4.version>
<installer.version.name>${project.version}</installer.version.name> <installer.version.name>${project.version}</installer.version.name>
<alfresco.package.name>alfresco-community</alfresco.package.name> <alfresco.package.name>alfresco-community</alfresco.package.name>
<alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name> <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
@@ -419,12 +416,6 @@
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-solr4-distribution</artifactId>
<version>${alfresco.solr4.version}</version>
<type>zip</type>
</dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-wcmqs-distribution</artifactId> <artifactId>alfresco-wcmqs-distribution</artifactId>