Merge branch 'develop' into feature/REPO-2627_Cluster-Test

# Conflicts:
#	zip/pom.xml

pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
-        <version>8</version>
+        <version>9</version>
     </parent>
 
     <modules>
@@ -37,7 +37,10 @@
 
 
     <properties>
-        <dependency.alfresco-repository.version>6.4</dependency.alfresco-repository.version>
+        <!-- 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>
         <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>

war/src/main/resources/alfresco/version.properties

@@ -11,7 +11,7 @@ version.label=
 
 # Edition label
 
-version.edition=Community
+version.edition=Community @release.availability@
 
 # SCM Revision number
 

zip/pom.xml

@@ -182,4 +182,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>