From e2fea4b707cdd4f549b6ed965d723cb5aa27f40a Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Thu, 14 Sep 2017 13:18:06 +0100
Subject: [PATCH 01/10] REPO-2815 Update project version to 6.0.b

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

diff --git a/pom.xml b/pom.xml
index 31e8b6cd2c..ec0ab9e6c1 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.a-SNAPSHOT</version>
+    <version>6.0.b-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/war/pom.xml b/war/pom.xml
index 6486c4afbf..98befc548c 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.a-SNAPSHOT</version>
+        <version>6.0.b-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index ee8a2cc871..e9ec210e60 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.a-SNAPSHOT</version>
+        <version>6.0.b-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

From b654b5175dfc8100321f843b44be84263830a9b2 Mon Sep 17 00:00:00 2001
From: Alex Mukha <killerboot@users.noreply.github.com>
Date: Mon, 18 Sep 2017 11:05:20 +0100
Subject: [PATCH 02/10] REPO-2907 Add config for Docker images

---
 docker/Dockerfile | 11 +++++++
 docker/pom.xml    | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml           |  1 +
 3 files changed, 93 insertions(+)
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/pom.xml

diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000..e54e111a98
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,11 @@
+FROM tomcat:8.5.20-jre8
+
+RUN mkdir -p /usr/local/tomcat/shared/classes
+
+RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
+
+COPY target/war/alfresco.war /usr/local/tomcat/webapps/alfresco.war
+COPY target/connector/* /usr/local/tomcat/lib/
+
+RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties
+
diff --git a/docker/pom.xml b/docker/pom.xml
new file mode 100644
index 0000000000..7bf7f9df4e
--- /dev/null
+++ b/docker/pom.xml
@@ -0,0 +1,81 @@
+<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>
+    <name>Alfresco Content Services Community Docker image builder</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>acs-community-packaging</artifactId>
+        <version>6.0.b-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>content-services-community</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${dependency.mysql.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${dependency.postgresql.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>content-services-community</artifactId>
+                            <version>${project.version}</version>
+                            <type>war</type>
+                            <overWrite>false</overWrite>
+                            <outputDirectory>${project.build.directory}/war</outputDirectory>
+                            <destFileName>alfresco.war</destFileName>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>mysql</groupId>
+                            <artifactId>mysql-connector-java</artifactId>
+                            <type>jar</type>
+                            <overWrite>false</overWrite>
+                            <outputDirectory>${project.build.directory}/connector</outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.postgresql</groupId>
+                            <artifactId>postgresql</artifactId>
+                            <version>${dependency.postgresql.version}</version>
+                            <type>jar</type>
+                            <overWrite>false</overWrite>
+                            <outputDirectory>${project.build.directory}/connector</outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                </configuration>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ec0ab9e6c1..ed070c50aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <modules>
         <module>war</module>
         <module>zip</module>
+        <module>docker</module>
     </modules>
 
     <scm>

From 9aa854f384500a31dd50ae57e718661b8ac4ed6a Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 20 Sep 2017 14:34:33 +0100
Subject: [PATCH 03/10] REPO-2921 Put a .gitbugtraq file in all develop
 Branches

---
 .gitbugtraq | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitbugtraq

diff --git a/.gitbugtraq b/.gitbugtraq
new file mode 100644
index 0000000000..bacffb702d
--- /dev/null
+++ b/.gitbugtraq
@@ -0,0 +1,4 @@
+# For SmartGit
+[bugtraq "jira"]
+ url = https://issues.alfresco.com/jira/browse/%BUGID%
+ logRegex = ([A-Z]+-\\d+)

From 41a92023b61db2c15ea79d2ff14621e21a1a0ec0 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Wed, 20 Sep 2017 22:10:41 +0100
Subject: [PATCH 04/10] REPO-2915 Put exploded war into Docker

---
 docker/Dockerfile | 2 +-
 docker/pom.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e54e111a98..75304eb8f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /usr/local/tomcat/shared/classes
 
 RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
 
-COPY target/war/alfresco.war /usr/local/tomcat/webapps/alfresco.war
+COPY target/war /usr/local/tomcat/webapps
 COPY target/connector/* /usr/local/tomcat/lib/
 
 RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties
diff --git a/docker/pom.xml b/docker/pom.xml
index 7bf7f9df4e..d0cead9e69 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -41,7 +41,7 @@
                         <id>copy-resources</id>
                         <phase>process-resources</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>unpack</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -53,7 +53,7 @@
                             <version>${project.version}</version>
                             <type>war</type>
                             <overWrite>false</overWrite>
-                            <outputDirectory>${project.build.directory}/war</outputDirectory>
+                            <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
                             <destFileName>alfresco.war</destFileName>
                         </artifactItem>
                         <artifactItem>

From 270358dc1844cc3bf950ffd710d7f5346068e0b7 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Wed, 20 Sep 2017 22:11:50 +0100
Subject: [PATCH 05/10] REPO-2915 Use alpine Docker image

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 75304eb8f2..40dfaebe84 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:8.5.20-jre8
+FROM tomcat:8.5.20-jre8-alpine
 
 RUN mkdir -p /usr/local/tomcat/shared/classes
 

From bc540ddf0ec408a8b654b57b3a96c7c1980bc864 Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Thu, 21 Sep 2017 00:02:51 +0100
Subject: [PATCH 06/10] REPO-2915 Fix artefact unpack/copy for Docker image

---
 docker/pom.xml | 69 +++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/docker/pom.xml b/docker/pom.xml
index d0cead9e69..ef452fe3d3 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -38,41 +38,52 @@
                 <version>3.0.2</version>
                 <executions>
                     <execution>
-                        <id>copy-resources</id>
+                        <id>unpack-resources</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>content-services-community</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
+                                    <destFileName>alfresco.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>mysql</groupId>
+                                    <artifactId>mysql-connector-java</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/connector</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.postgresql</groupId>
+                                    <artifactId>postgresql</artifactId>
+                                    <version>${dependency.postgresql.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/connector</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>content-services-community</artifactId>
-                            <version>${project.version}</version>
-                            <type>war</type>
-                            <overWrite>false</overWrite>
-                            <outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
-                            <destFileName>alfresco.war</destFileName>
-                        </artifactItem>
-                        <artifactItem>
-                            <groupId>mysql</groupId>
-                            <artifactId>mysql-connector-java</artifactId>
-                            <type>jar</type>
-                            <overWrite>false</overWrite>
-                            <outputDirectory>${project.build.directory}/connector</outputDirectory>
-                        </artifactItem>
-                        <artifactItem>
-                            <groupId>org.postgresql</groupId>
-                            <artifactId>postgresql</artifactId>
-                            <version>${dependency.postgresql.version}</version>
-                            <type>jar</type>
-                            <overWrite>false</overWrite>
-                            <outputDirectory>${project.build.directory}/connector</outputDirectory>
-                        </artifactItem>
-                    </artifactItems>
-                </configuration>
             </plugin>
         </plugins>
 

From bb7e551023c68f1c22c8bc80d252e9da4046737b Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 28 Sep 2017 22:50:01 +0100
Subject: [PATCH 07/10] MNT-18275 include data-model 6.19

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

diff --git a/pom.xml b/pom.xml
index ed070c50aa..4ceb428706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <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>
-        <dependency.alfresco-data-model.version>6.18</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>6.19</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 5a743a67c89cb72a020ab9fe0d84630a44bad5fe Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 10 Oct 2017 14:15:03 +0100
Subject: [PATCH 08/10] REPO-2005 Add MariaDB to community packaging so that it
 is in the docker image.

Added as part of this issue as this is the first issue to do with MariaDB.
---
 docker/pom.xml | 12 ++++++++++++
 pom.xml        |  1 +
 2 files changed, 13 insertions(+)

diff --git a/docker/pom.xml b/docker/pom.xml
index ef452fe3d3..51f1c2a700 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${dependency.mysql.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${dependency.mariadb.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -72,6 +77,13 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/connector</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.mariadb.jdbc</groupId>
+                                    <artifactId>mariadb-java-client</artifactId>
+                                    <version>${dependency.mariadb.version}</version>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/connector</outputDirectory>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.postgresql</groupId>
                                     <artifactId>postgresql</artifactId>
diff --git a/pom.xml b/pom.xml
index 4ceb428706..4059a8d346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <dependency.spring.version>3.2.17.RELEASE</dependency.spring.version>
         <dependency.postgresql.version>9.4.1212</dependency.postgresql.version>
         <dependency.mysql.version>5.1.40</dependency.mysql.version>
+        <dependency.mariadb.version>2.0.1</dependency.mariadb.version>
     </properties>
 
     <dependencyManagement>

From 62fb875941c846830306a7b38fc9b07a07fd633f Mon Sep 17 00:00:00 2001
From: Alex Mukha <alex.mukha@alfresco.com>
Date: Tue, 10 Oct 2017 15:13:21 +0100
Subject: [PATCH 09/10] REPO-2886 Change the project version to 6.0.0

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

diff --git a/docker/pom.xml b/docker/pom.xml
index 51f1c2a700..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.b-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 4059a8d346..394386b86a 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.b-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
diff --git a/war/pom.xml b/war/pom.xml
index 98befc548c..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.b-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/zip/pom.xml b/zip/pom.xml
index e9ec210e60..5a9645b923 100644
--- a/zip/pom.xml
+++ b/zip/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.b-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

From 71e59c633db0b3857db1dd3ec4e30efcf8a768f1 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@alfresco.com>
Date: Wed, 11 Oct 2017 12:12:25 +0100
Subject: [PATCH 10/10] ALF-21953: updated pom to use super-pom v9

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

diff --git a/pom.xml b/pom.xml
index 394386b86a..2d9a5fa25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-super-pom</artifactId>
-        <version>8</version>
+        <version>9</version>
     </parent>
 
     <modules>