From 964ef9094a37019a5f1313ca66aeb0b6bce92945 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 8 Jul 2019 16:53:10 +0100 Subject: [PATCH 1/3] ATS-481: Workaround attempt to upgrade from dom4j 1.6.1 to 2.1.1 (pending REPO-4514) - transitive dependency (alfresco-core <- spring-surf-core-configservice) --- pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index e2b60fd3..8f9dcf3d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,12 +45,29 @@ + org.alfresco alfresco-core ${dependency.alfresco-core.version} + + + + org + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-data-model From c7fd2acd85fabacd36023fcbb13cc963fee98ab9 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 8 Jul 2019 17:11:39 +0100 Subject: [PATCH 2/3] 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-jodconverter-core 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-data-model 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + + org.dom4j + dom4j + 2.1.1 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 @@ + org.alfresco alfresco-core + + + + dom4j + dom4j + + + + org.dom4j + dom4j + 2.1.1 + + org.alfresco alfresco-transform-model diff --git a/pom.xml b/pom.xml index 8f9dcf3d..8a5f8a61 100644 --- a/pom.xml +++ b/pom.xml @@ -52,12 +52,12 @@ alfresco-core ${dependency.alfresco-core.version} - org + dom4j dom4j From 8b3e451b44a4226ebdb0ebd0190f4b33c5746d01 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 9 Jul 2019 01:43:10 +0300 Subject: [PATCH 3/3] ATS-467 : Disable JMS Config beans on missing "activemq.url" property --- .../transformer/messaging/MessagingConfig.java | 6 ++++++ .../src/main/resources/application.yaml | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java index 437b349d..ce5d7568 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java +++ b/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); diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml index 8bc4f767..d18bf043 100644 --- a/alfresco-transformer-base/src/main/resources/application.yaml +++ b/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 @@ -46,4 +47,4 @@ management: enable[jvm.classes]: false container: - name: ${HOSTNAME:t-engine} \ No newline at end of file + name: ${HOSTNAME:t-engine}