From 990f94d851a1a6d7b961bc15cb4b9e2bb0b62144 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Tue, 8 Oct 2024 19:13:22 +0200 Subject: [PATCH] dependency and maven plugin version upgrades Code changes to reflect camunda 7.21 -> 7.22. upgrade. Reconfigured log4j to suppress config messages on startup to system out. --- dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml | 2 +- .../docker/conf/log4j2.xml | 2 +- ...rsionSpringProcessEngineConfiguration.java | 13 +--- .../dsf/bpe/spring/config/CamundaConfig.java | 4 -- .../camunda/postgres_engine_7.21_to_7.22.sql | 29 +++++++++ .../db/db.camunda_engine.changelog-1.6.0.xml | 12 ++++ .../src/main/resources/db/db.changelog.xml | 2 + .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../dsf-fhir-server-jetty/conf/log4j2.xml | 2 +- .../docker/conf/log4j2.xml | 2 +- .../log4j2-maven-surefire-config.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/test/resources/log4j2.xml | 2 +- .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/log4j2.xml | 2 +- pom.xml | 60 +++++++++---------- 23 files changed, 93 insertions(+), 61 deletions(-) create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.21_to_7.22.sql create mode 100644 dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.6.0.xml diff --git a/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml b/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml index 0c1747aa9..812d34c8f 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml @@ -1,4 +1,4 @@ - diff --git a/dsf-bpe/dsf-bpe-server-jetty/docker/conf/log4j2.xml b/dsf-bpe/dsf-bpe-server-jetty/docker/conf/log4j2.xml index bc09f21e4..57699e922 100644 --- a/dsf-bpe/dsf-bpe-server-jetty/docker/conf/log4j2.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/docker/conf/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java index e6369efc7..7ef3eab84 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java @@ -11,17 +11,10 @@ public MultiVersionSpringProcessEngineConfiguration(DelegateProvider delegatePro } @Override - protected void initTelemetry() + protected void initDiagnostics() { // override to turn telemetry collection of - // see also CamundaConfig - } - @Override - public TelemetryDataImpl getTelemetryData() - { - // NPE fix after turning off telemetry collection - // see also CamundaConfig - return new TelemetryDataImpl(null, null); + setTelemetryData(new TelemetryDataImpl(null, null)); } -} +} \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java index e2c95a525..5d73a60fb 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java @@ -124,10 +124,6 @@ public SpringProcessEngineConfiguration processEngineConfiguration() serializerConfig.fhirResourceSerializer(), serializerConfig.fhirResourcesListSerializer())); c.setFallbackSerializerFactory(fallbackSerializerFactory()); - // see also MultiVersionSpringProcessEngineConfiguration - c.setInitializeTelemetry(false); - c.setTelemetryReporterActivate(false); - DefaultJobExecutor jobExecutor = new DefaultJobExecutor(); jobExecutor.setCorePoolSize(propertiesConfig.getProcessEngineJobExecutorCorePoolSize()); jobExecutor.setQueueSize(propertiesConfig.getProcessEngineJobExecutorQueueSize()); diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.21_to_7.22.sql b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.21_to_7.22.sql new file mode 100644 index 000000000..55583c6f4 --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/camunda/postgres_engine_7.21_to_7.22.sql @@ -0,0 +1,29 @@ +-- +-- Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH +-- under one or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information regarding copyright +-- ownership. Camunda licenses this file to you under the Apache License, +-- Version 2.0; you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- + +insert into ACT_GE_SCHEMA_LOG +values ('1100', CURRENT_TIMESTAMP, '7.22.0'); + +alter table ACT_RU_TASK add column TASK_STATE_ varchar(64); + +alter table ACT_HI_TASKINST add column TASK_STATE_ varchar(64); + +alter table ACT_RU_JOB add column BATCH_ID_ varchar(64); +alter table ACT_HI_JOB_LOG add column BATCH_ID_ varchar(64); + +alter table ACT_HI_PROCINST add RESTARTED_PROC_INST_ID_ varchar(64); +create index ACT_IDX_HI_PRO_RST_PRO_INST_ID on ACT_HI_PROCINST(RESTARTED_PROC_INST_ID_); diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.6.0.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.6.0.xml new file mode 100644 index 000000000..c6967db93 --- /dev/null +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.camunda_engine.changelog-1.6.0.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml index 7dff2d181..865d2bd97 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/db/db.changelog.xml @@ -17,4 +17,6 @@ + + \ No newline at end of file diff --git a/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2.xml b/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2.xml index 4095d8e49..42507e66a 100755 --- a/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2.xml +++ b/dsf-bpe/dsf-bpe-server/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - diff --git a/dsf-common/dsf-common-auth/src/test/resources/log4j2.xml b/dsf-common/dsf-common-auth/src/test/resources/log4j2.xml index 96df92ff8..ea8c9d0c4 100644 --- a/dsf-common/dsf-common-auth/src/test/resources/log4j2.xml +++ b/dsf-common/dsf-common-auth/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-common/dsf-common-config/src/test/resources/log4j2.xml b/dsf-common/dsf-common-config/src/test/resources/log4j2.xml index aa5ddf5a5..ec2b86c10 100644 --- a/dsf-common/dsf-common-config/src/test/resources/log4j2.xml +++ b/dsf-common/dsf-common-config/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-common/dsf-common-jetty/src/test/resources/log4j2.xml b/dsf-common/dsf-common-jetty/src/test/resources/log4j2.xml index aa5ddf5a5..ec2b86c10 100644 --- a/dsf-common/dsf-common-jetty/src/test/resources/log4j2.xml +++ b/dsf-common/dsf-common-jetty/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-auth/src/test/resources/log4j2.xml b/dsf-fhir/dsf-fhir-auth/src/test/resources/log4j2.xml index 116ccf90e..7bafc4cfc 100644 --- a/dsf-fhir/dsf-fhir-auth/src/test/resources/log4j2.xml +++ b/dsf-fhir/dsf-fhir-auth/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-rest-adapter/src/test/resources/log4j2.xml b/dsf-fhir/dsf-fhir-rest-adapter/src/test/resources/log4j2.xml index d5beb117e..6d88f4a92 100644 --- a/dsf-fhir/dsf-fhir-rest-adapter/src/test/resources/log4j2.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml b/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml index 20ab24b03..22562c0d5 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml @@ -1,4 +1,4 @@ - diff --git a/dsf-fhir/dsf-fhir-server-jetty/docker/conf/log4j2.xml b/dsf-fhir/dsf-fhir-server-jetty/docker/conf/log4j2.xml index ddc27f007..4a47ab17b 100644 --- a/dsf-fhir/dsf-fhir-server-jetty/docker/conf/log4j2.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/docker/conf/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml index d72cf2a72..9c5baf9ed 100755 --- a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml +++ b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2.xml b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2.xml index aa5ddf5a5..ec2b86c10 100755 --- a/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2.xml +++ b/dsf-fhir/dsf-fhir-server/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-fhir/dsf-fhir-validation/src/test/resources/log4j2.xml b/dsf-fhir/dsf-fhir-validation/src/test/resources/log4j2.xml index 116ccf90e..7bafc4cfc 100644 --- a/dsf-fhir/dsf-fhir-validation/src/test/resources/log4j2.xml +++ b/dsf-fhir/dsf-fhir-validation/src/test/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-tools/dsf-tools-bundle-generator/src/main/resources/log4j2.xml b/dsf-tools/dsf-tools-bundle-generator/src/main/resources/log4j2.xml index 896f07998..e8fb24d29 100755 --- a/dsf-tools/dsf-tools-bundle-generator/src/main/resources/log4j2.xml +++ b/dsf-tools/dsf-tools-bundle-generator/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-tools/dsf-tools-documentation-generator/src/main/resources/log4j2.xml b/dsf-tools/dsf-tools-documentation-generator/src/main/resources/log4j2.xml index 896f07998..e8fb24d29 100755 --- a/dsf-tools/dsf-tools-documentation-generator/src/main/resources/log4j2.xml +++ b/dsf-tools/dsf-tools-documentation-generator/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/dsf-tools/dsf-tools-proxy-test/src/main/resources/log4j2.xml b/dsf-tools/dsf-tools-proxy-test/src/main/resources/log4j2.xml index 630850f14..bcf6fe9a0 100755 --- a/dsf-tools/dsf-tools-proxy-test/src/main/resources/log4j2.xml +++ b/dsf-tools/dsf-tools-proxy-test/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - diff --git a/dsf-tools/dsf-tools-test-data-generator/src/main/resources/log4j2.xml b/dsf-tools/dsf-tools-test-data-generator/src/main/resources/log4j2.xml index 6e8a1fa98..e3832195b 100755 --- a/dsf-tools/dsf-tools-test-data-generator/src/main/resources/log4j2.xml +++ b/dsf-tools/dsf-tools-test-data-generator/src/main/resources/log4j2.xml @@ -1,4 +1,4 @@ - + diff --git a/pom.xml b/pom.xml index 1aedbe243..5590e8953 100755 --- a/pom.xml +++ b/pom.xml @@ -21,14 +21,14 @@ ${project.basedir} - 2.0.13 - 2.23.1 - 11.0.22 - 3.1.7 - 2.1.5 - 6.1.10 - 2.17.2 - 7.21.0 + 2.0.16 + 2.24.1 + 11.0.24 + 3.1.9 + 2.2.0 + 6.1.13 + 2.18.0 + 7.22.0 5.1.0 1.78.1 @@ -134,7 +134,7 @@ org.mockito mockito-core - 5.12.0 + 5.14.1 org.bouncycastle @@ -156,12 +156,12 @@ org.liquibase liquibase-core - 4.28.0 + 4.29.2 org.postgresql postgresql - 42.7.3 + 42.7.4 @@ -392,7 +392,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 org.apache.commons @@ -423,12 +423,12 @@ commons-io commons-io - 2.16.1 + 2.17.0 commons-codec commons-codec - 1.17.0 + 1.17.1 @@ -450,7 +450,7 @@ org.yaml snakeyaml - 2.2 + 2.3 @@ -463,17 +463,17 @@ org.apache.maven maven-core - 3.9.8 + 3.9.9 org.apache.maven maven-plugin-api - 3.9.8 + 3.9.9 org.apache.maven.plugin-tools maven-plugin-annotations - 3.13.1 + 3.15.0 @@ -511,17 +511,17 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.10.1 org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.5.1 org.apache.maven.plugins maven-failsafe-plugin - 3.3.0 + 3.5.1 org.apache.maven.plugins @@ -541,7 +541,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.7 org.codehaus.mojo @@ -562,22 +562,22 @@ net.revelc.code impsort-maven-plugin - 1.11.0 + 1.12.0 org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.0 org.codehaus.mojo buildnumber-maven-plugin - 3.2.0 + 3.2.1 org.apache.maven.plugins maven-plugin-plugin - 3.13.1 + 3.15.0 dev.dsf @@ -592,22 +592,22 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 3.20.0 com.github.spotbugs spotbugs-maven-plugin - 4.8.6.2 + 4.8.6.4 org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.1 + 3.7.0 org.apache.maven.plugins maven-pmd-plugin - 3.23.0 + 3.25.0