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

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
REPO-1710 Complete 5.2 branding items for Alfresco Community Edition
   - Deferred merges: 128252,132775,132846,133049,133250-133252,133265,133283
   - Both branches are now in sync except for version numbers

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 15:35:03 +00:00
parent 562763bee1
commit c8de49013b
10 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distribution/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.2-SNAPSHOT</version> <version>5.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-community-distribution</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Alfresco Full Distribution (Community Edition)</name> <name>Alfresco Full Distribution (Community Edition)</name>
@@ -47,7 +47,7 @@
<!-- Share Distribution --> <!-- Share Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
@@ -94,7 +94,7 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>

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

@@ -20,7 +20,7 @@
<!-- Platform Enterprise Distribution --> <!-- Platform Enterprise Distribution -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}</directory>
<outputDirectory/> <outputDirectory/>
</fileSet> </fileSet>
@@ -42,7 +42,7 @@
<!-- Share --> <!-- Share -->
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
<outputDirectory/> <outputDirectory/>
<includes> <includes>
<include>web-server/**</include> <include>web-server/**</include>
@@ -51,7 +51,7 @@
</includes> </includes>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
<outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory> <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>

22
ear/pom.xml
View File

@@ -53,7 +53,7 @@
<!-- Distribution zip --> <!-- Distribution zip -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
<scope>provided</scope> <scope>provided</scope>
@@ -66,7 +66,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>zip</type> <type>zip</type>
<scope>provided</scope> <scope>provided</scope>
@@ -145,10 +145,16 @@
<artifactId>jaxb-impl</artifactId> <artifactId>jaxb-impl</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.2.11</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.1</version> <version>2.2.12</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -222,9 +228,9 @@
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeArtifactIds>alfresco-one-platform-distributionzip</includeArtifactIds> <includeArtifactIds>alfresco-content-services-platform-distributionzip</includeArtifactIds>
<excludeTransitive>true</excludeTransitive> <excludeTransitive>true</excludeTransitive>
<excludes>alfresco-one-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/modules/</excludes> <excludes>alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/modules/</excludes>
</configuration> </configuration>
</execution> </execution>
@@ -235,10 +241,10 @@
<goal>unpack-dependencies</goal> <goal>unpack-dependencies</goal>
</goals> </goals>
<configuration> <configuration>
<includeArtifactIds>alfresco-share-distribution</includeArtifactIds> <includeArtifactIds>alfresco-content-services-share-distribution</includeArtifactIds>
<excludeTransitive>true</excludeTransitive> <excludeTransitive>true</excludeTransitive>
<excludes>*</excludes> <excludes>*</excludes>
<includes>alfresco-share-distribution-${alfresco.share.version}/web-extension-samples/</includes> <includes>alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples/</includes>
</configuration> </configuration>
</execution> </execution>
@@ -256,7 +262,7 @@
<version>1.0.1</version> <version>1.0.1</version>
</artifactItem> </artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory> <outputDirectory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib</outputDirectory>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

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

@@ -8,18 +8,18 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.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-one-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
<outputDirectory>web-server/classpath</outputDirectory> <outputDirectory>web-server/classpath</outputDirectory>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory> <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
<outputDirectory>web-server/classpath/alfresco/web-extension</outputDirectory> <outputDirectory>web-server/classpath/alfresco/web-extension</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
@@ -30,7 +30,7 @@
</file> </file>
<file> <file>
<source>${project.build.directory}/alfresco-ear-distribution-${project.version}.ear</source> <source>${project.build.directory}/alfresco-ear-distribution-${project.version}.ear</source>
<destName>alfresco-one-${project.version}.ear</destName> <destName>alfresco-content-services-${project.version}.ear</destName>
</file> </file>
</files> </files>
</assembly> </assembly>

10
enterprise-distribution/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.2-SNAPSHOT</version> <version>5.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-one-distribution</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Alfresco Full Distribution (Enterprise Edition)</name> <name>Alfresco Full Distribution (Enterprise Edition)</name>
@@ -19,7 +19,7 @@
<!-- Platform Distribution --> <!-- Platform Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
@@ -47,7 +47,7 @@
<!-- Share Distribution --> <!-- Share Distribution -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>zip</type> <type>zip</type>
<exclusions> <exclusions>
@@ -81,7 +81,7 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-one-platform-distributionzip</artifactId> <artifactId>alfresco-content-services-platform-distributionzip</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>
@@ -94,7 +94,7 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-share-distribution</artifactId> <artifactId>alfresco-content-services-share-distribution</artifactId>
<version>${alfresco.share.version}</version> <version>${alfresco.share.version}</version>
<type>zip</type> <type>zip</type>
</artifactItem> </artifactItem>

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

@@ -1,8 +1,8 @@
Alfresco One (Build: ${installer.version.name}) Alfresco Content Services (Build: ${installer.version.name})
=============================== ==============================================
Contains: Contains:
- Alfresco One Platform: ${alfresco.platform.version} - Alfresco Content Services Platform: ${alfresco.platform.version}
- Alfresco One Share: ${alfresco.share.version} - Alfresco Content Services 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.

14
enterprise-installer/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.2-SNAPSHOT</version> <version>5.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-one-installer</artifactId> <artifactId>alfresco-content-services-installer</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Enterprise Full Installers</name> <name>Alfresco Enterprise Full Installers</name>
@@ -17,7 +17,7 @@
<license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location> <license.file.location>${binaries.folder}/build-classpath/license.xml</license.file.location>
<bitrock.arguments> <bitrock.arguments>
project.version=${installer.version.name} project.version=${installer.version.name}
project.fullName='Alfresco One' project.fullName='Alfresco Content Services'
project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12 project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12
project.osxSigningPkcs12Password=${p12Password} project.osxSigningPkcs12Password=${p12Password}
project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12
@@ -31,8 +31,8 @@
</bitrock.arguments> </bitrock.arguments>
<!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) --> <!-- Override alfresco.package.name for the installer naming (Different from the zip distribution naming) -->
<alfresco.package.name>alfresco-one</alfresco.package.name> <alfresco.package.name>alfresco-content-services</alfresco.package.name>
<alfresco.distribution.name>alfresco-one-distribution</alfresco.distribution.name> <alfresco.distribution.name>alfresco-content-services-distribution</alfresco.distribution.name>
<!-- <!--
Override alfresco.installer.name for the Enterprise installer that is still using Override alfresco.installer.name for the Enterprise installer that is still using
@@ -45,7 +45,7 @@
<!-- Import the dependencies from the Community installer --> <!-- Import the dependencies from the Community installer -->
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-installer</artifactId> <artifactId>alfresco-content-services-community-installer</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
@@ -73,13 +73,13 @@
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-one-installer-resources</artifactId> <artifactId>alfresco-content-services-installer-resources</artifactId>
<version>${alfresco.platform.version}</version> <version>${alfresco.platform.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory> <outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-one-distribution</artifactId> <artifactId>alfresco-content-services-distribution</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory> <outputDirectory>${project.build.directory}/distribution</outputDirectory>

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

@@ -50,6 +50,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<useCache>true</useCache>
<overlays> <overlays>
<overlay> <overlay>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@@ -67,6 +68,12 @@
<type>amp</type> <type>amp</type>
</overlay> </overlay>
</overlays> </overlays>
<archive>
<manifestEntries>
<!-- WebSphere property -->
<DisableIBMJAXWSEngine>true</DisableIBMJAXWSEngine>
</manifestEntries>
</archive>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

4
installer/pom.xml
View File

@@ -6,7 +6,7 @@
<artifactId>alfresco-full-installation</artifactId> <artifactId>alfresco-full-installation</artifactId>
<version>5.2-SNAPSHOT</version> <version>5.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>alfresco-community-installer</artifactId> <artifactId>alfresco-content-services-community-installer</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Alfresco Community Full Installers</name> <name>Alfresco Community Full Installers</name>
@@ -302,7 +302,7 @@
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-community-distribution</artifactId> <artifactId>alfresco-content-services-community-distribution</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>zip</type> <type>zip</type>
<outputDirectory>${project.build.directory}/distribution</outputDirectory> <outputDirectory>${project.build.directory}/distribution</outputDirectory>

2
pom.xml
View File

@@ -53,7 +53,7 @@
--> -->
<installer.version.name>${installer.build.timestamp}-${installer.build.number}</installer.version.name> <installer.version.name>${installer.build.timestamp}-${installer.build.number}</installer.version.name>
<alfresco.package.name>alfresco-community</alfresco.package.name> <alfresco.package.name>alfresco-content-services-community</alfresco.package.name>
<alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name> <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
</properties> </properties>