Merge remote-tracking branch 'origin/issue/236_Upgrade_Dependencies'

into develop
datasharingframework · Oct 9, 2024 · 04b6829 · 04b6829
2 parents ed83bac + eeddda2
commit 04b6829
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 61 deletions.
diff --git a/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml b/dsf-bpe/dsf-bpe-server-jetty/conf/log4j2.xml
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30"
+<Configuration status="WARN" monitorInterval="30"
 			   verbose="false">
 
 	<Appenders>

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">
 			<PatternLayout pattern="%highlight{%p %t - %C{1}.%M(%L) | %m}{FATAL=red, ERROR=red, WARN=yellow, INFO=white, DEBUG=white, TRACE=white}%n" />

diff --git a/...erver/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java b/...erver/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));
 	}
-}
+}
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
@@ -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
@@ -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
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+	xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+
+	<changeSet author="camunda.org" id="db.camunda_engine.changelog-1.6.0">
+		<sqlFile dbms="postgresql" encoding="utf8" path="db/camunda/postgres_engine_7.21_to_7.22.sql" />
+	</changeSet>
+
+</databaseChangeLog>
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
@@ -17,4 +17,6 @@
 	<include file="db/db.camunda_engine.changelog-1.3.0.xml" />
 
 	<include file="db/db.camunda_engine.changelog-1.5.1.xml" />
+
+	<include file="db/db.camunda_engine.changelog-1.6.0.xml" />
 </databaseChangeLog>
diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30"
+<Configuration status="WARN" monitorInterval="30"
 			   verbose="false">
 
 	<Appenders>

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git a/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml b/dsf-fhir/dsf-fhir-server-jetty/conf/log4j2.xml
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30"
+<Configuration status="WARN" monitorInterval="30"
 			   verbose="false">
 
 	<Appenders>

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">
 			<PatternLayout pattern="%highlight{%p %t - %C{1}.%M(%L) | %m}{FATAL=red, ERROR=red, WARN=yellow, INFO=white, DEBUG=white, TRACE=white}%n" />

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git 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 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30"
+<Configuration status="WARN" monitorInterval="30"
 			   verbose="false">
 
 	<Appenders>

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
@@ -1,4 +1,4 @@
-<Configuration status="INFO" monitorInterval="30" verbose="false">
+<Configuration status="WARN" monitorInterval="30" verbose="false">
 
 	<Appenders>
 		<Console name="CONSOLE" target="SYSTEM_OUT">

diff --git a/pom.xml b/pom.xml
@@ -21,14 +21,14 @@
 
 		<main.basedir>${project.basedir}</main.basedir>
 
-		<slf4j.version>2.0.13</slf4j.version>
-		<log4j.version>2.23.1</log4j.version>
-		<jetty.version>11.0.22</jetty.version>
-		<jersey.version>3.1.7</jersey.version>
-		<tyrus.version>2.1.5</tyrus.version>
-		<spring.version>6.1.10</spring.version>
-		<jackson.version>2.17.2</jackson.version>
-		<camunda.version>7.21.0</camunda.version>
+		<slf4j.version>2.0.16</slf4j.version>
+		<log4j.version>2.24.1</log4j.version>
+		<jetty.version>11.0.24</jetty.version>
+		<jersey.version>3.1.9</jersey.version>
+		<tyrus.version>2.2.0</tyrus.version>
+		<spring.version>6.1.13</spring.version>
+		<jackson.version>2.18.0</jackson.version>
+		<camunda.version>7.22.0</camunda.version>
 		<hapi.fhir.version>5.1.0</hapi.fhir.version>
 		<bouncycastle.version>1.78.1</bouncycastle.version>
 	</properties>
@@ -134,7 +134,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>5.12.0</version>
+				<version>5.14.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.bouncycastle</groupId>
@@ -156,12 +156,12 @@
 			<dependency>
 				<groupId>org.liquibase</groupId>
 				<artifactId>liquibase-core</artifactId>
-				<version>4.28.0</version>
+				<version>4.29.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.postgresql</groupId>
 				<artifactId>postgresql</artifactId>
-				<version>42.7.3</version>
+				<version>42.7.4</version>
 			</dependency>
 
 			<!-- hhn rwh -->
@@ -392,7 +392,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
-				<version>1.26.2</version>
+				<version>1.27.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
@@ -423,12 +423,12 @@
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
-				<version>2.16.1</version>
+				<version>2.17.0</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.17.0</version>
+				<version>1.17.1</version>
 			</dependency>
 
 			<dependency>
@@ -450,7 +450,7 @@
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>2.2</version>
+				<version>2.3</version>
 			</dependency>
 
 			<dependency>
@@ -463,17 +463,17 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-core</artifactId>
-				<version>3.9.8</version>
+				<version>3.9.9</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-plugin-api</artifactId>
-				<version>3.9.8</version>
+				<version>3.9.9</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.plugin-tools</groupId>
 				<artifactId>maven-plugin-annotations</artifactId>
-				<version>3.13.1</version>
+				<version>3.15.0</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -511,17 +511,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.7.0</version>
+					<version>3.10.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.5.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.5.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -541,7 +541,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.2.4</version>
+					<version>3.2.7</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -562,22 +562,22 @@
 				<plugin>
 					<groupId>net.revelc.code</groupId>
 					<artifactId>impsort-maven-plugin</artifactId>
-					<version>1.11.0</version>
+					<version>1.12.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.7.1</version>
+					<version>3.8.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>buildnumber-maven-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.2.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-plugin-plugin</artifactId>
-					<version>3.13.1</version>
+					<version>3.15.0</version>
 				</plugin>
 				<plugin>
 					<groupId>dev.dsf</groupId>
@@ -592,22 +592,22 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.12.1</version>
+					<version>3.20.0</version>
 				</plugin>
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.8.6.2</version>
+					<version>4.8.6.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.6.1</version>
+					<version>3.7.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-pmd-plugin</artifactId>
-					<version>3.23.0</version>
+					<version>3.25.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>