From d856fd82928f5f8c5180b228e4dbc6408d68132d Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 13 Oct 2017 10:51:21 +0100
Subject: [PATCH 01/12] REPO-2941 Rename artefacts to contain ea in artefact
 ids

---
 docker/pom.xml | 8 ++++----
 pom.xml        | 2 +-
 war/pom.xml    | 4 ++--
 zip/pom.xml    | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index 2b7c6fa0f6..949a005e84 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -1,12 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker</artifactId>
+    <artifactId>content-services-community-docker-ea</artifactId>
     <name>Alfresco Content Services Community Docker image builder</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
+        <artifactId>acs-community-packaging-ea</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
+            <artifactId>content-services-community-ea</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -52,7 +52,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>content-services-community</artifactId>
+                                    <artifactId>content-services-community-ea</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
diff --git a/pom.xml b/pom.xml
index 2d9a5fa25e..9eac02eeed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>acs-community-packaging</artifactId>
+    <artifactId>acs-community-packaging-ea</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
     <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/war/pom.xml b/war/pom.xml
index 58f62ea49a..73ced7cfe8 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -1,12 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community</artifactId>
+    <artifactId>content-services-community-ea</artifactId>
     <name>Alfresco Content Services Community WAR</name>
     <packaging>war</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
+        <artifactId>acs-community-packaging-ea</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/zip/pom.xml b/zip/pom.xml
index be2030ba5b..c9ba0a872c 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -1,13 +1,13 @@
 <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-content-services-community-distribution</artifactId>
+    <artifactId>alfresco-content-services-community-distribution-ea</artifactId>
     <packaging>jar</packaging>
     <name>Alfresco Content Services Community WAR Installation</name>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
+        <artifactId>acs-community-packaging-ea</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -16,7 +16,7 @@
         <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
+            <artifactId>content-services-community-ea</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
+            <artifactId>content-services-community-ea</artifactId>
             <version>${project.version}</version>
             <classifier>classes</classifier>
         </dependency>

From a5a23b86e30824d706c1e26e3208d62823ed4787 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 13 Oct 2017 14:18:28 +0100
Subject: [PATCH 02/12] REPO-2942 Change version edition to contain early
 access text

---
 war/src/main/resources/alfresco/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/war/src/main/resources/alfresco/version.properties b/war/src/main/resources/alfresco/version.properties
index eb8c292d79..6f472fbc6c 100644
--- a/war/src/main/resources/alfresco/version.properties
+++ b/war/src/main/resources/alfresco/version.properties
@@ -11,7 +11,7 @@ version.label=
 
 # Edition label
 
-version.edition=Community
+version.edition=Community Early Access
 
 # SCM Revision number
 

From 1d468186836bc742ee3657c7f8db2e6bf9410eae Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Mon, 16 Oct 2017 15:15:48 +0100
Subject: [PATCH 03/12] Revert "REPO-2941 Rename artefacts to contain ea in
 artefact ids"

This reverts commit d856fd82928f5f8c5180b228e4dbc6408d68132d.
Removing wrong approach.
---
 docker/pom.xml | 8 ++++----
 pom.xml        | 2 +-
 war/pom.xml    | 4 ++--
 zip/pom.xml    | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index 949a005e84..2b7c6fa0f6 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -1,12 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker-ea</artifactId>
+    <artifactId>content-services-community-docker</artifactId>
     <name>Alfresco Content Services Community Docker image builder</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -52,7 +52,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
-                                    <artifactId>content-services-community-ea</artifactId>
+                                    <artifactId>content-services-community</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
diff --git a/pom.xml b/pom.xml
index 9eac02eeed..2d9a5fa25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>acs-community-packaging-ea</artifactId>
+    <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
     <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
diff --git a/war/pom.xml b/war/pom.xml
index 73ced7cfe8..58f62ea49a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -1,12 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-ea</artifactId>
+    <artifactId>content-services-community</artifactId>
     <name>Alfresco Content Services Community WAR</name>
     <packaging>war</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
diff --git a/zip/pom.xml b/zip/pom.xml
index c9ba0a872c..be2030ba5b 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -1,13 +1,13 @@
 <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-content-services-community-distribution-ea</artifactId>
+    <artifactId>alfresco-content-services-community-distribution</artifactId>
     <packaging>jar</packaging>
     <name>Alfresco Content Services Community WAR Installation</name>
 
     <parent>
         <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging-ea</artifactId>
+        <artifactId>acs-community-packaging</artifactId>
         <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -16,7 +16,7 @@
         <!-- WAR files -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community-ea</artifactId>
+            <artifactId>content-services-community</artifactId>
             <version>${project.version}</version>
             <classifier>classes</classifier>
         </dependency>

From ace9edc787a2b6ea75bbd2e4bf40c00f5c05e2fd Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Mon, 16 Oct 2017 15:35:10 +0100
Subject: [PATCH 04/12] REPO-2942 Make early access text configurable in
 version.properties

---
 pom.xml                                            | 3 +++
 war/src/main/resources/alfresco/version.properties | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d9a5fa25e..4aa37ea5fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,9 @@
 
 
     <properties>
+        <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
+        <release.availability></release.availability>
+
         <dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version>
         <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
         <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
diff --git a/war/src/main/resources/alfresco/version.properties b/war/src/main/resources/alfresco/version.properties
index 6f472fbc6c..2e33d2c663 100644
--- a/war/src/main/resources/alfresco/version.properties
+++ b/war/src/main/resources/alfresco/version.properties
@@ -11,7 +11,7 @@ version.label=
 
 # Edition label
 
-version.edition=Community Early Access
+version.edition=Community @release.availability@
 
 # SCM Revision number
 

From 8952b2916e64f769d9e5042dab6abb77f31e890a Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Tue, 17 Oct 2017 13:24:23 +0100
Subject: [PATCH 05/12] [maven-release-plugin] prepare release
 acs-community-packaging-6.0.0-ea-test

---
 docker/pom.xml |   2 +-
 pom.xml        |   6 +-
 war/pom.xml    |   2 +-
 zip/pom.xml    | 369 ++++++++++++++++++++++++-------------------------
 4 files changed, 189 insertions(+), 190 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index 2b7c6fa0f6..cea8029cbb 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-ea-test</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 4aa37ea5fc..373451e215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-ea-test</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -21,7 +21,7 @@
         <connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>HEAD</tag>
+        <tag>acs-community-packaging-6.0.0-ea-test</tag>
     </scm>
 
     <distributionManagement>
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
-        <release.availability></release.availability>
+        <release.availability />
 
         <dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version>
         <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
diff --git a/war/pom.xml b/war/pom.xml
index 58f62ea49a..2d223d975a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-ea-test</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index be2030ba5b..5aa0cf28d8 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -1,186 +1,185 @@
-<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-content-services-community-distribution</artifactId>
-    <packaging>jar</packaging>
-    <name>Alfresco Content Services Community WAR Installation</name>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <!-- WAR files -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <type>war</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-mmt</artifactId>
-        </dependency>
-
-        <!-- JAR files, to extract alfresco/extension -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-repository</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <version>${project.version}</version>
-            <classifier>classes</classifier>
-        </dependency>
-
-        <!-- 3rd party libs -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${dependency.postgresql.version}</version>
-        </dependency>
-
-        <!-- Alfresco Pdf Renderer -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>linux</classifier>
-            <type>tgz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>win64</classifier>
-            <type>tgz</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <!-- Filtering is required to make maven substitute variables in resources -->
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <!-- Extract keystore from alfresco-repository -->
-                    <execution>
-                        <id>extract-keystore</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-repository</artifactId>
-                                    <includes>alfresco/keystore/**</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                    <!-- Extract JLAN DLLs -->
-                    <execution>
-                        <id>extract-jlan-dll</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-jlan-embed</artifactId>
-                                    <classifier>windll</classifier>
-                                    <includes>*.dll</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    
-                    <!-- Copy ROOT.war -->
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-server-root</artifactId>
-                                    <type>war</type>
-                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
-                                    <destFileName>ROOT.war</destFileName>
-                                </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>
-                    </execution>
-                </executions>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/assemblies/distribution.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <!-- Package distribution assembly descriptor, to be reused by Enterprise -->
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-assembly-descriptor</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>assembly</classifier>
-                            <classesDirectory>${basedir}/src</classesDirectory>
-                            <includes>
-                                <include>assemblies/*</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+<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-content-services-community-distribution</artifactId>
+    <packaging>jar</packaging>
+    <name>Alfresco Content Services Community WAR Installation</name>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>acs-community-packaging</artifactId>
+        <version>6.0.0-ea-test</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <!-- WAR files -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>content-services-community</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-server-root</artifactId>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-mmt</artifactId>
+        </dependency>
+
+        <!-- JAR files, to extract alfresco/extension -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-repository</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-data-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>content-services-community</artifactId>
+            <version>${project.version}</version>
+            <classifier>classes</classifier>
+        </dependency>
+
+        <!-- 3rd party libs -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+        </dependency>
+
+        <!-- Alfresco Pdf Renderer -->
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>linux</classifier>
+            <type>tgz</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-pdf-renderer</artifactId>
+            <classifier>win64</classifier>
+            <type>tgz</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <!-- Filtering is required to make maven substitute variables in resources -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!-- Extract keystore from alfresco-repository -->
+                    <execution>
+                        <id>extract-keystore</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-repository</artifactId>
+                                    <includes>alfresco/keystore/**</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+
+                    <!-- Extract JLAN DLLs -->
+                    <execution>
+                        <id>extract-jlan-dll</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-jlan-embed</artifactId>
+                                    <classifier>windll</classifier>
+                                    <includes>*.dll</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    
+                    <!-- Copy ROOT.war -->
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-server-root</artifactId>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.outputDirectory}/web-server/webapps</outputDirectory>
+                                    <destFileName>ROOT.war</destFileName>
+                                </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>
+                    </execution>
+                </executions>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/assemblies/distribution.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <!-- Package distribution assembly descriptor, to be reused by Enterprise -->
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-assembly-descriptor</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>assembly</classifier>
+                            <classesDirectory>${basedir}/src</classesDirectory>
+                            <includes>
+                                <include>assemblies/*</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file

From edef98f062755e98b69cfe79341fe897ad10716c Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Tue, 17 Oct 2017 13:24:31 +0100
Subject: [PATCH 06/12] [maven-release-plugin] prepare for next development
 iteration

---
 docker/pom.xml | 2 +-
 pom.xml        | 4 ++--
 war/pom.xml    | 2 +-
 zip/pom.xml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index cea8029cbb..2b7c6fa0f6 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 373451e215..3f51b2c7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>6.0.0-ea-test</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -21,7 +21,7 @@
         <connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>acs-community-packaging-6.0.0-ea-test</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/war/pom.xml b/war/pom.xml
index 2d223d975a..58f62ea49a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index 5aa0cf28d8..8348f4ecc9 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

From 582889816633ab56e4972f1e6bd1ed6f4bd40f12 Mon Sep 17 00:00:00 2001
From: alfresco-build <build@alfresco.com>
Date: Tue, 17 Oct 2017 15:33:54 +0000
Subject: [PATCH 07/12] [maven-release-plugin] prepare release
 acs-community-packaging-6.0.0-ea-test2

---
 docker/pom.xml | 2 +-
 pom.xml        | 4 ++--
 war/pom.xml    | 2 +-
 zip/pom.xml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index 2b7c6fa0f6..da5573b713 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-ea-test2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 3f51b2c7e6..ee4652f942 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-ea-test2</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -21,7 +21,7 @@
         <connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>HEAD</tag>
+        <tag>acs-community-packaging-6.0.0-ea-test2</tag>
     </scm>
 
     <distributionManagement>
diff --git a/war/pom.xml b/war/pom.xml
index 58f62ea49a..5888a8ea6e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-ea-test2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index 8348f4ecc9..d53279a4eb 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-ea-test2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

From 2d4b8832e668a32ba3f5ca625683b8c994261eb5 Mon Sep 17 00:00:00 2001
From: alfresco-build <build@alfresco.com>
Date: Tue, 17 Oct 2017 15:34:00 +0000
Subject: [PATCH 08/12] [maven-release-plugin] prepare for next development
 iteration

---
 docker/pom.xml | 2 +-
 pom.xml        | 4 ++--
 war/pom.xml    | 2 +-
 zip/pom.xml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index da5573b713..2b7c6fa0f6 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test2</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index ee4652f942..3f51b2c7e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>acs-community-packaging</artifactId>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>6.0.0-ea-test2</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -21,7 +21,7 @@
         <connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>acs-community-packaging-6.0.0-ea-test2</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
diff --git a/war/pom.xml b/war/pom.xml
index 5888a8ea6e..58f62ea49a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test2</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index d53279a4eb..8348f4ecc9 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.0-ea-test2</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

From 896b35e2c08e40bcc42e3bb46182c467a798dec7 Mon Sep 17 00:00:00 2001
From: Martin Muller <martin.muller@alfresco.com>
Date: Wed, 18 Oct 2017 16:50:29 +0100
Subject: [PATCH 09/12] Set alfresco-repository to last released version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f51b2c7e6..05d999d0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
         <release.availability />
 
-        <dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version>
+        <dependency.alfresco-repository.version>6.8</dependency.alfresco-repository.version>
         <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
         <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
         <dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>

From cbc2eba7b0087d0bd8ba1a7bf499a164bde2a235 Mon Sep 17 00:00:00 2001
From: Andrei Rebegea <andrei.rebegea@ness.com>
Date: Wed, 18 Oct 2017 18:52:29 +0300
Subject: [PATCH 10/12] REPO-2025: update dependecies

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f51b2c7e6..9b1e87ae5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,11 +40,11 @@
         <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
         <release.availability />
 
-        <dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version>
-        <dependency.alfresco-remote-api.version>6.2</dependency.alfresco-remote-api.version>
+        <dependency.alfresco-repository.version>6.8</dependency.alfresco-repository.version>
+        <dependency.alfresco-remote-api.version>6.3</dependency.alfresco-remote-api.version>
         <dependency.alfresco-trashcan-cleaner.version>2.2</dependency.alfresco-trashcan-cleaner.version>
-        <dependency.alfresco-core.version>6.13</dependency.alfresco-core.version>
-        <dependency.alfresco-data-model.version>6.19</dependency.alfresco-data-model.version>
+        <dependency.alfresco-core.version>6.14</dependency.alfresco-core.version>
+        <dependency.alfresco-data-model.version>6.21</dependency.alfresco-data-model.version>
         <dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
         <dependency.alfresco-pdf-renderer.version>1.0</dependency.alfresco-pdf-renderer.version>
         <dependency.alfresco-jlan.version>6.3</dependency.alfresco-jlan.version>

From 6f1bb6a909bc0b9b4507528a12b38476f9d91711 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 20 Oct 2017 17:25:31 +0100
Subject: [PATCH 11/12] REPO-2942 Remove whitespace before release availability
 placeholder

---
 pom.xml                                            | 2 +-
 war/src/main/resources/alfresco/version.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9b1e87ae5e..dc3ff7e47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 
 
     <properties>
-        <!-- Set to "Early Access" to add to the version.edition property in version.properties -->
+        <!-- Set to " Early Access" to add to the version.edition property in version.properties -->
         <release.availability />
 
         <dependency.alfresco-repository.version>6.8</dependency.alfresco-repository.version>
diff --git a/war/src/main/resources/alfresco/version.properties b/war/src/main/resources/alfresco/version.properties
index 2e33d2c663..e4d26cd1ed 100644
--- a/war/src/main/resources/alfresco/version.properties
+++ b/war/src/main/resources/alfresco/version.properties
@@ -11,7 +11,7 @@ version.label=
 
 # Edition label
 
-version.edition=Community @release.availability@
+version.edition=Community@release.availability@
 
 # SCM Revision number
 

From be2e47da890b9711ed7b34e7098d092d20e15cfe Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Fri, 20 Oct 2017 18:03:21 +0100
Subject: [PATCH 12/12] REPO-2942 Change version.edition variable to avoid
 whitespace problems

---
 pom.xml                                            | 4 ++--
 war/src/main/resources/alfresco/version.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc3ff7e47a..8286456bba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,8 +37,8 @@
 
 
     <properties>
-        <!-- Set to " Early Access" to add to the version.edition property in version.properties -->
-        <release.availability />
+        <!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
+        <version.edition>Community</version.edition>
 
         <dependency.alfresco-repository.version>6.8</dependency.alfresco-repository.version>
         <dependency.alfresco-remote-api.version>6.3</dependency.alfresco-remote-api.version>
diff --git a/war/src/main/resources/alfresco/version.properties b/war/src/main/resources/alfresco/version.properties
index e4d26cd1ed..39f1117e9a 100644
--- a/war/src/main/resources/alfresco/version.properties
+++ b/war/src/main/resources/alfresco/version.properties
@@ -11,7 +11,7 @@ version.label=
 
 # Edition label
 
-version.edition=Community@release.availability@
+version.edition=@version.edition@
 
 # SCM Revision number