Merge branch 'master' into ATS-460

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>

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>

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>

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>

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 -->

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>

alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java

@@ -34,6 +34,7 @@ import org.apache.activemq.command.ActiveMQQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jms.annotation.JmsListenerConfigurer;
@@ -52,6 +53,7 @@ import org.springframework.transaction.PlatformTransactionManager;
  * created on 18/12/2018
  */
 @Configuration
+@ConditionalOnProperty(name = "activemq.url")
 public class MessagingConfig implements JmsListenerConfigurer
 {
     private static final Logger logger = LoggerFactory.getLogger(MessagingConfig.class);
@@ -63,6 +65,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public DefaultMessageHandlerMethodFactory methodFactory()
     {
         DefaultMessageHandlerMethodFactory factory = new DefaultMessageHandlerMethodFactory();
@@ -71,6 +74,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public DefaultJmsListenerContainerFactory jmsListenerContainerFactory(
         final ConnectionFactory connectionFactory,
         final TransformMessageConverter transformMessageConverter)
@@ -84,6 +88,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public PlatformTransactionManager transactionManager(final ConnectionFactory connectionFactory)
     {
         final JmsTransactionManager transactionManager = new JmsTransactionManager();
@@ -92,6 +97,7 @@ public class MessagingConfig implements JmsListenerConfigurer
     }
 
     @Bean
+    @ConditionalOnProperty(name = "activemq.url")
     public Queue engineRequestQueue(@Value("${queue.engineRequestQueue}") String engineRequestQueueValue)
     {
         return new ActiveMQQueue(engineRequestQueueValue);

alfresco-transformer-base/src/main/resources/application.yaml

@@ -1,3 +1,4 @@
+---
 spring:
   servlet:
     multipart:
@@ -18,7 +19,7 @@ server:
 
 logging:
   level:
-    #org.alfresco.util.exec.RuntimeExec: debug
+    # org.alfresco.util.exec.RuntimeExec: debug
     org.alfresco.transformer.LibreOfficeController: debug
     org.alfresco.transformer.JodConverterSharedInstance: debug
     org.alfresco.transformer.AlfrescoPdfRendererController: debug
@@ -36,9 +37,9 @@ management:
     web:
       exposure:
         include:
-        - metrics
-        - prometheus
-        - health
+          - metrics
+          - prometheus
+          - health
   metrics:
     enable[http]: false
     enable[logback]: false

pom.xml

@@ -46,12 +46,29 @@
     </scm>
 
     <dependencyManagement>
+
         <dependencies>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-core</artifactId>
                 <version>${dependency.alfresco-core.version}</version>
+                <!--
+                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>