From 9d121042d8d2a90c476e277756c82aa490070531 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Wed, 12 Jun 2024 07:38:10 +0200
Subject: [PATCH] Fix bamboo plan - logs fix
---
domismp-tests/domismp-docker/functions/run-test.functions | 4 ++--
.../src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/domismp-tests/domismp-docker/functions/run-test.functions b/domismp-tests/domismp-docker/functions/run-test.functions
index 0692d60bf..0c9d2b9e3 100644
--- a/domismp-tests/domismp-docker/functions/run-test.functions
+++ b/domismp-tests/domismp-docker/functions/run-test.functions
@@ -27,9 +27,9 @@ function initializeVariables() {
# Function exports the logs to file and stop and clear containers
function stopAndClearTestContainers() {
echo "Save docker log to docker-file"
- docker logs "${PLAN_PREFIX}" > smp-container.log 2>&1
+ docker compose -p "${PLAN_PREFIX}" logs > smp-containers.log 2>&1
echo "Clear containers and volumes"
- docker-compose -p "${PLAN_PREFIX}" rm -s -f -v
+ docker compose -p "${PLAN_PREFIX}" rm -s -f -v
}
################################################################
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
index 29e01b446..4eb543da8 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
@@ -146,7 +146,7 @@ public final class DomUtils {
protected static void setConfigurationOption(TransformerFactory factory, String feature, boolean value) {
try {
factory.setFeature(feature, value);
- } catch (TransformerConfigurationException e) {
+ } catch (UnsupportedOperationException | TransformerConfigurationException e) {
LOG.warn("TransformerFactory initialization error. The feature [{}] is not supported by current factory. The feature is ignored.", feature);
}
}
--
GitLab