From fb4e984570a27e7dd15b4488c33ef9c1bd9f473e Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 13 Oct 2017 17:30:04 +0100
Subject: [PATCH] Apply git configs (line endings)

---
 .gitignore                                    |  68 +-
 distribution/pom.xml                          | 236 +++----
 .../src/assembly/full-distribution.xml        | 124 ++--
 distribution/src/main/resources/README.txt    |  16 +-
 installer-resources/pom.xml                   |  30 +-
 .../resources/bitrock/alfresco-aos-module.xml | 126 ++--
 .../resources/bitrock/alfresco-googledocs.xml |  78 +--
 .../src/main/resources/extract-binaries.xml   | 350 +++++-----
 pom.xml                                       | 630 +++++++++---------
 9 files changed, 829 insertions(+), 829 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5cd20fa5aa..9346843361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,34 @@
-*.class
-
-# Eclipse
-.classpath
-.settings
-.project
-
-# Intellij
-.idea/
-*.iml
-*.iws
-
-# Mac
-.DS_Store
-
-# Maven
-target
-*.log
-*.log.*
-
-# Mobile Tools for Java (J2ME)
-
-.mtj
-.tmp/
-
-# Package Files #
-
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
-hs_err_pid*
+*.class
+
+# Eclipse
+.classpath
+.settings
+.project
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+target
+*.log
+*.log.*
+
+# Mobile Tools for Java (J2ME)
+
+.mtj
+.tmp/
+
+# Package Files #
+
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+hs_err_pid*
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f2f2c95a68..c625f4d723 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,118 +1,118 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>full-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
-    <packaging>pom</packaging>
-    <name>Alfresco Content Services Community Full Distribution</name>
-
-    <!-- To replace in share-config-custom.xml -->
-    <properties>
-        <BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-community-distribution</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-solr4-distribution</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-content-services-share-distribution</artifactId>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}-${installer.version.name}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>extract-keystore</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-solr4-distribution</artifactId>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-content-services-share-distribution</artifactId>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/assembly/full-distribution.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>full-community-packaging</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>alfresco-content-services-community-full-distribution</artifactId>
+    <packaging>pom</packaging>
+    <name>Alfresco Content Services Community Full Distribution</name>
+
+    <!-- To replace in share-config-custom.xml -->
+    <properties>
+        <BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-content-services-community-distribution</artifactId>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-solr4-distribution</artifactId>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-content-services-share-distribution</artifactId>
+            <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}-${installer.version.name}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>extract-keystore</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-content-services-community-distribution</artifactId>
+                                    <type>zip</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-solr4-distribution</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>${project.build.directory}/dependency/solr4</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-content-services-share-distribution</artifactId>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assembly/full-distribution.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index e7c2220e27..9f607449c5 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -1,62 +1,62 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>distribution</id>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <fileSets>
-        <!-- Local resources: README, etc. -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!-- Platform Community Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
-            <outputDirectory/>
-        </fileSet>
-
-        <!-- Platform Enterprise Distribution -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
-            <outputDirectory/>
-        </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 -->
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
-            <outputDirectory/>
-            <includes>
-                <include>web-server/**</include>
-		<include>modules/**</include>
-		<include>amps/**</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <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>
-        </fileSet>
-    </fileSets>
-
-</assembly>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>distribution</id>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <!-- Local resources: README, etc. -->
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+
+        <!-- Platform Community Distribution -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}</directory>
+            <outputDirectory/>
+        </fileSet>
+
+        <!-- Platform Enterprise Distribution -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}</directory>
+            <outputDirectory/>
+        </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 -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
+            <outputDirectory/>
+            <includes>
+                <include>web-server/**</include>
+		<include>modules/**</include>
+		<include>amps/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <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>
+        </fileSet>
+    </fileSets>
+
+</assembly>
diff --git a/distribution/src/main/resources/README.txt b/distribution/src/main/resources/README.txt
index 63104fc294..7cd221d0dd 100644
--- a/distribution/src/main/resources/README.txt
+++ b/distribution/src/main/resources/README.txt
@@ -1,8 +1,8 @@
-Alfresco Community (Build: ${installer.version.name})
-===============================
-
-Contains:
-	- Alfresco Content Services Community:	${dependency.acs-community-packaging.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
+Alfresco Community (Build: ${installer.version.name})
+===============================
+
+Contains:
+	- Alfresco Content Services Community:	${dependency.acs-community-packaging.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
diff --git a/installer-resources/pom.xml b/installer-resources/pom.xml
index 18deeca383..551483055c 100644
--- a/installer-resources/pom.xml
+++ b/installer-resources/pom.xml
@@ -1,15 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-installer-resources</artifactId>
-    <packaging>jar</packaging>
-    <name>Alfresco Content Services Installer Resources</name>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>full-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-installer-resources</artifactId>
+    <packaging>jar</packaging>
+    <name>Alfresco Content Services Installer Resources</name>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>full-community-packaging</artifactId>
+        <version>6.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+</project>
diff --git a/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml b/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
index 05e5410b93..28b1e1bca4 100644
--- a/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
+++ b/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
@@ -1,63 +1,63 @@
-<component>
-    <name>aosmodule</name>
-    <description>Alfresco Office Services</description>
-    <detailedDescription>Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation.</detailedDescription>
-    <canBeEdited>1</canBeEdited>
-    <selected>1</selected>
-    <show>1</show>
-    <shouldPackRuleList>
-        <isTrue value="${aosmodule_component_enabled}" />
-    </shouldPackRuleList>
-    <parameterList>
-        <booleanParameter name="aosmodule_component_enabled" ask="0" value="1" />
-    </parameterList>
-    <initializationActionList>
-		<setInstallerVariable name="component(aosmodule).detailedDescription" value="Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation&#xa;(proprietary module licensed under the Alfresco Component License).">
-			<ruleList>
-                <compareText text="${alfresco_edition}" value="community"/>
-			</ruleList>
-		</setInstallerVariable>
-    </initializationActionList>
-    <folderList>
-        <folder>
-            <name>programfiles</name>
-            <description>Program Files</description>
-            <destination>${alfresco_amps_directory}</destination>
-            <platforms>all</platforms>
-            <distributionFileList>
-              <distributionFile origin="${aos_module_distribution_folder}/alfresco-aos-module-*.amp" allowWildcards="1" />
-            </distributionFileList>
-            <actionList>
-                <setInstallerVariable name="alfresco_apply_amps" value="1"/>
-            </actionList>
-        </folder>
-        <folder>
-            <name>vtibinwarfile</name>
-            <description>//War Files</description>
-            <destination>${installdiralfresco}</destination>
-            <distributionFileList>
-                <distributionFile origin="${aos_module_distribution_folder}/_vti_bin.war" allowWildcards="1" />
-            </distributionFileList>
-        </folder>
-        <folder>
-            <name>aosmodulecustomextensions</name>
-            <description>Program Files</description>
-            <destination>${alfresco_shared_directory}/alfresco/extension</destination>
-            <platforms>all</platforms>
-            <actionList>
-                <alfrescoConfigure alfrescoFiles="*/*"/>
-            </actionList>
-            <distributionFileList>
-                <distributionFile origin="${aos_module_distribution_folder}/extension/*" allowWildcards="1" />
-            </distributionFileList>
-        </folder>
-        <folder>
-            <name>aosmodulelicenses</name>
-            <description>//Alfresco Licenses</description>
-            <destination>${alfresco_base_application_directory}/licenses</destination>
-            <distributionFileList>
-                <distributionFile origin="${aos_module_distribution_folder}/*-license.txt" allowWildcards="1" />
-            </distributionFileList>
-        </folder>
-    </folderList>
-</component>
+<component>
+    <name>aosmodule</name>
+    <description>Alfresco Office Services</description>
+    <detailedDescription>Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation.</detailedDescription>
+    <canBeEdited>1</canBeEdited>
+    <selected>1</selected>
+    <show>1</show>
+    <shouldPackRuleList>
+        <isTrue value="${aosmodule_component_enabled}" />
+    </shouldPackRuleList>
+    <parameterList>
+        <booleanParameter name="aosmodule_component_enabled" ask="0" value="1" />
+    </parameterList>
+    <initializationActionList>
+		<setInstallerVariable name="component(aosmodule).detailedDescription" value="Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation&#xa;(proprietary module licensed under the Alfresco Component License).">
+			<ruleList>
+                <compareText text="${alfresco_edition}" value="community"/>
+			</ruleList>
+		</setInstallerVariable>
+    </initializationActionList>
+    <folderList>
+        <folder>
+            <name>programfiles</name>
+            <description>Program Files</description>
+            <destination>${alfresco_amps_directory}</destination>
+            <platforms>all</platforms>
+            <distributionFileList>
+              <distributionFile origin="${aos_module_distribution_folder}/alfresco-aos-module-*.amp" allowWildcards="1" />
+            </distributionFileList>
+            <actionList>
+                <setInstallerVariable name="alfresco_apply_amps" value="1"/>
+            </actionList>
+        </folder>
+        <folder>
+            <name>vtibinwarfile</name>
+            <description>//War Files</description>
+            <destination>${installdiralfresco}</destination>
+            <distributionFileList>
+                <distributionFile origin="${aos_module_distribution_folder}/_vti_bin.war" allowWildcards="1" />
+            </distributionFileList>
+        </folder>
+        <folder>
+            <name>aosmodulecustomextensions</name>
+            <description>Program Files</description>
+            <destination>${alfresco_shared_directory}/alfresco/extension</destination>
+            <platforms>all</platforms>
+            <actionList>
+                <alfrescoConfigure alfrescoFiles="*/*"/>
+            </actionList>
+            <distributionFileList>
+                <distributionFile origin="${aos_module_distribution_folder}/extension/*" allowWildcards="1" />
+            </distributionFileList>
+        </folder>
+        <folder>
+            <name>aosmodulelicenses</name>
+            <description>//Alfresco Licenses</description>
+            <destination>${alfresco_base_application_directory}/licenses</destination>
+            <distributionFileList>
+                <distributionFile origin="${aos_module_distribution_folder}/*-license.txt" allowWildcards="1" />
+            </distributionFileList>
+        </folder>
+    </folderList>
+</component>
diff --git a/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml b/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
index 4287bcce09..7329d91857 100644
--- a/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
+++ b/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
@@ -1,40 +1,40 @@
-<component>
-    <name>alfrescogoogledocs</name>
-    <description>Google Docs Integration</description>
-    <detailedDescription>Include Google Docs Integration Features.</detailedDescription>
-    <canBeEdited>1</canBeEdited>
-    <selected>1</selected>
-    <show>1</show>
-    <shouldPackRuleList>
-        <isTrue value="${alfrescogoogledocs_component_enabled}" />
-    </shouldPackRuleList>
-    <parameterList>
-        <booleanParameter name="alfrescogoogledocs_component_enabled" ask="0" value="1" />
-    </parameterList>
-    <folderList>
-        <folder>
-            <description>Program Files</description>
-            <destination>${alfresco_amps_directory}</destination>
-            <name>googledocs</name>
-            <platforms>all</platforms>
-            <distributionFileList>
-              <distributionFile origin="${alfresco_amps_source_directory}/alfresco-googledocs-repo-*.amp" allowWildcards="1" />
-            </distributionFileList>
-            <actionList>
-                <setInstallerVariable name="alfresco_apply_amps" value="1"/>
-            </actionList>
-        </folder>
-        <folder>
-            <description>Program Files</description>
-            <destination>${alfresco_amps_share_directory}</destination>
-            <name>googledocsshare</name>
-            <platforms>all</platforms>
-            <distributionFileList>
-              <distributionFile origin="${alfresco_amps_source_directory}/alfresco-googledocs-share-*.amp" allowWildcards="1" />
-            </distributionFileList>
-            <actionList>
-                <setInstallerVariable name="alfresco_apply_amps_share" value="1"/>
-            </actionList>
-        </folder>
-    </folderList>
+<component>
+    <name>alfrescogoogledocs</name>
+    <description>Google Docs Integration</description>
+    <detailedDescription>Include Google Docs Integration Features.</detailedDescription>
+    <canBeEdited>1</canBeEdited>
+    <selected>1</selected>
+    <show>1</show>
+    <shouldPackRuleList>
+        <isTrue value="${alfrescogoogledocs_component_enabled}" />
+    </shouldPackRuleList>
+    <parameterList>
+        <booleanParameter name="alfrescogoogledocs_component_enabled" ask="0" value="1" />
+    </parameterList>
+    <folderList>
+        <folder>
+            <description>Program Files</description>
+            <destination>${alfresco_amps_directory}</destination>
+            <name>googledocs</name>
+            <platforms>all</platforms>
+            <distributionFileList>
+              <distributionFile origin="${alfresco_amps_source_directory}/alfresco-googledocs-repo-*.amp" allowWildcards="1" />
+            </distributionFileList>
+            <actionList>
+                <setInstallerVariable name="alfresco_apply_amps" value="1"/>
+            </actionList>
+        </folder>
+        <folder>
+            <description>Program Files</description>
+            <destination>${alfresco_amps_share_directory}</destination>
+            <name>googledocsshare</name>
+            <platforms>all</platforms>
+            <distributionFileList>
+              <distributionFile origin="${alfresco_amps_source_directory}/alfresco-googledocs-share-*.amp" allowWildcards="1" />
+            </distributionFileList>
+            <actionList>
+                <setInstallerVariable name="alfresco_apply_amps_share" value="1"/>
+            </actionList>
+        </folder>
+    </folderList>
 </component>
\ No newline at end of file
diff --git a/installer-resources/src/main/resources/extract-binaries.xml b/installer-resources/src/main/resources/extract-binaries.xml
index 91467cddad..22eddb7f0c 100644
--- a/installer-resources/src/main/resources/extract-binaries.xml
+++ b/installer-resources/src/main/resources/extract-binaries.xml
@@ -1,175 +1,175 @@
-<project default="extract-all" xmlns:unless="ant:unless"  xmlns:if="ant:if" >
-
-    <target name="extract-all" depends="extract-binaries, extract-installbuilder"/>
-
-    <target name="extract-binaries">
-        <antcall target="all-binaries" unless:set="shareInstaller" />
-        <antcall target="share-binaries" if:set="shareInstaller" />
-    </target>
-
-    <target name="all-binaries" depends="extract-base, extract-platform"/>
-    <target name="share-binaries" depends="extract-base"/>
-
-    <target name="extract-base">
-        <extract-base-for targetPlatform="linux" unless:set="skipLinInstaller" />
-        <extract-base-for targetPlatform="win64" unless:set="skipWinInstaller" />
-    </target>
-
-    <target name="extract-platform">
-        <extract-platform-for targetPlatform="linux" unless:set="skipLinInstaller" />
-        <extract-platform-for targetPlatform="win64" unless:set="skipWinInstaller" />
-    </target>
-
-    <macrodef name="extract-base-for">
-        <attribute name="targetPlatform" />
-
-        <sequential>
-            <echo>Extracting binaries for @{targetPlatform}</echo>
-            <!-- Set binaries folder depending on the platform -->
-            <local name="bin.folder"/>
-            <condition property="bin.folder" value="${project.build.directory}/binaries-linux-x64">
-                <equals arg1="@{targetPlatform}" arg2="linux" />
-            </condition>
-            <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
-                <equals arg1="@{targetPlatform}" arg2="win64" />
-            </condition>
-
-            <!-- Accommodate poor Cygwin users -->
-            <pathconvert property="maven.localrepo" targetos="unix">
-                <map from="C:" to="/c" />
-                <map from="D:" to="/d" />
-                <map from="E:" to="/e" />
-                <path>
-                    <pathelement path="${settings.localRepository}"/>
-                </path>
-            </pathconvert>
-
-            <mkdir dir="${bin.folder}" />
-
-            <!-- Check if platform is windows -->
-            <local name="isPlatformWindows"/>
-            <condition property="isPlatformWindows">
-                <equals arg1="@{targetPlatform}" arg2="win64" />
-            </condition>
-
-            <echo>  Extracting Common...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}" unless:set="isPlatformWindows">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/alfresco/installer-common/${installer.common.version}/installer-common-${installer.common.version}-@{targetPlatform}.tgz" />
-            </exec>
-
-            <echo>  Extracting Tomcat...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-@{targetPlatform}.tgz" />
-            </exec>
-            <!-- Delete ROOT folder in Tomcat -->
-            <delete dir="${bin.folder}/apache-tomcat/webapps/ROOT"/>
-
-            <echo>  Extracting Java...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-@{targetPlatform}.tgz" />
-            </exec>
-
-            <echo>  Extracting Manager...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/alfresco/manager/${installer.manager.version}/manager-${installer.manager.version}-@{targetPlatform}.tgz" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="extract-platform-for">
-        <attribute name="targetPlatform" />
-
-        <sequential>
-            <echo>Extracting binaries for @{targetPlatform}</echo>
-            <!-- Set binaries folder depending on the platform -->
-            <local name="bin.folder"/>
-            <condition property="bin.folder" value="${project.build.directory}/binaries-linux-x64">
-                <equals arg1="@{targetPlatform}" arg2="linux" />
-            </condition>
-            <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
-                <equals arg1="@{targetPlatform}" arg2="win64" />
-            </condition>
-
-            <!-- LibreOffice is the same for win32 and win64 -->
-            <local name="isPlatformWindows"/>
-            <condition property="isPlatformWindows">
-                <equals arg1="@{targetPlatform}" arg2="win64" />
-            </condition>
-            <local name="libreoffice.platform"/>
-            <condition property="libreoffice.platform" value="windows" else="@{targetPlatform}">
-                <isset property="isPlatformWindows"/>
-            </condition>
-        	
-        	 <local name="alfrescoPdfRenderer.platform"/>
-        	 <condition property="alfrescoPdfRenderer.platform" value="win64" else="@{targetPlatform}">
-        	                <isset property="isPlatformWindows"/>
-        	  </condition>
-
-            <!-- Accommodate poor Cygwin users -->
-            <pathconvert property="maven.localrepo" targetos="unix">
-                <map from="C:" to="/c" />
-                <path>
-                    <pathelement path="${settings.localRepository}"/>
-                </path>
-            </pathconvert>
-
-            <mkdir dir="${bin.folder}" />
-
-            <echo>  Extracting PostgreSQL...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-@{targetPlatform}.tgz" />
-            </exec>
-
-            <echo>  Extracting LibreOffice...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" />
-            </exec>
-            
-            <echo>  Extracting ImageMagick...</echo>
-            <exec failonerror="true" executable="tar" dir="${bin.folder}">
-                <arg value="xf" />
-                <arg value="${maven.localrepo}/org/imagemagick/imagemagick-distribution/${installer.imagemagick.version}/imagemagick-distribution-${installer.imagemagick.version}-@{targetPlatform}.tgz" />
-            </exec>
-
-        	<mkdir dir="${bin.folder}/alfresco-pdf-renderer"/>
-        	<echo> Extracting Alfresco Pdf Renderer...</echo>
-        	<exec failonerror="true" executable="tar" dir="${bin.folder}/alfresco-pdf-renderer">
-        	    <arg value="xf" />
-        	    <arg value="${maven.localrepo}/org/alfresco/alfresco-pdf-renderer/${installer.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${installer.alfresco-pdf-renderer.version}-${alfrescoPdfRenderer.platform}.tgz" />
-        	</exec>
-
-        </sequential>
-    </macrodef>
-
-    <target name="extract-installbuilder">
-        <echo>  Check running platform for Installbuilder...</echo>
-        <condition property="runningPlatform" value="linux">
-            <os family="unix" />
-        </condition>
-        <condition property="runningPlatform" value="win">
-            <os family="windows" />
-        </condition>
-
-        <!-- Accommodate poor Cygwin users -->
-        <pathconvert property="maven.localrepo" targetos="unix">
-            <map from="C:" to="/c" />
-            <path>
-                <pathelement path="${settings.localRepository}"/>
-            </path>
-        </pathconvert>
-        
-        <echo>  Extracting Installbuilder...</echo>
-        <mkdir dir="${project.build.directory}/installbuilder" />
-        <exec failonerror="true" executable="tar" dir="${project.build.directory}/installbuilder">
-            <arg value="xzf" />
-            <arg value="${maven.localrepo}/com/bitnami/installbuilder/${installer.installbuilder.version}/installbuilder-${installer.installbuilder.version}-${runningPlatform}.tgz" />
-        </exec>
-    </target>
-
-</project>
+<project default="extract-all" xmlns:unless="ant:unless"  xmlns:if="ant:if" >
+
+    <target name="extract-all" depends="extract-binaries, extract-installbuilder"/>
+
+    <target name="extract-binaries">
+        <antcall target="all-binaries" unless:set="shareInstaller" />
+        <antcall target="share-binaries" if:set="shareInstaller" />
+    </target>
+
+    <target name="all-binaries" depends="extract-base, extract-platform"/>
+    <target name="share-binaries" depends="extract-base"/>
+
+    <target name="extract-base">
+        <extract-base-for targetPlatform="linux" unless:set="skipLinInstaller" />
+        <extract-base-for targetPlatform="win64" unless:set="skipWinInstaller" />
+    </target>
+
+    <target name="extract-platform">
+        <extract-platform-for targetPlatform="linux" unless:set="skipLinInstaller" />
+        <extract-platform-for targetPlatform="win64" unless:set="skipWinInstaller" />
+    </target>
+
+    <macrodef name="extract-base-for">
+        <attribute name="targetPlatform" />
+
+        <sequential>
+            <echo>Extracting binaries for @{targetPlatform}</echo>
+            <!-- Set binaries folder depending on the platform -->
+            <local name="bin.folder"/>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-linux-x64">
+                <equals arg1="@{targetPlatform}" arg2="linux" />
+            </condition>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
+                <equals arg1="@{targetPlatform}" arg2="win64" />
+            </condition>
+
+            <!-- Accommodate poor Cygwin users -->
+            <pathconvert property="maven.localrepo" targetos="unix">
+                <map from="C:" to="/c" />
+                <map from="D:" to="/d" />
+                <map from="E:" to="/e" />
+                <path>
+                    <pathelement path="${settings.localRepository}"/>
+                </path>
+            </pathconvert>
+
+            <mkdir dir="${bin.folder}" />
+
+            <!-- Check if platform is windows -->
+            <local name="isPlatformWindows"/>
+            <condition property="isPlatformWindows">
+                <equals arg1="@{targetPlatform}" arg2="win64" />
+            </condition>
+
+            <echo>  Extracting Common...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}" unless:set="isPlatformWindows">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/alfresco/installer-common/${installer.common.version}/installer-common-${installer.common.version}-@{targetPlatform}.tgz" />
+            </exec>
+
+            <echo>  Extracting Tomcat...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-@{targetPlatform}.tgz" />
+            </exec>
+            <!-- Delete ROOT folder in Tomcat -->
+            <delete dir="${bin.folder}/apache-tomcat/webapps/ROOT"/>
+
+            <echo>  Extracting Java...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-@{targetPlatform}.tgz" />
+            </exec>
+
+            <echo>  Extracting Manager...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/alfresco/manager/${installer.manager.version}/manager-${installer.manager.version}-@{targetPlatform}.tgz" />
+            </exec>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="extract-platform-for">
+        <attribute name="targetPlatform" />
+
+        <sequential>
+            <echo>Extracting binaries for @{targetPlatform}</echo>
+            <!-- Set binaries folder depending on the platform -->
+            <local name="bin.folder"/>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-linux-x64">
+                <equals arg1="@{targetPlatform}" arg2="linux" />
+            </condition>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
+                <equals arg1="@{targetPlatform}" arg2="win64" />
+            </condition>
+
+            <!-- LibreOffice is the same for win32 and win64 -->
+            <local name="isPlatformWindows"/>
+            <condition property="isPlatformWindows">
+                <equals arg1="@{targetPlatform}" arg2="win64" />
+            </condition>
+            <local name="libreoffice.platform"/>
+            <condition property="libreoffice.platform" value="windows" else="@{targetPlatform}">
+                <isset property="isPlatformWindows"/>
+            </condition>
+        	
+        	 <local name="alfrescoPdfRenderer.platform"/>
+        	 <condition property="alfrescoPdfRenderer.platform" value="win64" else="@{targetPlatform}">
+        	                <isset property="isPlatformWindows"/>
+        	  </condition>
+
+            <!-- Accommodate poor Cygwin users -->
+            <pathconvert property="maven.localrepo" targetos="unix">
+                <map from="C:" to="/c" />
+                <path>
+                    <pathelement path="${settings.localRepository}"/>
+                </path>
+            </pathconvert>
+
+            <mkdir dir="${bin.folder}" />
+
+            <echo>  Extracting PostgreSQL...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-@{targetPlatform}.tgz" />
+            </exec>
+
+            <echo>  Extracting LibreOffice...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" />
+            </exec>
+            
+            <echo>  Extracting ImageMagick...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/imagemagick/imagemagick-distribution/${installer.imagemagick.version}/imagemagick-distribution-${installer.imagemagick.version}-@{targetPlatform}.tgz" />
+            </exec>
+
+        	<mkdir dir="${bin.folder}/alfresco-pdf-renderer"/>
+        	<echo> Extracting Alfresco Pdf Renderer...</echo>
+        	<exec failonerror="true" executable="tar" dir="${bin.folder}/alfresco-pdf-renderer">
+        	    <arg value="xf" />
+        	    <arg value="${maven.localrepo}/org/alfresco/alfresco-pdf-renderer/${installer.alfresco-pdf-renderer.version}/alfresco-pdf-renderer-${installer.alfresco-pdf-renderer.version}-${alfrescoPdfRenderer.platform}.tgz" />
+        	</exec>
+
+        </sequential>
+    </macrodef>
+
+    <target name="extract-installbuilder">
+        <echo>  Check running platform for Installbuilder...</echo>
+        <condition property="runningPlatform" value="linux">
+            <os family="unix" />
+        </condition>
+        <condition property="runningPlatform" value="win">
+            <os family="windows" />
+        </condition>
+
+        <!-- Accommodate poor Cygwin users -->
+        <pathconvert property="maven.localrepo" targetos="unix">
+            <map from="C:" to="/c" />
+            <path>
+                <pathelement path="${settings.localRepository}"/>
+            </path>
+        </pathconvert>
+        
+        <echo>  Extracting Installbuilder...</echo>
+        <mkdir dir="${project.build.directory}/installbuilder" />
+        <exec failonerror="true" executable="tar" dir="${project.build.directory}/installbuilder">
+            <arg value="xzf" />
+            <arg value="${maven.localrepo}/com/bitnami/installbuilder/${installer.installbuilder.version}/installbuilder-${installer.installbuilder.version}-${runningPlatform}.tgz" />
+        </exec>
+    </target>
+
+</project>
diff --git a/pom.xml b/pom.xml
index fa3a6526b5..e7fdf31786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,315 +1,315 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>alfresco-super-pom</artifactId>
-        <version>6</version>
-    </parent>
-    <artifactId>full-community-packaging</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Alfresco Content Services Community Full Packaging</name>
-
-    <scm>
-        <connection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt</connection>
-        <developerConnection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.git</developerConnection>
-        <url>https://git.alfresco.com/Repository/full-community-packaging.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
-    <properties>
-        <!-- Community Packaging version -->
-        <dependency.acs-community-packaging.version>6.0.b-SNAPSHOT</dependency.acs-community-packaging.version>
-
-        <!-- Alfresco Share version -->
-        <alfresco.share.version>5.2.2-SNAPSHOT</alfresco.share.version>
-
-        <!-- Alfresco GoogleDocs integration version -->
-        <alfresco.googledocs.version>3.0.4.2</alfresco.googledocs.version>
-
-        <!-- Alfresco Office Services Module -->
-        <alfresco.aos-module.version>1.1.7</alfresco.aos-module.version>
-
-        <alfresco.solr.version>6.1</alfresco.solr.version>
-        <alfresco.solr4.version>6.5</alfresco.solr4.version>
-
-        <!-- Versions of binaries packaged in the installer -->
-        <installer.common.version>5.2-20170508</installer.common.version>
-        <installer.tomcat.version>7.0.59-alfresco-distribution</installer.tomcat.version>
-        <installer.java.version>1.8.0_111</installer.java.version>
-        <installer.postgresql.version>9.4.4-20151016</installer.postgresql.version>
-        <installer.libreoffice.version>5.2.1-alfresco</installer.libreoffice.version>
-        <installer.ghostscript.version>8.64</installer.ghostscript.version>
-        <installer.imagemagick.version>7.0.5</installer.imagemagick.version>
-        <installer.manager.version>1.0</installer.manager.version>
-        <installer.alfresco-pdf-renderer.version>1.0</installer.alfresco-pdf-renderer.version>
-
-        <!-- Build timestamp for installer file name -->
-        <installer.build.timestamp>${maven.build.timestamp}</installer.build.timestamp>
-        <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
-
-        <!-- Install builder version -->
-        <installer.installbuilder.version>15.10.1</installer.installbuilder.version>
-
-        <!--
-           Set externally as "-ea", "-ga", "-la" or left empty
-           As the releasable artifacts are never published to nexus, the version is affecting only filenames
-        -->
-        <alfresco.release.availability></alfresco.release.availability>
-        <installer.version.name>${project.version}${alfresco.release.availability}</installer.version.name>
-        <alfresco.package.name>alfresco-community</alfresco.package.name>
-        <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
-    </properties>
-
-    <modules>
-        <module>distribution</module>
-        <module>public-javadoc</module>
-        <module>installer-resources</module>
-        <module>installer</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Import packaging dependency management -->
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>acs-community-packaging</artifactId>
-                <version>${dependency.acs-community-packaging.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-content-services-community-distribution</artifactId>
-                <version>${dependency.acs-community-packaging.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.aos-module</groupId>
-                <artifactId>alfresco-aos-module</artifactId>
-                <version>${alfresco.aos-module.version}</version>
-                <type>amp</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.aos-module</groupId>
-                <artifactId>alfresco-aos-module-distributionzip</artifactId>
-                <version>${alfresco.aos-module.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.aos-module</groupId>
-                <artifactId>alfresco-vti-bin</artifactId>
-                <version>${alfresco.aos-module.version}</version>
-                <type>war</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-content-services-share-distribution</artifactId>
-                <version>${alfresco.share.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-share-services</artifactId>
-                <version>${alfresco.share.version}</version>
-                <type>amp</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>share</artifactId>
-                <version>${alfresco.share.version}</version>
-                <type>war</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-solr1-distribution</artifactId>
-                <version>${alfresco.solr.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-solr4-distribution</artifactId>
-                <version>${alfresco.solr4.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-wcmqs-distribution</artifactId>
-                <version>${alfresco.share.version}</version>
-                <type>zip</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-wcmqs-web</artifactId>
-                <version>${alfresco.share.version}</version>
-                <classifier>classes</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-wcmqs-client-api</artifactId>
-                <version>${alfresco.share.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.integrations</groupId>
-                <artifactId>alfresco-googledocs-repo</artifactId>
-                <version>${alfresco.googledocs.version}</version>
-                <type>amp</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.integrations</groupId>
-                <artifactId>alfresco-googledocs-share</artifactId>
-                <version>${alfresco.googledocs.version}</version>
-                <type>amp</type>
-            </dependency>
-
-            <!-- Common -->
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>installer-common</artifactId>
-                <version>${installer.common.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- Tomcat -->
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tomcat</artifactId>
-                <version>${installer.tomcat.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tomcat</artifactId>
-                <version>${installer.tomcat.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- PostgreSQL -->
-            <dependency>
-                <groupId>org.postgresql</groupId>
-                <artifactId>postgresql-distribution</artifactId>
-                <version>${installer.postgresql.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.postgresql</groupId>
-                <artifactId>postgresql-distribution</artifactId>
-                <version>${installer.postgresql.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- Java -->
-            <dependency>
-                <groupId>com.oracle.java</groupId>
-                <artifactId>jre</artifactId>
-                <version>${installer.java.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>com.oracle.java</groupId>
-                <artifactId>jre</artifactId>
-                <version>${installer.java.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- LibreOffice -->
-            <dependency>
-                <groupId>org.libreoffice</groupId>
-                <artifactId>libreoffice-dist</artifactId>
-                <version>${installer.libreoffice.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.libreoffice</groupId>
-                <artifactId>libreoffice-dist</artifactId>
-                <version>${installer.libreoffice.version}</version>
-                <classifier>windows</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- Alfresco Pdf Renderer -->
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-pdf-renderer</artifactId>
-                <version>${installer.alfresco-pdf-renderer.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>alfresco-pdf-renderer</artifactId>
-                <version>${installer.alfresco-pdf-renderer.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- ImageMagick -->
-            <dependency>
-                <groupId>org.imagemagick</groupId>
-                <artifactId>imagemagick-distribution</artifactId>
-                <version>${installer.imagemagick.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.imagemagick</groupId>
-                <artifactId>imagemagick-distribution</artifactId>
-                <version>${installer.imagemagick.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- Installbuilder -->
-            <dependency>
-                <groupId>com.bitnami</groupId>
-                <artifactId>installbuilder</artifactId>
-                <version>${installer.installbuilder.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>com.bitnami</groupId>
-                <artifactId>installbuilder</artifactId>
-                <version>${installer.installbuilder.version}</version>
-                <classifier>win</classifier>
-                <type>tgz</type>
-            </dependency>
-
-            <!-- Manager -->
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>manager</artifactId>
-                <version>${installer.manager.version}</version>
-                <classifier>linux</classifier>
-                <type>tgz</type>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco</groupId>
-                <artifactId>manager</artifactId>
-                <version>${installer.manager.version}</version>
-                <classifier>win64</classifier>
-                <type>tgz</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <distributionManagement>
-        <repository>
-            <id>alfresco-internal</id>
-            <url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>alfresco-internal-snapshots</id>
-            <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-super-pom</artifactId>
+        <version>6</version>
+    </parent>
+    <artifactId>full-community-packaging</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Alfresco Content Services Community Full Packaging</name>
+
+    <scm>
+        <connection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt</connection>
+        <developerConnection>scm:git:https://git.alfresco.com/Repository/full-community-packaging.git</developerConnection>
+        <url>https://git.alfresco.com/Repository/full-community-packaging.git</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <!-- Community Packaging version -->
+        <dependency.acs-community-packaging.version>6.0.b-SNAPSHOT</dependency.acs-community-packaging.version>
+
+        <!-- Alfresco Share version -->
+        <alfresco.share.version>5.2.2-SNAPSHOT</alfresco.share.version>
+
+        <!-- Alfresco GoogleDocs integration version -->
+        <alfresco.googledocs.version>3.0.4.2</alfresco.googledocs.version>
+
+        <!-- Alfresco Office Services Module -->
+        <alfresco.aos-module.version>1.1.7</alfresco.aos-module.version>
+
+        <alfresco.solr.version>6.1</alfresco.solr.version>
+        <alfresco.solr4.version>6.5</alfresco.solr4.version>
+
+        <!-- Versions of binaries packaged in the installer -->
+        <installer.common.version>5.2-20170508</installer.common.version>
+        <installer.tomcat.version>7.0.59-alfresco-distribution</installer.tomcat.version>
+        <installer.java.version>1.8.0_111</installer.java.version>
+        <installer.postgresql.version>9.4.4-20151016</installer.postgresql.version>
+        <installer.libreoffice.version>5.2.1-alfresco</installer.libreoffice.version>
+        <installer.ghostscript.version>8.64</installer.ghostscript.version>
+        <installer.imagemagick.version>7.0.5</installer.imagemagick.version>
+        <installer.manager.version>1.0</installer.manager.version>
+        <installer.alfresco-pdf-renderer.version>1.0</installer.alfresco-pdf-renderer.version>
+
+        <!-- Build timestamp for installer file name -->
+        <installer.build.timestamp>${maven.build.timestamp}</installer.build.timestamp>
+        <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
+
+        <!-- Install builder version -->
+        <installer.installbuilder.version>15.10.1</installer.installbuilder.version>
+
+        <!--
+           Set externally as "-ea", "-ga", "-la" or left empty
+           As the releasable artifacts are never published to nexus, the version is affecting only filenames
+        -->
+        <alfresco.release.availability></alfresco.release.availability>
+        <installer.version.name>${project.version}${alfresco.release.availability}</installer.version.name>
+        <alfresco.package.name>alfresco-community</alfresco.package.name>
+        <alfresco.distribution.name>${alfresco.package.name}-distribution</alfresco.distribution.name>
+    </properties>
+
+    <modules>
+        <module>distribution</module>
+        <module>public-javadoc</module>
+        <module>installer-resources</module>
+        <module>installer</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Import packaging dependency management -->
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>acs-community-packaging</artifactId>
+                <version>${dependency.acs-community-packaging.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-content-services-community-distribution</artifactId>
+                <version>${dependency.acs-community-packaging.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.aos-module</groupId>
+                <artifactId>alfresco-aos-module</artifactId>
+                <version>${alfresco.aos-module.version}</version>
+                <type>amp</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.aos-module</groupId>
+                <artifactId>alfresco-aos-module-distributionzip</artifactId>
+                <version>${alfresco.aos-module.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.aos-module</groupId>
+                <artifactId>alfresco-vti-bin</artifactId>
+                <version>${alfresco.aos-module.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-content-services-share-distribution</artifactId>
+                <version>${alfresco.share.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-share-services</artifactId>
+                <version>${alfresco.share.version}</version>
+                <type>amp</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>share</artifactId>
+                <version>${alfresco.share.version}</version>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-solr1-distribution</artifactId>
+                <version>${alfresco.solr.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-solr4-distribution</artifactId>
+                <version>${alfresco.solr4.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-wcmqs-distribution</artifactId>
+                <version>${alfresco.share.version}</version>
+                <type>zip</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-wcmqs-web</artifactId>
+                <version>${alfresco.share.version}</version>
+                <classifier>classes</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-wcmqs-client-api</artifactId>
+                <version>${alfresco.share.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.integrations</groupId>
+                <artifactId>alfresco-googledocs-repo</artifactId>
+                <version>${alfresco.googledocs.version}</version>
+                <type>amp</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.integrations</groupId>
+                <artifactId>alfresco-googledocs-share</artifactId>
+                <version>${alfresco.googledocs.version}</version>
+                <type>amp</type>
+            </dependency>
+
+            <!-- Common -->
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>installer-common</artifactId>
+                <version>${installer.common.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- Tomcat -->
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat</artifactId>
+                <version>${installer.tomcat.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat</artifactId>
+                <version>${installer.tomcat.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- PostgreSQL -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql-distribution</artifactId>
+                <version>${installer.postgresql.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql-distribution</artifactId>
+                <version>${installer.postgresql.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- Java -->
+            <dependency>
+                <groupId>com.oracle.java</groupId>
+                <artifactId>jre</artifactId>
+                <version>${installer.java.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>com.oracle.java</groupId>
+                <artifactId>jre</artifactId>
+                <version>${installer.java.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- LibreOffice -->
+            <dependency>
+                <groupId>org.libreoffice</groupId>
+                <artifactId>libreoffice-dist</artifactId>
+                <version>${installer.libreoffice.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.libreoffice</groupId>
+                <artifactId>libreoffice-dist</artifactId>
+                <version>${installer.libreoffice.version}</version>
+                <classifier>windows</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- Alfresco Pdf Renderer -->
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-pdf-renderer</artifactId>
+                <version>${installer.alfresco-pdf-renderer.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-pdf-renderer</artifactId>
+                <version>${installer.alfresco-pdf-renderer.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- ImageMagick -->
+            <dependency>
+                <groupId>org.imagemagick</groupId>
+                <artifactId>imagemagick-distribution</artifactId>
+                <version>${installer.imagemagick.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.imagemagick</groupId>
+                <artifactId>imagemagick-distribution</artifactId>
+                <version>${installer.imagemagick.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- Installbuilder -->
+            <dependency>
+                <groupId>com.bitnami</groupId>
+                <artifactId>installbuilder</artifactId>
+                <version>${installer.installbuilder.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>com.bitnami</groupId>
+                <artifactId>installbuilder</artifactId>
+                <version>${installer.installbuilder.version}</version>
+                <classifier>win</classifier>
+                <type>tgz</type>
+            </dependency>
+
+            <!-- Manager -->
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>manager</artifactId>
+                <version>${installer.manager.version}</version>
+                <classifier>linux</classifier>
+                <type>tgz</type>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>manager</artifactId>
+                <version>${installer.manager.version}</version>
+                <classifier>win64</classifier>
+                <type>tgz</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <distributionManagement>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases</url>
+        </repository>
+        <snapshotRepository>
+            <id>alfresco-internal-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+</project>