From 04321e40d7c48a04e0c0e61e72e3f8fa85d56476 Mon Sep 17 00:00:00 2001
From: Andrei Rebegea <andrei.rebegea@ness.com>
Date: Thu, 15 Jun 2017 10:55:43 +0000
Subject: [PATCH] Merged 5.2.N (5.2.2) to HEAD (5.2)    135862 amorarasu:      
 Reverse merged 5.2.N (5.2.1)             135848 anechifor: REPO-1193
 MNT-16734: Added a new release version alfresco-messaging-repo 1.2.8         
    Resolve security issue CVE-2014-3612 updating ActiveMQ 5.13.0.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 80 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 566409095..0672021a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,19 @@
 
     <properties>
         <maven.tomcat.path>/alfresco</maven.tomcat.path>
+        <maven.tomcat.uriEncoding>UTF-8</maven.tomcat.uriEncoding>
         <maven.tomcat.port>${tomcat.default.alfresco.port}</maven.tomcat.port>
         <maven.tomcat.httpsPort>${tomcat.default.alfresco.ssl.port}</maven.tomcat.httpsPort>
+        <runner.share.version>5.1.1</runner.share.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>alfresco-trashcan-cleaner</artifactId>
+            <version>${dependency.alfresco-trashcan-cleaner.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>alfresco-remote-api</artifactId>
@@ -86,16 +94,11 @@
             <artifactId>standard</artifactId>
             <version>1.1.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.chemistry.opencmis</groupId>
-            <artifactId>chemistry-opencmis-test-browser</artifactId>
-            <version>${dependency.opencmis.version}</version>
-        </dependency>
 
         <!-- 'provided' dependencies, not packaged in war -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -113,14 +116,14 @@
        <dependency>
             <groupId>org.alfresco.services</groupId>
             <artifactId>alfresco-messaging-repo</artifactId>
-            <version>1.2.8</version>
+            <version>1.2.5</version>
         </dependency>
 
         <!-- CORS Filter Libraries -->
         <dependency>
             <groupId>com.thetransactioncompany</groupId>
             <artifactId>cors-filter</artifactId>
-            <version>1.9.3</version>
+            <version>2.5</version>
         </dependency>
 
         <!-- Test dependencies -->
@@ -158,7 +161,7 @@
         <dependency>
             <groupId>org.apache.shale</groupId>
             <artifactId>shale-test</artifactId>
-            <version>1.0.4</version>
+            <version>1.0.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -226,7 +229,7 @@
 
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <executions> 
+                <executions>
                     <!-- ACE-2318 Bring alfresco-jmxrmi.* from repository -->
                     <execution>
                         <id>fetch-jmxrmi-properties</id>
@@ -319,7 +322,15 @@
                             <asWebapp>true</asWebapp>
                             <contextFile>${runtime.tomcat.conf.folder}/solr-context.xml</contextFile>
                         </webapp>
-                    </webapps> 
+                        <webapp>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>api-explorer</artifactId>
+                            <version>${dependency.api-explorer.version}</version>
+                            <contextPath>/api-explorer</contextPath>
+                            <type>war</type>
+                            <asWebapp>true</asWebapp>
+                        </webapp>
+                    </webapps>
                 </configuration>
             </plugin>
         </plugins>
@@ -339,8 +350,51 @@
                 <dependency>
                     <groupId>mysql</groupId>
                     <artifactId>mysql-connector-java</artifactId>
-                </dependency>            
+                </dependency>
             </dependencies>
        </profile>
-    </profiles>   
+        <profile>
+            <id>withShare</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.alfresco</groupId>
+                    <artifactId>alfresco-share-services</artifactId>
+                    <version>${runner.share.version}</version>
+                    <type>amp</type>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <overlays>
+                                <overlay>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-share-services</artifactId>
+                                    <type>amp</type>
+                                </overlay>
+                            </overlays>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.tomcat.maven</groupId>
+                        <artifactId>tomcat7-maven-plugin</artifactId>
+                        <configuration>
+                            <webapps combine.children="append">
+                                <webapp>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>share</artifactId>
+                                    <contextPath>/share</contextPath>
+                                    <version>${runner.share.version}</version>
+                                    <type>war</type>
+                                    <asWebapp>true</asWebapp>
+                                </webapp>
+                            </webapps>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>