Creation of feature/ags-merge branch with all previous commits but without excessive history

Note pom.xml versions have been reset to the values that were on the feature/ags/master
branches to simplify getting local changes onto this new branch.

alfresco-communiy-repo    11.14-ags-1.0-SNAPSHOT -> 11.7-ags-1.0-SNAPSHOT
alfresco-enterprise-repo  11.18-ags-1.0-SNAPSHOT -> 11.8-ags-1.0-SNAPSHOT
alfresco-enterprise-share 11.5-ags-1.0-SNAPSHOT -> 11.4-ags-1.0-SNAPSHOT

.travis.yml

@@ -33,11 +33,11 @@ stages:
   - name: test
     if: commit_message !~ /\[skip tests\]/
   - name: release
-    if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no release\]/
+    if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
   - name: update_downstream
-    if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no downstream\]/
+    if: commit_message !~ /\[no downstream\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
   - name: trigger_downstream
-    if: fork = false AND (branch != master AND branch !~ /release\/.*/) AND type != pull_request AND commit_message !~ /\[no downstream\]/
+    if: commit_message !~ /\[no downstream\]/ AND (branch != master AND branch !~ /release\/.*/) AND type != pull_request AND fork = false
 
 before_install: travis_retry bash scripts/travis/init.sh
 install: travis_retry travis_wait 40 bash scripts/travis/build.sh
@@ -220,72 +220,67 @@ jobs:
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
 
     - name: "REST API TAS tests part2"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
 
     - name: "REST API TAS tests part3"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+      script: travis_wait 60 mvn -B install -f packaging/tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - BROWSER binding"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - ATOM binding"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
 
     - name: "CMIS TAS tests - WEBSERVICES binding"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
+      script: travis_wait 40 mvn -B install -f packaging/tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
 
     - name: "Email TAS tests"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 30 mvn -B install -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -f packaging/tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
 
     - name: "WebDAV TAS tests"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 30 mvn -B install -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -f packaging/tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
 
     - name: "Integration TAS tests"
       if: branch = master OR commit_message =~ /\[tas\]/
       before_script:
         - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
         - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      script:
-        - travis_wait 30 mvn -B install -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+      script: travis_wait 30 mvn -B install -f packaging/tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "AGS Unit & Integration Tests"
+      if: branch = master OR commit_message =~ /\[ags\]/
+      script: travis_retry travis_wait mvn -B verify -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Pstart-db -f amps/ags/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
     - name: "Push to Nexus"
       stage: release

amps/ags/.travis.settings.xml

@@ -1,79 +0,0 @@
-<settings>
-   <profiles>
-      <profile>
-         <id>alfresco-internal</id>
-         <activation>
-            <activeByDefault>true</activeByDefault>
-         </activation>
-         <repositories>
-            <repository>
-               <id>central</id>
-               <name>Central Repository</name>
-               <url>https://repo.maven.apache.org/maven2</url>
-               <layout>default</layout>
-               <snapshots>
-                  <enabled>false</enabled>
-               </snapshots>
-            </repository>
-            <repository>
-               <id>alfresco-internal</id>
-               <releases>
-                  <enabled>true</enabled>
-               </releases>
-               <snapshots>
-                  <enabled>true</enabled>
-               </snapshots>
-               <name>Alfresco Internal Repository</name>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
-            </repository>
-         </repositories>
-         <pluginRepositories>
-            <pluginRepository>
-               <id>central</id>
-               <name>Central Repository</name>
-               <url>https://repo.maven.apache.org/maven2</url>
-               <layout>default</layout>
-               <snapshots>
-                  <enabled>false</enabled>
-               </snapshots>
-               <releases>
-                  <updatePolicy>never</updatePolicy>
-               </releases>
-            </pluginRepository>
-            <pluginRepository>
-               <id>alfresco-internal</id>
-               <name>Alfresco Internal Repository</name>
-               <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-            </pluginRepository>
-         </pluginRepositories>
-      </profile>
-   </profiles>
-
-   <servers>
-      <server>
-         <id>docker.io</id>
-         <username>${env.DOCKERHUB_USERNAME}</username>
-         <password>${env.DOCKERHUB_PASSWORD}</password>
-      </server>
-      <server>
-         <id>quay.io</id>
-         <username>${env.QUAY_USERNAME}</username>
-         <password>${env.QUAY_PASSWORD}</password>
-      </server>
-      <server>
-         <id>alfresco-internal</id>
-         <username>${env.MAVEN_USERNAME}</username>
-         <password>${env.MAVEN_PASSWORD}</password>
-      </server>
-      <server>
-         <id>alfresco-public</id>
-         <username>${env.MAVEN_USERNAME}</username>
-         <password>${env.MAVEN_PASSWORD}</password>
-      </server>
-      <server>
-         <id>alfresco-internal-snapshots</id>
-         <username>${env.MAVEN_USERNAME}</username>
-         <password>${env.MAVEN_PASSWORD}</password>
-      </server>
-   </servers>
-</settings>

amps/ags/.travis.yml

@@ -4,8 +4,6 @@ import:
   - source: travis/.travis.tests-stage.yml
   - source: travis/.travis.integration-test-MySQL.yml
   - source: travis/.travis.deploy-stage.yml
-  - source: travis/.travis.release-stage.yml
-  - source: travis/.travis.publish-stage.yml
 dist: xenial
 sudo: required
 language: java
@@ -32,12 +30,6 @@ cache:
 
 before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services*
 
-before_install:
-  - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
-  - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
-  - echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
-  - echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-
 install: skip
 
 stages:

amps/ags/README.md

@@ -119,7 +119,7 @@ Technical documentation is available at [rm-community/documentation/README.md](/
 In order to execute the integration tests run the following command (unit tests will be executed every time before you start Alfresco/Share):
 
 ```
-mvn clean install -Dskip.integrationtests=false
+mvn clean install -Pstart-db
 ```
 
 ## Running UI Automation tests

amps/ags/pom.xml

@@ -1,7 +1,5 @@
 <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>
-   <groupId>org.alfresco</groupId>
    <artifactId>alfresco-governance-services-community-parent</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Governance Services Community Parent</name>
@@ -9,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <modules>
@@ -17,333 +15,6 @@
       <module>rm-automation</module>
    </modules>
 
-   <profiles>
-      <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
-      <profile>
-      <id>publicapi</id>
-         <properties>
-            <docflex.version>1.6.1</docflex.version>
-         </properties>
-         <!-- Downloads the docflex license -->
-         <dependencies>
-            <dependency>
-               <groupId>com.docflex</groupId>
-               <artifactId>docflex-alfresco-license</artifactId>
-               <version>1.0</version>
-               <type>license</type>
-            </dependency>
-         </dependencies>
-         <!-- Extracts Docflex locally -->
-         <build>
-            <plugins>
-               <plugin>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <version>3.1.1</version>
-                  <executions>
-                     <!-- Unzips the docflex/javadoc doclet -->
-                     <execution>
-                        <id>default-cli</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                           <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>com.docflex</groupId>
-                                 <artifactId>docflex-javadoc</artifactId>
-                                 <version>${docflex.version}</version>
-                                 <type>zip</type>
-                              </artifactItem>
-                           </artifactItems>
-                           <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-
-               <plugin>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <version>${maven.javadoc.version}</version>
-                  <configuration>
-                     <doclet>com.docflex.javadoc.Doclet</doclet>
-                     <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
-                     <doclint>none</doclint>
-                     <additionalOptions>
-
-                         -license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license
-                         -template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl
-                         -nodialog
-                         -launchviewer=false
-                         -p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi
-                         -p:docTitle "${project.name} ${project.version} Public API"
-                         -p:windowTitle "${project.name} ${project.version} Public API"
-
-                     </additionalOptions>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>enterprise-release</id>
-         <distributionManagement>
-            <repository>
-               <id>alfresco-internal</id>
-               <url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases/</url>
-            </repository>
-         </distributionManagement>
-      </profile>
-      <profile>
-         <id>hotfix-release</id>
-         <distributionManagement>
-            <repository>
-               <id>alfresco-internal</id>
-               <url>https://artifacts.alfresco.com/nexus/content/repositories/hotfix-releases/</url>
-            </repository>
-         </distributionManagement>
-      </profile>
-      <profile>
-         <id>community-release</id>
-         <distributionManagement>
-            <repository>
-               <id>alfresco-internal</id>
-               <url>https://artifacts.alfresco.com/nexus/content/repositories/releases/</url>
-            </repository>
-         </distributionManagement>
-      </profile>
-
-      <!--
-        The following profile adds the /properties directories as resource directories in the project.
-        This means we can filter the property files in these directories.
-        The presence of this /properties directory also activates these profiles.
-        -->
-      <profile>
-         <id>enable-test-properties-filtering</id>
-         <activation>
-            <file>
-               <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
-               <exists>src/test/properties</exists>
-            </file>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>build-helper-maven-plugin</artifactId>
-                  <version>${maven.buildhelper.version}</version>
-                  <executions>
-                     <execution>
-                        <id>add-env-test-properties</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                           <goal>add-test-resource</goal>
-                        </goals>
-                        <configuration>
-                           <resources>
-                              <resource>
-                                 <directory>${app.properties.test.folder}</directory>
-                                 <includes>
-                                    <include>${app.properties.test.include}</include>
-                                 </includes>
-                                 <filtering>${app.filtering.enabled}</filtering>
-                              </resource>
-                           </resources>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <!--Docker profiles-->
-      <!-- Profile used only to build docker images-->
-      <profile>
-         <id>buildDockerImage</id>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>io.fabric8</groupId>
-                     <artifactId>docker-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>build-image</id>
-                           <!-- This will still be executed if the tests are skipped. -->
-                           <phase>verify</phase>
-                           <goals>
-                              <goal>build</goal>
-                           </goals>
-                           <configuration>
-                              <images>
-                                 <image>
-                                    <name>${image.name}</name>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                              </images>
-                           </configuration>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-
-
-
-      <!-- Profile used to build and push docker images with project.version tag to hub.docker when the enterprise deploy goal encounters-->
-      <profile>
-         <id>release-enterprise</id>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>io.fabric8</groupId>
-                     <artifactId>docker-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>build-push-image</id>
-                           <phase>deploy</phase>
-                           <goals>
-                              <goal>build</goal>
-                              <goal>push</goal>
-                           </goals>
-                           <configuration>
-                              <images>
-                                 <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <registry>${image.registry}</registry>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                              </images>
-                           </configuration>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-
-      <!-- Profile used to build and push docker images with project.version tag to both image registries quay.io and hub.docker when
-      the community deploy goal encounters-->
-      <profile>
-         <id>release-community</id>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>io.fabric8</groupId>
-                     <artifactId>docker-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>build-push-image</id>
-                           <phase>deploy</phase>
-                           <goals>
-                              <goal>build</goal>
-                              <goal>push</goal>
-                           </goals>
-                           <configuration>
-                              <images>
-                                 <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <registry>${image.registry}</registry>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                                 <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                              </images>
-                           </configuration>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-      <profile>
-         <id>start-db</id>
-         <activation>
-            <property>
-               <name>skip.integrationtests</name>
-               <value>false</value>
-            </property>
-         </activation>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>io.fabric8</groupId>
-                     <artifactId>docker-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>start</id>
-                           <phase>pre-integration-test</phase>
-                           <goals>
-                              <goal>stop</goal>
-                              <goal>start</goal>
-                           </goals>
-                           <configuration>
-                              <images>
-                                 <image>
-                                    <alias>test-database</alias>
-                                    <name>postgres:${postgres.version}</name>
-                                    <run>
-                                       <ports>
-                                          <port>${database.port}:${postgresql.port}</port>
-                                       </ports>
-                                       <env>
-                                          <POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
-                                          <POSTGRES_USER>${alfresco.db.username}</POSTGRES_USER>
-                                          <POSTGRES_DB>${alfresco.test.db.name}</POSTGRES_DB>
-                                       </env>
-                                       <cmd>
-                                          <shell>-c max_connections=300</shell>
-                                       </cmd>
-                                       <wait>
-                                          <log>database system is ready to accept connections</log>
-                                          <time>20000</time>
-                                       </wait>
-                                    </run>
-                                 </image>
-                                 <image>
-                                    <name>alfresco/alfresco-activemq:${activemq.version}</name>
-                                    <run>
-                                       <ports>
-                                          <port>${activemq.port1}:${activemq.port1}</port>
-                                          <port>${activemq.port2}:${activemq.port2}</port>
-                                       </ports>
-                                    </run>
-                                 </image>
-                              </images>
-                           </configuration>
-                        </execution>
-                        <execution>
-                           <id>stop</id>
-                           <phase>post-integration-test</phase>
-                           <goals>
-                              <goal>stop</goal>
-                           </goals>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-   </profiles>
-
    <properties>
       <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
       <alfresco.data.location>${session.executionRootDirectory}/alf_data_dev</alfresco.data.location>
@@ -358,8 +29,6 @@
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.min.version>0.0</alfresco.min.version>
 
-      <skip.integrationtests>true</skip.integrationtests>
-      <postgres.version>9.4.12</postgres.version>
       <activemq.version>5.15.8</activemq.version>
       <activemq.port1>61616</activemq.port1>
       <activemq.port2>5672</activemq.port2>
@@ -409,16 +78,19 @@
       <app.properties.test.include>**</app.properties.test.include>
       <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
 
-      <image.name>imageNameNotSet</image.name>
-      <image.tag>latest</image.tag>
-      <image.registry>quay.io</image.registry>
-
       <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
       <javax-jaxb-impl.version>3.0.0-M4</javax-jaxb-impl.version>
       <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
       <apache-compress.version>1.19</apache-compress.version>
    </properties>
 
+   <distributionManagement>
+      <repository>
+         <id>alfresco-internal</id>
+         <url>https://artifacts.alfresco.com/nexus/content/repositories/releases/</url>
+      </repository>
+   </distributionManagement>
+
    <dependencyManagement>
       <dependencies>
          <dependency>
@@ -1009,13 +681,121 @@
                   </execution>
                </executions>
             </plugin>
-
-            <plugin>
-               <groupId>io.fabric8</groupId>
-               <artifactId>docker-maven-plugin</artifactId>
-               <version>${fabric8.docker.version}</version>
-            </plugin>
          </plugins>
       </pluginManagement>
    </build>
+
+   <profiles>
+      <!-- Generate the Javadoc for Public API only (filtered on AlfrescoPublicApi annotation) -->
+      <profile>
+         <id>publicapi</id>
+         <properties>
+            <docflex.version>1.6.1</docflex.version>
+         </properties>
+         <!-- Downloads the docflex license -->
+         <dependencies>
+            <dependency>
+               <groupId>com.docflex</groupId>
+               <artifactId>docflex-alfresco-license</artifactId>
+               <version>1.0</version>
+               <type>license</type>
+            </dependency>
+         </dependencies>
+         <!-- Extracts Docflex locally -->
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-dependency-plugin</artifactId>
+                  <version>3.1.1</version>
+                  <executions>
+                     <!-- Unzips the docflex/javadoc doclet -->
+                     <execution>
+                        <id>default-cli</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                           <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                           <artifactItems>
+                              <artifactItem>
+                                 <groupId>com.docflex</groupId>
+                                 <artifactId>docflex-javadoc</artifactId>
+                                 <version>${docflex.version}</version>
+                                 <type>zip</type>
+                              </artifactItem>
+                           </artifactItems>
+                           <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+
+               <plugin>
+                  <artifactId>maven-javadoc-plugin</artifactId>
+                  <version>${maven.javadoc.version}</version>
+                  <configuration>
+                     <doclet>com.docflex.javadoc.Doclet</doclet>
+                     <docletPath>${project.build.directory}/docflex-javadoc-${docflex.version}/lib/docflex-javadoc.jar</docletPath>
+                     <doclint>none</doclint>
+                     <additionalOptions>
+
+                        -license ${settings.localRepository}/com/docflex/docflex-alfresco-license/1.0/docflex-alfresco-license-1.0.license
+                        -template ${project.build.directory}/docflex-javadoc-${docflex.version}/templates/JavadocPro/FramedDoc.tpl
+                        -nodialog
+                        -launchviewer=false
+                        -p:filter.byAnns.include.classes=org.alfresco.api.AlfrescoPublicApi
+                        -p:docTitle "${project.name} ${project.version} Public API"
+                        -p:windowTitle "${project.name} ${project.version} Public API"
+
+                     </additionalOptions>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+
+      <!--
+        The following profile adds the /properties directories as resource directories in the project.
+        This means we can filter the property files in these directories.
+        The presence of this /properties directory also activates these profiles.
+        -->
+      <profile>
+         <id>enable-test-properties-filtering</id>
+         <activation>
+            <file>
+               <!-- No properties allowed here. Only hardcoded values are properly interpreted -->
+               <exists>src/test/properties</exists>
+            </file>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>build-helper-maven-plugin</artifactId>
+                  <version>${maven.buildhelper.version}</version>
+                  <executions>
+                     <execution>
+                        <id>add-env-test-properties</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                           <goal>add-test-resource</goal>
+                        </goals>
+                        <configuration>
+                           <resources>
+                              <resource>
+                                 <directory>${app.properties.test.folder}</directory>
+                                 <includes>
+                                    <include>${app.properties.test.include}</include>
+                                 </includes>
+                                 <filtering>${app.filtering.enabled}</filtering>
+                              </resource>
+                           </resources>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
 </project>

amps/ags/rm-automation/pom.xml

@@ -1,22 +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-governance-services-automation-community</artifactId>
-   <name>Alfresco Governance Services Automation Community</name>
+   <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
    <packaging>pom</packaging>
+   <name>Alfresco Governance Services Automation Community</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
-   <licenses>
-      <license>
-         <name>LGPL 3</name>
-      </license>
-   </licenses>
-
    <modules>
       <module>rm-automation-community-rest-api</module>
    </modules>
@@ -26,6 +19,12 @@
       <skip.automationtests>true</skip.automationtests>
    </properties>
 
+   <licenses>
+      <license>
+         <name>LGPL 3</name>
+      </license>
+   </licenses>
+
    <build>
       <plugins>
          <plugin>

amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>alfresco-governance-services-automation-community-rest-api</artifactId>
    <name>Alfresco Governance Services Automation Community REST API</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services-automation-community</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
       <maven.javadoc.skip>false</maven.javadoc.skip>
       <ags.share>alfresco-governance-services-community-share</ags.share>
       <ags.repo>alfresco-governance-services-community-repo</ags.repo>
-      <tas.restapi.version>1.51</tas.restapi.version>
-      <tas.utility.version>3.0.41</tas.utility.version>
       <fluent.json.version>2.0.0</fluent.json.version>
       <jackson.databind.version>2.7.9.1</jackson.databind.version>
    </properties>
@@ -56,8 +53,7 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>restapi</artifactId>
-         <version>${tas.restapi.version}</version>
-         <scope>provided</scope>
+         <version>${dependency.tas-restapi.version}</version>
          <exclusions>
             <exclusion>
                <groupId>com.fasterxml.jackson.core</groupId>
@@ -72,8 +68,7 @@
       <dependency>
          <groupId>org.alfresco.tas</groupId>
          <artifactId>utility</artifactId>
-         <scope>provided</scope>
-         <version>${tas.utility.version}</version>
+         <version>${dependency.tas-utility.version}</version>
       </dependency>
       <dependency>
          <groupId>org.projectlombok</groupId>
@@ -107,19 +102,5 @@
          <artifactId>jackson-databind</artifactId>
          <version>${jackson.databind.version}</version>
       </dependency>
-      <dependency>
-         <groupId>org.json</groupId>
-         <artifactId>json</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco.test</groupId>
-         <artifactId>dataprep</artifactId>
-         <scope>compile</scope>
-      </dependency>
-      <dependency>
-         <groupId>io.rest-assured</groupId>
-         <artifactId>rest-assured</artifactId>
-         <scope>compile</scope>
-      </dependency>
    </dependencies>
 </project>

amps/ags/rm-community/pom.xml

@@ -1,27 +1,32 @@
 <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-governance-services-community</artifactId>
-   <name>Alfresco Governance Services Community</name>
+   <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
    <packaging>pom</packaging>
+   <name>Alfresco Governance Services Community</name>
 
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
+   <modules>
+      <module>rm-community-rest-api-explorer</module>
+      <module>rm-community-repo</module>
+   </modules>
+
+   <properties>
+      <spring.version>5.3.3</spring.version>
+      <alfresco.min.version>7.0.0</alfresco.min.version>
+      <app.filtering.enabled>true</app.filtering.enabled>
+   </properties>
+
    <licenses>
       <license>
          <name>LGPL 3</name>
       </license>
    </licenses>
 
-   <modules>
-      <module>rm-community-rest-api-explorer</module>
-      <module>rm-community-repo</module>
-   </modules>
-
    <dependencyManagement>
       <dependencies>
          <dependency>
@@ -63,53 +68,4 @@
          </dependency>
       </dependencies>
    </dependencyManagement>
-
-   <properties>
-      <spring.version>5.3.3</spring.version>
-      <alfresco.min.version>7.0.0</alfresco.min.version>
-      <app.filtering.enabled>true</app.filtering.enabled>
-   </properties>
-
-   <profiles>
-      <profile>
-         <id>publish-docker-latest</id>
-         <build>
-            <pluginManagement>
-               <plugins>
-                  <plugin>
-                     <groupId>io.fabric8</groupId>
-                     <artifactId>docker-maven-plugin</artifactId>
-                     <executions>
-                        <execution>
-                           <id>build-push-image</id>
-                           <phase>deploy</phase>
-                           <goals>
-                              <goal>build</goal>
-                              <goal>push</goal>
-                           </goals>
-                           <configuration>
-                              <images>
-                                 <image>
-                                    <name>${image.name}:${image.tag}</name>
-                                    <registry>${image.registry}</registry>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                                 <image>
-                                    <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                       <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                    </build>
-                                 </image>
-                              </images>
-                           </configuration>
-                        </execution>
-                     </executions>
-                  </plugin>
-               </plugins>
-            </pluginManagement>
-         </build>
-      </profile>
-   </profiles>
 </project>

amps/ags/rm-community/rm-community-repo/.maven-dockerignore

@@ -1 +1 @@
-target/docker/**
+target/docker/

amps/ags/rm-community/rm-community-repo/Dockerfile

@@ -1,14 +1,17 @@
 ### Apply AGS community repo AMP to ACS image
-FROM quay.io/alfresco/alfresco-content-repository-community:7.0.0
+FROM alfresco/alfresco-community-repo-base:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.
 USER root
 
 COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/
+COPY target/alfresco-share-services-*.amp /usr/local/tomcat/amps/
 
+# Install amps on alfresco.war
 RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
-              /usr/local/tomcat/amps/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup
+              /usr/local/tomcat/amps \
+              /usr/local/tomcat/webapps/alfresco -directory -nobackup
 
 ### Copy gs-api-explorer war into webapps folder
 COPY target/gs-api-explorer-*.war /usr/local/tomcat/webapps/

amps/ags/rm-community/rm-community-repo/pom.xml

@@ -1,19 +1,17 @@
 <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-governance-services-community-repo</artifactId>
-   <name>Alfresco Governance Services Community Repository</name>
-   <description>Alfresco Governance Services Repository Extension</description>
    <packaging>amp</packaging>
+   <name>Alfresco Governance Services Community Repository AMP</name>
+   <description>Alfresco Governance Services Repository Extension</description>
 
    <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services-community</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <properties>
-
       <alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
       <alfresco.db.hibernate.dialect>org.alfresco.repo.domain.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
       <alfresco.db.name>alfresco</alfresco.db.name>
@@ -24,15 +22,141 @@
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
-      <!-- 7.0.0 dependencies -->
-      <!--  Alfresco Share version  -->
-      <alfresco.alfresco-share-services.version>7.0.0-A18</alfresco.alfresco-share-services.version>
+
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>
-
    </properties>
 
+   <dependencies>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-data-model</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${project.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${project.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-core</artifactId>
+         <version>${project.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>javax.servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco.surf</groupId>
+         <artifactId>spring-webscripts</artifactId>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>io.takari.junit</groupId>
+         <artifactId>takari-cpsuite</artifactId>
+         <version>1.2.7</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>mysql</groupId>
+         <artifactId>mysql-connector-java</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.reflections</groupId>
+         <artifactId>reflections</artifactId>
+         <version>0.9.12</version>
+         <scope>test</scope>
+      </dependency>
+      <!-- swagger parser -->
+      <dependency>
+         <groupId>io.swagger</groupId>
+         <artifactId>swagger-parser</artifactId>
+         <version>1.0.52</version>
+         <scope>test</scope>
+      </dependency>
+      <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
+      <dependency>
+         <groupId>com.github.fge</groupId>
+         <artifactId>json-schema-validator</artifactId>
+         <version>2.2.6</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-core</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-annotations</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-databind</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.datatype</groupId>
+         <artifactId>jackson-datatype-joda</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.fasterxml.jackson.dataformat</groupId>
+         <artifactId>jackson-dataformat-yaml</artifactId>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-test</artifactId>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
    <build>
       <sourceDirectory>source/java</sourceDirectory>
       <testSourceDirectory>test/java</testSourceDirectory>
@@ -50,6 +174,7 @@
             <directory>test/resources</directory>
          </testResource>
       </testResources>
+
       <plugins>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
@@ -125,11 +250,7 @@
                </includes>
             </configuration>
          </plugin>
-         <!--Docker Maven Plugin-->
-         <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-         </plugin>
+
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
@@ -148,7 +269,6 @@
                         <db.url>jdbc:postgresql://localhost:${database.port}/${alfresco.test.db.name}</db.url>
                         <dir.root>${project.build.directory}/alf-data-test</dir.root>
                      </systemPropertyVariables>
-                     <skipTests>${skip.integrationtests}</skipTests>
                      <includes>
                         <include>**/AllTestSuite.class</include>
                      </includes>
@@ -174,7 +294,7 @@
                         <artifactItem>
                            <groupId>org.alfresco</groupId>
                            <artifactId>alfresco-share-services</artifactId>
-                           <version>${alfresco.alfresco-share-services.version}</version>
+                           <version>${project.version}</version>
                            <type>amp</type>
                         </artifactItem>
                         <artifactItem>
@@ -221,7 +341,6 @@
                      <attachClasses>true</attachClasses>
                      <attachConfig>true</attachConfig>
                      <includeDependencies>true</includeDependencies>
-
                   </configuration>
                </execution>
                <execution>
@@ -239,7 +358,7 @@
                   <phase>prepare-package</phase>
                   <configuration>
                      <backup>true</backup>
-                     <ampLocation>${project.build.directory}/alfresco-share-services-${alfresco.alfresco-share-services.version}.amp</ampLocation>
+                     <ampLocation>${project.build.directory}/alfresco-share-services-${project.version}.amp</ampLocation>
                      <warLocation>${app.amp.client.war.folder}</warLocation>
                   </configuration>
                </execution>
@@ -277,6 +396,7 @@
             </configuration>
          </plugin>
       </plugins>
+
       <pluginManagement>
          <plugins>
             <plugin>
@@ -319,137 +439,7 @@
       </pluginManagement>
    </build>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-data-model</artifactId>
-         <version>${project.version}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-remote-api</artifactId>
-         <version>${project.version}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-repository</artifactId>
-         <version>${project.version}</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-repository</artifactId>
-         <version>${project.version}</version>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-remote-api</artifactId>
-         <version>${project.version}</version>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-core</artifactId>
-         <version>${project.version}</version>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.alfresco.surf</groupId>
-         <artifactId>spring-webscripts</artifactId>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>io.takari.junit</groupId>
-         <artifactId>takari-cpsuite</artifactId>
-         <version>1.2.7</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>postgresql</groupId>
-         <artifactId>postgresql</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>mysql</groupId>
-         <artifactId>mysql-connector-java</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.reflections</groupId>
-          <artifactId>reflections</artifactId>
-          <version>0.9.12</version>
-          <scope>test</scope>
-      </dependency>
-      <!-- swagger parser -->
-      <dependency>
-         <groupId>io.swagger</groupId>
-         <artifactId>swagger-parser</artifactId>
-         <version>1.0.52</version>
-         <scope>test</scope>
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/com.github.fge/json-schema-validator -->
-     <dependency>
-         <groupId>com.github.fge</groupId>
-         <artifactId>json-schema-validator</artifactId>
-         <version>2.2.6</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-core</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-annotations</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.core</groupId>
-         <artifactId>jackson-databind</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.datatype</groupId>
-         <artifactId>jackson-datatype-joda</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.fasterxml.jackson.dataformat</groupId>
-         <artifactId>jackson-dataformat-yaml</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-test</artifactId>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-
    <profiles>
-
       <profile>
          <id>use-mysql</id>
          <properties>
@@ -474,6 +464,71 @@
             <alfresco.db.datasource.class>org.postgresql.Driver</alfresco.db.datasource.class>
          </properties>
       </profile>
+
+      <profile>
+         <id>start-db</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>io.fabric8</groupId>
+                  <artifactId>docker-maven-plugin</artifactId>
+                  <configuration>
+                     <images>
+                        <image>
+                           <!-- TODO upgrade this old postgres version -->
+                           <name>postgres:9.4.12</name>
+                           <!--<name>postgres:13.1</name>-->
+                           <run>
+                              <ports>
+                                 <port>${database.port}:${postgresql.port}</port>
+                              </ports>
+                              <env>
+                                 <POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
+                                 <POSTGRES_USER>${alfresco.db.username}</POSTGRES_USER>
+                                 <POSTGRES_DB>${alfresco.test.db.name}</POSTGRES_DB>
+                              </env>
+                              <cmd>
+                                 <shell>-c max_connections=300</shell>
+                              </cmd>
+                              <wait>
+                                 <log>database system is ready to accept connections</log>
+                                 <time>20000</time>
+                              </wait>
+                           </run>
+                        </image>
+                        <image>
+                           <name>alfresco/alfresco-activemq:${dependency.activemq.version}</name>
+                           <run>
+                              <ports>
+                                 <port>${activemq.port1}:${activemq.port1}</port>
+                                 <port>${activemq.port2}:${activemq.port2}</port>
+                              </ports>
+                           </run>
+                        </image>
+                     </images>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>before-integration-tests</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                           <goal>stop</goal>
+                           <goal>start</goal>
+                        </goals>
+                     </execution>
+                     <execution>
+                        <id>after-integration-tests</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                           <goal>stop</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+
       <profile>
          <id>start-repo</id>
          <build>
@@ -574,6 +629,7 @@
             </plugins>
          </build>
       </profile>
+
       <profile>
          <id>wipeDB</id>
          <build>
@@ -626,56 +682,70 @@
             </plugins>
          </build>
       </profile>
-       <!--Docker profiles used to build specific docker images for community repo, defined in parent pom -->
+
        <profile>
-           <id>buildDockerImage</id>
-           <build>
-               <plugins>
-                   <plugin>
-                       <groupId>io.fabric8</groupId>
-                       <artifactId>docker-maven-plugin</artifactId>
-                   </plugin>
-               </plugins>
-           </build>
+          <!-- builds "image:latest" locally -->
+          <id>communityDocker</id>
+          <build>
+             <plugins>
+                <plugin>
+                   <groupId>io.fabric8</groupId>
+                   <artifactId>docker-maven-plugin</artifactId>
+                   <configuration>
+                      <images>
+                         <image>
+                            <name>${image.name}:${image.tag}</name>
+                         </image>
+                      </images>
+                   </configuration>
+                   <executions>
+                      <execution>
+                         <id>build-image</id>
+                         <phase>package</phase>
+                         <goals>
+                            <goal>build</goal>
+                         </goals>
+                      </execution>
+                   </executions>
+                </plugin>
+             </plugins>
+          </build>
        </profile>
+
        <profile>
-           <id>publish-docker-latest</id>
-           <build>
-               <plugins>
-                   <plugin>
-                       <groupId>io.fabric8</groupId>
-                       <artifactId>docker-maven-plugin</artifactId>
-                   </plugin>
-               </plugins>
-           </build>
+          <id>internal</id>
+          <!-- publishes "image:latest" on Quay & DockerHub -->
+          <build>
+             <plugins>
+                <plugin>
+                   <groupId>io.fabric8</groupId>
+                   <artifactId>docker-maven-plugin</artifactId>
+                   <configuration>
+                      <images>
+                         <image>
+                            <!-- Quay image -->
+                            <name>${image.name}:${image.tag}</name>
+                            <registry>${image.registry}</registry>
+                         </image>
+                         <image>
+                            <!-- DockerHub image -->
+                            <name>${image.name}:${image.tag}</name>
+                         </image>
+                      </images>
+                   </configuration>
+                   <executions>
+                      <execution>
+                         <id>build-push-image</id>
+                         <phase>install</phase>
+                         <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                         </goals>
+                      </execution>
+                   </executions>
+                </plugin>
+             </plugins>
+          </build>
        </profile>
-      <profile>
-         <id>release-community</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>io.fabric8</groupId>
-                  <artifactId>docker-maven-plugin</artifactId>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-      <profile>
-         <id>start-db</id>
-         <activation>
-            <property>
-               <name>skip.integrationtests</name>
-               <value>false</value>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>io.fabric8</groupId>
-                  <artifactId>docker-maven-plugin</artifactId>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
    </profiles>
 </project>

amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml

@@ -1,22 +1,22 @@
 <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-governance-services-community-rest-api-explorer</artifactId>
-  <name>Alfresco Governance Services Community REST API Explorer</name>
-  <packaging>war</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
+    <packaging>war</packaging>
+    <name>Alfresco Governance Services Community REST API Explorer</name>
 
-   <parent>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-governance-services-community</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
-   </parent>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
+    </parent>
 
-   <properties>
-      <maven.javadoc.skip>false</maven.javadoc.skip>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-   </properties>
+    <properties>
+        <maven.javadoc.skip>false</maven.javadoc.skip>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
 
-   <build>
+    <build>
       <plugins>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>

amps/ags/travis/.travis.integration-test-MySQL.yml

@@ -8,12 +8,12 @@ jobs:
     name: "Community Integrations Tests on MySQL"
     stage: Tests
     if: branch =~ /(release\/.*$|master)/ OR commit_message =~ /\[execute tests on MySQL\]/
+    install: travis_retry travis_wait 60 mvn -B -V -q clean install ${MVN_SKIP}
     before_script:
       - docker run -d -p 3307:3306 -e MYSQL_ROOT_PASSWORD=alfresco -e MYSQL_USER=alfresco -e MYSQL_DATABASE=alfresco -e MYSQL_PASSWORD=alfresco  mysql:5.7.23 --transaction-isolation='READ-COMMITTED'
       - docker run -d -p 61617:61617 -p 5673:5673 alfresco/alfresco-activemq:5.15.8
-    script: travis_retry travis_wait 80 mvn -B -q clean verify ${MVN_SKIP} -Puse-mysql -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-community/pom.xml  -amd ${LOG_WARN}
+    script: travis_retry travis_wait 80 mvn -B -q clean verify ${MVN_SKIP} -Puse-mysql -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-community/pom.xml  -amd ${LOG_WARN}
 
   - <<: *integration_test_on_MYSQL
     name: "Enterprise Integrations Tests on MySQL"
-    install: travis_retry travis_wait 60 mvn -B -V -q clean install ${MVN_SKIP}
-    script: travis_retry travis_wait 80 mvn -B -q clean verify ${MVN_SKIP} -Puse-mysql -Dskip.integrationtests=false -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-enterprise/pom.xml -amd ${LOG_WARN}
+    script: travis_retry travis_wait 80 mvn -B -q clean verify ${MVN_SKIP} -Puse-mysql -Dmy.db.name=alfresco -Dmy.db.port=3307 -f rm-enterprise/pom.xml -amd ${LOG_WARN}

amps/ags/travis/.travis.publish-stage.yml

@@ -1,43 +0,0 @@
-jobs:
-  include:
-    - name: "Community Publish to S3 Release Bucket"
-      stage: Publish
-      if: commit_message =~ /\[community release .*\]/ AND commit_message =~ /\[publish\]/
-      before_script: source travis/scripts/set-release-variables.sh
-      script: skip
-      before_deploy: bash travis/scripts/zip-artifacts-release.sh "community"
-      deploy:
-        - provider: s3
-          access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
-          region: "eu-west-1"
-          bucket: "eu.dl.alfresco.com"
-          upload_dir: "release/community/RM/${RELEASE_VERSION}"
-          skip_cleanup: true
-          acl: private
-          local_dir: artifacts_dir
-          on:
-            all_branches: true
-      after_deploy:
-        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}"
-
-    - name: "Enterprise Publish to S3 Release Bucket"
-      stage: Publish
-      if: commit_message =~ /\[enterprise release .*\]/ AND commit_message =~ /\[publish\]/
-      before_script: source travis/scripts/set-release-variables.sh
-      script: skip
-      before_deploy: bash travis/scripts/zip-artifacts-release.sh "enterprise"
-      deploy:
-        - provider: s3
-          access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
-          region: "eu-west-1"
-          bucket: "eu.dl.alfresco.com"
-          upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
-          skip_cleanup: true
-          acl: private
-          local_dir: artifacts_dir
-          on:
-            all_branches: true
-      after_deploy:
-        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/eu.dl.alfresco.com/release/enterprise/RM/${RELEASE_VERSION}"

amps/ags/travis/.travis.release-stage.yml

@@ -1,52 +0,0 @@
-jobs:
-  include:
-    - name: "Community Release and Publish to S3 Staging Bucket"
-      stage: Release
-      if: commit_message =~ /\[community release .*\]/
-      before_script:
-        - source travis/scripts/set-release-variables.sh
-        - bash travis/scripts/check-existing-tags.sh "alfresco/alfresco-governance-share-community"
-      script:
-        - bash travis/scripts/community_release.sh
-      before_deploy:
-        - bash travis/scripts/zip-artifacts-staging.sh "community"
-        - bash travis/scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-community -i quay.io/alfresco/alfresco-governance-share-community -r quay.io -t ${RELEASE_VERSION}
-      deploy:
-        - provider: s3
-          access_key_id: ${STAGING_AWS_ACCESS_KEY}
-          secret_access_key: ${STAGING_AWS_SECRET_KEY}
-          region: "eu-west-1"
-          bucket: "alfresco-artefacts-staging"
-          upload_dir: "community/RM/${RELEASE_VERSION}"
-          skip_cleanup: true
-          acl: private
-          local_dir: artifacts_dir
-          on:
-            all_branches: true
-      after_deploy:
-        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}"
-
-    - name: "Enterprise Release and Publish to S3 Staging Bucket"
-      stage: Release
-      if: commit_message =~ /\[enterprise release .*\]/
-      before_script:
-        - source travis/scripts/set-release-variables.sh
-      script:
-        - bash travis/scripts/enterprise_release.sh
-      before_deploy:
-        - bash travis/scripts/zip-artifacts-staging.sh "enterprise"
-        - bash travis/scripts/pushDockerDigestTag.sh -i quay.io/alfresco/alfresco-governance-repository-enterprise -i quay.io/alfresco/alfresco-governance-share-enterprise -r quay.io -t ${RELEASE_VERSION}
-      deploy:
-        - provider: s3
-          access_key_id: ${STAGING_AWS_ACCESS_KEY}
-          secret_access_key: ${STAGING_AWS_SECRET_KEY}
-          region: "eu-west-1"
-          bucket: "alfresco-artefacts-staging"
-          upload_dir: "enterprise/RM/${RELEASE_VERSION}"
-          skip_cleanup: true
-          acl: private
-          local_dir: artifacts_dir
-          on:
-            all_branches: true
-      after_deploy:
-        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/enterprise/RM/${RELEASE_VERSION}"

amps/ags/travis/.travis.tests-stage.yml

@@ -8,7 +8,7 @@ jobs:
     - name: "Unit & Integration Tests"
       stage: Tests
       install: travis_retry travis_wait 60 mvn -B -V -q clean install ${MVN_SKIP}
-      script: travis_retry travis_wait 120 mvn -B -q verify -Dskip.integrationtests=false ${LOG_WARN}
+      script: travis_retry travis_wait 120 mvn -B -q verify ${LOG_WARN}
 
     - name: "Community Rest API Tests"
       stage: Tests

amps/ags/travis/scripts/check-existing-tags.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-alfresco_docker_image=$1
-# Verify release tags
-get_tags="$(curl https://hub.docker.com/r/$alfresco_docker_image/tags/ | grep -o '\"result\".*\"]')"
-arrayTags=($get_tags)
-
-echo "Existing Tags: $get_tags"
-
-for tag in "${arrayTags[@]}"
-do
-    if [[ $tag = ${RELEASE_VERSION} ]]; then
-        echo "Tag ${RELEASE_VERSION} already pushed, release process will interrupt."
-        exit 0
-    fi
-done
-
-echo "The ${RELEASE_VERSION} tag was not found"

amps/ags/travis/scripts/community_release.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Use full history for release
-git checkout -B "${TRAVIS_BRANCH}"
-
-git config user.email "${GIT_EMAIL}"
-
-if [ -z ${RELEASE_VERSION} ] || [ -z ${DEVELOPMENT_VERSION} ]; then
-    echo "Please provide a Release and Development version"
-    exit 1
-fi
-
-mvn -B \
-    -Dusername="${GIT_USERNAME}" \
-    -Dpassword="${GIT_PASSWORD}" \
-    -DreleaseVersion=${RELEASE_VERSION} \
-    -DdevelopmentVersion=${DEVELOPMENT_VERSION} \
-    -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
-    -DuseReleaseProfile=false \
-    "-Darguments=-DskipTests -P\!enterprise -Prelease-community,community-release" \
-    release:clean release:prepare release:perform

amps/ags/travis/scripts/set-release-variables.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
-
-if [ ! -n "$release_message" ]; then
-  echo "The commit message is in the wrong format or it does not contain all the required properties."
-  exit 1
-fi
-
-export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z](\d)+){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
-
-echo "Release version is set to $RELEASE_VERSION"
-echo "Development version is set to $DEVELOPMENT_VERSION"

amps/ags/travis/scripts/zip-artifacts-release.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-release_type=$1
-
-mkdir "artifacts_dir"
-
-mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \
-    -Dartifact=org.alfresco:alfresco-governance-services-${release_type}-repo:${RELEASE_VERSION}:amp \
-    -DoutputDirectory=artifacts_dir
-
-mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \
-    -Dartifact=org.alfresco:alfresco-governance-services-${release_type}-share:${RELEASE_VERSION}:amp \
-    -DoutputDirectory=artifacts_dir
-
-mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:copy \
-    -Dartifact=org.alfresco:alfresco-governance-services-${release_type}-rest-api-explorer:${RELEASE_VERSION}:war \
-    -DoutputDirectory=artifacts_dir
-
-cd artifacts_dir
-zip alfresco-governance-services-${release_type}-${RELEASE_VERSION}.zip *
-
-# rm *.amp *.war -f
-ls

amps/ags/travis/scripts/zip-artifacts-staging.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-release_type=$1
-
-mkdir "artifacts_dir"
-cp rm-${release_type}/rm-${release_type}-repo/target/alfresco-governance-services-${release_type}-repo-*.amp artifacts_dir
-cp rm-${release_type}/rm-${release_type}-share/target/alfresco-governance-services-${release_type}-share-*.amp artifacts_dir
-cp rm-${release_type}/rm-${release_type}-rest-api-explorer/target/alfresco-governance-services-${release_type}-rest-api-explorer-*.war artifacts_dir
-
-cd artifacts_dir
-zip alfresco-governance-services-${release_type}-${RELEASE_VERSION}.zip *
-
-# rm *.amp *.war -f
-ls

amps/pom.xml

@@ -7,10 +7,11 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <modules>
+        <module>share-services</module>
         <module>ags</module>
     </modules>
 </project>

amps/share-services/pom.xml

@@ -4,27 +4,33 @@
     <name>Alfresco Share Services AMP</name>
     <description>Module to be applied to alfresco.war, containing APIs for Alfresco Share</description>
     <packaging>amp</packaging>
+
     <parent>
-        <artifactId>alfresco-share-parent</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>7.0.1-SNAPSHOT</version>
+        <artifactId>alfresco-community-repo-amps</artifactId>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <scm-path>${project.parent.scm.url}</scm-path>
+        <scm-revision>${buildNumber}</scm-revision>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
-            <version>${dependency.alfresco-community-repo.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
             <exclusions>
-            	<exclusion>
-		            <groupId>org.alfresco</groupId>
-		            <artifactId>alfresco-core</artifactId>
-	        	</exclusion>
+                <exclusion>
+                    <groupId>org.alfresco</groupId>
+                    <artifactId>alfresco-core</artifactId>
+                </exclusion>
                 <!-- SHA-2432 -->
                 <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jstl</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>jstl</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>commons-collections</groupId>
@@ -35,7 +41,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
-            <version>${dependency.alfresco-community-repo.version}</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -62,13 +68,12 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
-            <version>${dependency.alfresco-community-repo.version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
             <exclusions>
@@ -76,14 +81,14 @@
                     <groupId>dom4j</groupId>
                     <artifactId>dom4j</artifactId>
                 </exclusion>
-            	<exclusion>
-		            <groupId>org.alfresco</groupId>
-		            <artifactId>alfresco-core</artifactId>
-	        	</exclusion>
-            	<!-- SHA-2432 -->
                 <exclusion>
-                  <groupId>javax.servlet</groupId>
-                  <artifactId>jstl</artifactId>
+                    <groupId>org.alfresco</groupId>
+                    <artifactId>alfresco-core</artifactId>
+                </exclusion>
+                <!-- SHA-2432 -->
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>jstl</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>commons-collections</groupId>
@@ -94,7 +99,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-remote-api</artifactId>
-            <version>${dependency.alfresco-community-repo.version}</version>
+            <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
@@ -117,39 +122,27 @@
             <version>${dependency.spring.version}</version>
             <scope>test</scope>
         </dependency>
-     <!--    <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>test</scope>
-        </dependency>
-		-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- SHA-2432 -->
         <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-spec</artifactId>
-          <scope>provided</scope>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-impl</artifactId>
-          <scope>provided</scope>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-impl</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-          <groupId>org.apache.taglibs</groupId>
-          <artifactId>taglibs-standard-jstlel</artifactId>
-          <scope>provided</scope>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-jstlel</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -188,31 +181,32 @@
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                         </manifest>
                         <manifestEntries>
-                            <Specification-Version>${version.major}.${version.minor}.${version.revision}</Specification-Version>
+                            <Specification-Version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}</Specification-Version>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Build-Date>${maven.build.timestamp}</Build-Date>
                             <Build-Name>${bamboo_planName}</Build-Name>
                             <Build-Key>${bamboo_fullBuildKey}</Build-Key>
-                            <Build-Number>${bamboo_buildNumber}</Build-Number>
-                            <Build-Revision>${bamboo_repository_revision_number}</Build-Revision>
+                            <Build-Number>${build-number}</Build-Number>
+                            <Build-Revision>${scm-revision}</Build-Revision>
                         </manifestEntries>
                     </archive>
-                </configuration>                
+                </configuration>
             </plugin>
 
             <plugin>
-               <artifactId>maven-surefire-plugin</artifactId>
-               <executions>
-                  <execution>
-                     <id>default-test</id>
-                     <!-- No unit tests in this project - all tests are integration tests -->
-                     <configuration>
-                          <includes>
-                              <include>nothing</include>
-                          </includes>
-                     </configuration>
-                  </execution>
-               </executions>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+
+                        <!-- No unit tests in this project - all tests are integration tests -->
+                        <configuration>
+                            <includes>
+                                <include>nothing</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -229,20 +223,20 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <executions>
                             <execution>
-                               <id>integration-tests</id>
-                               <goals>
-                                  <goal>test</goal>
-                               </goals>
-                               <configuration>
-                                  <includes combine.self="override">
-                                     <include>**/*Test.java</include>
-                                  </includes>
-                               </configuration>
+                                <id>integration-tests</id>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <includes combine.self="override">
+                                        <include>**/*Test.java</include>
+                                    </includes>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
-   </profiles>
+    </profiles>
 </project>

core/pom.xml

@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>11.14-ags-1.0-SNAPSHOT</version>
+      <version>11.7-ags-1.0-SNAPSHOT</version>
    </parent>
 
    <dependencies>

data-model/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/distribution/pom.xml

@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 </project>

packaging/docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>

packaging/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <profiles>

packaging/tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <modules>

packaging/tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <developers>

packaging/war/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <properties>

pom.xml

@@ -2,7 +2,7 @@
 <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>alfresco-community-repo</artifactId>
-    <version>11.14-ags-1.0-SNAPSHOT</version>
+    <version>11.7-ags-1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -105,7 +105,7 @@
         <dependency.mariadb.version>2.7.2</dependency.mariadb.version>
         <dependency.tas-utility.version>3.0.44</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.58</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.57</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.29</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>
@@ -335,6 +335,11 @@
                 <artifactId>commons-codec</artifactId>
                 <version>1.15</version>
             </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
+            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -633,19 +638,16 @@
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>utility</artifactId>
                 <version>${dependency.tas-utility.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>io.rest-assured</groupId>
                 <artifactId>rest-assured</artifactId>
                 <version>${dependency.rest-assured.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
                 <artifactId>restapi</artifactId>
                 <version>${dependency.tas-restapi.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
@@ -675,7 +677,6 @@
                 <groupId>org.alfresco.test</groupId>
                 <artifactId>dataprep</artifactId>
                 <version>${dependency.tas-dataprep.version}</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -789,6 +790,21 @@
                 <version>${dependency.camel.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-spec</artifactId>
+                <version>${dependency.apache.taglibs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-impl</artifactId>
+                <version>${dependency.apache.taglibs.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.taglibs</groupId>
+                <artifactId>taglibs-standard-jstlel</artifactId>
+                <version>${dependency.apache.taglibs.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -830,5 +846,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
 </project>

remote-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

repository/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>11.14-ags-1.0-SNAPSHOT</version>
+        <version>11.7-ags-1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -841,17 +841,14 @@
         <dependency>
             <groupId>org.apache.taglibs</groupId>
             <artifactId>taglibs-standard-spec</artifactId>
-            <version>${dependency.apache.taglibs.version}</version>
         </dependency>
         <dependency>
            <groupId>org.apache.taglibs</groupId>
            <artifactId>taglibs-standard-impl</artifactId>
-           <version>${dependency.apache.taglibs.version}</version>
         </dependency>
         <dependency>
            <groupId>org.apache.taglibs</groupId>
            <artifactId>taglibs-standard-jstlel</artifactId>
-           <version>${dependency.apache.taglibs.version}</version>
         </dependency>
         <!-- Repo Event Model-->
         <dependency>

scripts/travis/init.sh

@@ -14,9 +14,6 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
   echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
 fi
 
-# not helpful in this script
-# export HOST_IP=$(hostname  -I | cut -f1 -d' ')
-
 popd
 set +vex
 echo "=========================== Finishing Init Script =========================="

scripts/travis/maven_release.sh

@@ -13,7 +13,7 @@ git config user.email "${GIT_EMAIL}"
 # Run the release plugin - with "[skip ci]" in the release commit message
 mvn -B \
   -PfullBuild,all-tas-tests \
-  "-Darguments=-PfullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
+  "-Darguments=-Prelease,fullBuild,all-tas-tests -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
   release:clean release:prepare release:perform \
   -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
   -Dusername="${GIT_USERNAME}" \