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

REPO-2815 Update the dependencies for latest ACS

Browse Source
This commit is contained in:
Alex Mukha
2017-09-13 11:51:23 +01:00
parent 05354a55f6
commit 062cc8b2ba
11 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distribution/pom.xml
View File

@@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${dependency.acs-community-packaging.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -82,7 +82,7 @@
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-community-distribution</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${dependency.acs-community-packaging.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>

4
distribution/src/assembly/full-distribution.xml
View File

@@ -17,13 +17,13 @@
<!-- Platform Community Distribution --> <!-- Platform Community Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>
<!-- Platform Enterprise Distribution --> <!-- Platform Enterprise Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>

2
distribution/src/main/resources/README.txt
View File

@@ -2,7 +2,7 @@ Alfresco Community (Build: ${installer.version.name})
=============================== ===============================
Contains: Contains:
- Alfresco Content Services Community: ${alfresco.platform.version} - Alfresco Content Services Community: ${dependency.acs-community-packaging.version}
- Alfresco Share: ${alfresco.share.version} - Alfresco Share: ${alfresco.share.version}
For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm

18
ear/pom.xml
View File

@@ -9,19 +9,6 @@
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<!-- Import all dependencyManagement from Alfresco Platform -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-parent</artifactId>
<version>${alfresco.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<!-- WARs to include in the EAR --> <!-- WARs to include in the EAR -->
<dependency> <dependency>
@@ -39,7 +26,6 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId> <artifactId>alfresco-server-root</artifactId>
<version>${alfresco.platform.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
@@ -230,7 +216,7 @@
<configuration> <configuration>
<includeArtifactIds>alfresco-content-services-full-distribution</includeArtifactIds> <includeArtifactIds>alfresco-content-services-full-distribution</includeArtifactIds>
<excludeTransitive>true</excludeTransitive> <excludeTransitive>true</excludeTransitive>
<excludes>alfresco-content-services-full-distribution-${alfresco.platform.version}/solr4/,alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-full-distribution-${alfresco.platform.version}/modules/</excludes> <excludes>alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/solr4/,alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/webapps/,alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/modules/</excludes>
</configuration> </configuration>
</execution> </execution>
@@ -262,7 +248,7 @@
<version>1.0.1</version> <version>1.0.1</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/lib</outputDirectory> <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/lib</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

4
ear/src/assembly/ear-distribution.xml
View File

@@ -8,14 +8,14 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}</directory>
<outputDirectory/> <outputDirectory/>
<excludes> <excludes>
<exclude>web-server/shared/**</exclude> <exclude>web-server/shared/**</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${alfresco.platform.version}/web-server/shared/classes</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-full-distribution-${dependency.acs-packaging.version}/web-server/shared/classes</directory>
<outputDirectory>web-server/classpath</outputDirectory> <outputDirectory>web-server/classpath</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>

4
enterprise-distribution/pom.xml
View File

@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-distribution</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${dependency.acs-packaging.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -81,7 +81,7 @@
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-content-services-distribution</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<version>${alfresco.platform.version}</version> <version>${dependency.acs-packaging.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>

4
enterprise-distribution/src/main/resources/README.txt
View File

@@ -2,7 +2,7 @@ Alfresco Content Services (Build: ${installer.version.name})
============================================== ==============================================
Contains: Contains:
- Alfresco Content Services Platform: ${alfresco.platform.version} - Alfresco Content Services: ${dependency.acs-packaging.version}
- Alfresco Content Services Share: ${alfresco.share.version} - Alfresco Share: ${alfresco.share.version}
See the Alfresco Support Portal (http://support.alfresco.com) for release notes and detailed information on this release. See the Alfresco Support Portal (http://support.alfresco.com) for release notes and detailed information on this release.

2
enterprise-war-for-ear/pom.xml
View File

@@ -13,7 +13,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>content-services</artifactId> <artifactId>content-services</artifactId>
<version>${alfresco.platform.version}</version> <version>${dependency.acs-packaging.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>

8
installer/pom.xml
View File

@@ -272,14 +272,6 @@
<version>${alfresco.googledocs.version}</version> <version>${alfresco.googledocs.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
<!-- Alfresco SPP -->
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-spp</artifactId>
<version>${alfresco.platform.version}</version>
<type>amp</type>
<destFileName>alfresco-spp.amp</destFileName>
</artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>

20
pom.xml
View File

@@ -12,8 +12,11 @@
<name>Alfresco Full Installation</name> <name>Alfresco Full Installation</name>
<properties> <properties>
<!-- Alfresco Platform version --> <!-- Community Packaging version -->
<alfresco.platform.version>5.3-SNAPSHOT</alfresco.platform.version> <dependency.acs-community-packaging.version>6.0.a-SNAPSHOT</dependency.acs-community-packaging.version>
<!-- Enterprise Packaging version -->
<dependency.acs-packaging.version>6.0.0-SNAPSHOT</dependency.acs-packaging.version>
<!-- Alfresco Share version --> <!-- Alfresco Share version -->
<alfresco.share.version>5.2.2-SNAPSHOT</alfresco.share.version> <alfresco.share.version>5.2.2-SNAPSHOT</alfresco.share.version>
@@ -74,6 +77,19 @@
<module>share-po-run</module> <module>share-po-run</module>
</modules> </modules>
<dependencyManagement>
<dependencies>
<!-- Import Enterprise packaging dependency management -->
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>acs-packaging</artifactId>
<version>${dependency.acs-packaging.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles> <profiles>
<profile> <profile>
<id>community</id> <id>community</id>

1
public-javadoc/pom.xml
View File

@@ -18,7 +18,6 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-remote-api</artifactId> <artifactId>alfresco-remote-api</artifactId>
<version>${alfresco.platform.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>