From c7fd2acd85fabacd36023fcbb13cc963fee98ab9 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Mon, 8 Jul 2019 17:11:39 +0100
Subject: [PATCH] ATS-481: Temp workaround attempt to update from dom4j 1.6.1
 to 2.1.1 (pending REPO-4514)

- transitive dependency (alfresco-core <- spring-surf-core-configservice)
---
 alfresco-docker-alfresco-pdf-renderer/pom.xml | 17 +++++++++++++++++
 alfresco-docker-imagemagick/pom.xml           | 17 +++++++++++++++++
 alfresco-docker-libreoffice/pom.xml           | 17 +++++++++++++++++
 alfresco-docker-tika/pom.xml                  | 17 +++++++++++++++++
 alfresco-docker-transform-misc/pom.xml        | 16 ++++++++++++++++
 alfresco-transformer-base/pom.xml             | 17 +++++++++++++++++
 pom.xml                                       |  4 ++--
 7 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml
index e7410dc0..cb28fc73 100644
--- a/alfresco-docker-alfresco-pdf-renderer/pom.xml
+++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml
@@ -45,10 +45,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        
     </dependencies>
 
     <build>
diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml
index 8845950c..2b698831 100644
--- a/alfresco-docker-imagemagick/pom.xml
+++ b/alfresco-docker-imagemagick/pom.xml
@@ -45,10 +45,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml
index 9b005596..25351358 100644
--- a/alfresco-docker-libreoffice/pom.xml
+++ b/alfresco-docker-libreoffice/pom.xml
@@ -45,10 +45,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-jodconverter-core</artifactId>
diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml
index c91ac006..224c2605 100644
--- a/alfresco-docker-tika/pom.xml
+++ b/alfresco-docker-tika/pom.xml
@@ -46,10 +46,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml
index 17d38723..5c55c203 100644
--- a/alfresco-docker-transform-misc/pom.xml
+++ b/alfresco-docker-transform-misc/pom.xml
@@ -47,9 +47,25 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
         </dependency>
 
         <!-- HtmlParserContentTransformer -->
diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml
index 3fea7243..4c9f8808 100644
--- a/alfresco-transformer-base/pom.xml
+++ b/alfresco-transformer-base/pom.xml
@@ -39,10 +39,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-core</artifactId>
+            <!--
+            TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
+            TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
+            -->
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-transform-model</artifactId>
diff --git a/pom.xml b/pom.xml
index 8f9dcf3d..8a5f8a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,12 +52,12 @@
                 <artifactId>alfresco-core</artifactId>
                 <version>${dependency.alfresco-core.version}</version>
                 <!--
-                TODO temp workaround for ATS-481 / REPO-4514
+                TODO temp workaround for ATS-481 / REPO-4514 (exclude: dom4j.dom4j 1.6.1 / include org.dom4j.dom4j 2.1.1)
                 TODO remove this workaround once transitive dependencies have been fixed (surf-core-configservice -> alfresco-core)
                 -->
                 <exclusions>
                     <exclusion>
-                        <groupId>org</groupId>
+                        <groupId>dom4j</groupId>
                         <artifactId>dom4j</artifactId>
                     </exclusion>
                 </exclusions>