Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into develop

# Conflicts:
#	resources/src/main/resources/business-model/milregistration.page
#	resources/src/main/resources/business-model/notregistered.page

backend/pom.xml

@@ -53,7 +53,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -130,6 +129,7 @@
     <dependency>
       <groupId>ru.cg.webbpm.modules.database</groupId>
       <artifactId>database-impl</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>ru.cg.webbpm.modules.jndi</groupId>
@@ -208,18 +208,6 @@
       <groupId>org.apache.tika</groupId>
       <artifactId>tika-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mnode.ical4j</groupId>
-      <artifactId>ical4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>net.javacrumbs.shedlock</groupId>
       <artifactId>shedlock-spring</artifactId>
@@ -232,6 +220,22 @@
       <groupId>ru.cg.webbpm.packages.base</groupId>
       <artifactId>backend</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jul</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-web</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${parent.artifactId}</finalName>

backend/src/main/java/AppConfig.java

@@ -36,7 +36,8 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
     "ru.cg",
     "ru.micord"
 }, excludeFilters = {
-    @ComponentScan.Filter(type = FilterType.REGEX, pattern = "security.WebSecurityConfig")
+    @ComponentScan.Filter(type = FilterType.REGEX, pattern = "security.WebSecurityConfig"),
+    @ComponentScan.Filter(type = FilterType.REGEX, pattern = "ru.cg.webbpm.modules.database.impl.DatabaseConfiguration"),
 })
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableWebMvc

backend/src/main/java/ru/micord/db/DbConfiguration.java

@@ -0,0 +1,156 @@
+package ru.micord.db;
+
+import org.jooq.ConnectionProvider;
+import org.jooq.DSLContext;
+import org.jooq.ExecuteListener;
+import org.jooq.conf.Settings;
+import org.jooq.impl.DefaultConfiguration;
+import org.jooq.impl.DefaultDSLContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import ru.cg.webbpm.modules.core.metrics.MetricsConfig;
+import ru.cg.webbpm.modules.core.runtime.api.context.ExecutionContextHelper;
+import ru.cg.webbpm.modules.database.api.ConfigurationProvider;
+import ru.cg.webbpm.modules.database.api.metrics.DataSourceWithMetrics;
+import ru.cg.webbpm.modules.database.api.provider.DslProvider;
+
+import ru.cg.webbpm.modules.database.impl.DbConfInitializer;
+import ru.cg.webbpm.modules.database.impl.data_source.DataSourceConfigReader;
+import ru.cg.webbpm.modules.database.impl.data_source.DataSourceFactory;
+import ru.cg.webbpm.modules.database.impl.data_source.HikariDataSourceFactory;
+import ru.cg.webbpm.modules.database.impl.data_source.JndiDataSourceFactory;
+import ru.cg.webbpm.modules.database.impl.provider.DefaultConnectionProvider;
+import ru.cg.webbpm.modules.database.impl.provider.DslProviderImpl;
+import ru.cg.webbpm.modules.database.impl.service.ProcessSqlService;
+
+import ru.cg.webbpm.modules.database.bean.config.Datasource;
+
+
+import ru.cg.webbpm.modules.resources.api.ResourceProvider;
+
+import ru.fix.aggregating.profiler.PrefixedProfiler;
+import ru.fix.aggregating.profiler.Profiler;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+@Import(MetricsConfig.class)
+public class DbConfiguration {
+  @Value("${webbpm.db.query_timeout:120}")
+  private Integer queryTimeout;
+  @Autowired
+  private ResourceProvider resourceProvider;
+  @Autowired
+  private ProcessSqlService processSqlService;
+  @Autowired
+  private Profiler profiler;
+  @Autowired
+  private ExecutionContextHelper executionContextHelper;
+
+  @Autowired
+  private ExecuteListener[] executeListeners;
+
+  private final Map<String, DSLContext> dslContextMap = new HashMap<>();
+  private final Map<String, org.jooq.ConnectionProvider> connectionProviderMap = new HashMap<>();
+
+  @Bean
+  public Datasource datasourceConfig() {
+    return DataSourceConfigReader.read(resourceProvider);
+  }
+
+  @Bean(destroyMethod = "destroy")
+  public DataSourceFactory dataSourceFactory(HikariDataSourceFactory hikariDataSourceFactory) {
+    return new DataSourceFactory(hikariDataSourceFactory);
+  }
+
+  @Bean
+  @Primary
+  public DataSource datasource(DataSourceFactory dataSourceFactory) {
+    DataSource dataSource = dataSourceFactory.createDataSource(datasourceConfig(),
+        JndiDataSourceFactory::createDataSource
+    );
+    return new DataSourceWithMetrics(
+        dataSource,
+        "project",
+        new PrefixedProfiler(profiler, "webbpm.db"),
+        executionContextHelper
+    );
+  }
+
+  @Bean
+  public PlatformTransactionManager txManager(@Qualifier("datasource") DataSource dataSource) {
+    return new DataSourceTransactionManager(dataSource);
+  }
+
+  @Bean
+  @Primary
+  public TransactionAwareDataSourceProxy transactionAwareDataSource(DataSource dataSource) {
+    return new TransactionAwareDataSourceProxy(dataSource);
+  }
+
+  @Bean
+  @Primary
+  public DefaultConnectionProvider connectionProvider(
+      TransactionAwareDataSourceProxy transactionAwareDataSourceProxy) {
+    return new DefaultConnectionProvider(transactionAwareDataSourceProxy, processSqlService,
+        connectionProviderMap
+    );
+  }
+
+  @Bean
+  public Settings jooqSettings(DataSourceFactory dataSourceFactory) {
+    Settings settings = new Settings();
+    if (dataSourceFactory.dataSourceType() == DataSourceFactory.DataSourceType.HIKARI) {
+      settings.setQueryTimeout(queryTimeout);
+    }
+    return settings;
+  }
+
+  @Bean
+  @Primary
+  public org.jooq.Configuration jooqConfiguration(ConnectionProvider connectionProvider,
+      Settings jooqSettings) {
+    DefaultConfiguration configuration = new DefaultConfiguration();
+    configuration.setSQLDialect(datasourceConfig().getSqlDialect());
+    jooqSettings = jooqSettings.withExecuteLogging(false);
+    configuration.setSettings(jooqSettings);
+    configuration.setConnectionProvider(connectionProvider);
+    configuration.set(executeListeners);
+    return configuration;
+  }
+
+  @Bean
+  @Primary
+  public DSLContext dsl(org.jooq.Configuration configuration) {
+    return new DefaultDSLContext(configuration);
+  }
+
+  @Bean
+  public ConfigurationProvider configurationProvider(
+      PlatformTransactionManager platformTransactionManager) {
+    return () -> platformTransactionManager;
+  }
+
+  @Bean
+  public DslProvider dslProvider(@Qualifier("dsl") DSLContext dsl) {
+    return new DslProviderImpl(dsl, this.dslContextMap);
+  }
+
+  @Bean
+  public DbConfInitializer dbConfInitializer(DataSourceFactory dataSourceFactory,
+                                             org.jooq.Configuration masterConfiguration, Datasource datasource) {
+    return new DbConfInitializer(dataSourceFactory, masterConfiguration, datasource,
+        processSqlService, connectionProviderMap, dslContextMap);
+  }
+}

backend/src/main/webapp/WEB-INF/log4j2.xml

@@ -0,0 +1,30 @@
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+    </Console>
+
+    <RollingRandomAccessFile name="LogToRollingRandomAccessFile" fileName="${sys:catalina.home}/logs/ervu-dashboard.log"
+                             filePattern="${sys:catalina.home}/logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+      <PatternLayout>
+        <Pattern>%d %p %c{1.} [%t] %m%n</Pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="20MB"/>
+      </Policies>
+      <DefaultRolloverStrategy max="10"/>
+    </RollingRandomAccessFile>
+
+    <Async name="Async">
+      <AppenderRef ref="LogToRollingRandomAccessFile"/>
+    </Async>
+
+  </Appenders>
+  <Loggers>
+    <Root level="INFO">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="Async"/>
+    </Root>
+  </Loggers>
+</Configuration>

config/Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
-ARG BACKEND_IMAGE=tomee:8.0.16-jre17-webprofile
+ARG BACKEND_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903
 ARG FRONTEND_IMAGE=docker.angie.software/angie:latest
 
 FROM $BUILDER_IMAGE AS builder
@@ -27,17 +27,21 @@ RUN mkdir -p $HOME/.m2 \
 FROM $BACKEND_IMAGE AS backend
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY config/tomcat/tomee /usr/local/tomee
+USER root
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+COPY config/tomcat /
 
-COPY --from=builder /app/backend/target/dashboard.war /usr/local/tomee/webapps/dashboard.war
+RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /etc/tomcat/tomcat-users.xml \
+ && chown root:tomcat /var/lib/tomcat/webapps \
+ && chmod g+rw /var/lib/tomcat/webapps
 
+USER tomcat
+
+COPY --from=builder /app/backend/target/dashboard.war /var/lib/tomcat/webapps/dashboard.war
 
 FROM backend AS combo
-COPY --from=builder /app/frontend/target/frontend*.war /usr/local/tomee/webapps/ROOT.war
+COPY --from=builder /app/frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war
 
 FROM $FRONTEND_IMAGE AS frontend
 

config/Dockerfile.TC

@@ -1,13 +1,22 @@
 #Dockerfile for TeamCity build "run in docker"
 
-FROM tomee:8.0.16-jre17-webprofile
+FROM repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY tomcat/tomee /usr/local/tomee
+USER root
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+COPY tomcat /
 
-COPY frontend.war /usr/local/tomee/webapps/ROOT.war
-COPY dashboard.war /usr/local/tomee/webapps/dashboard.war
+RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /etc/tomcat/tomcat-users.xml \
+ && chown root:tomcat /var/lib/tomcat/webapps \
+ && chmod g+rw /var/lib/tomcat/webapps
+
+COPY frontend.war /var/lib/tomcat/webapps/ROOT.war
+COPY dashboard.war /var/lib/tomcat/webapps/dashboard.war
+
+USER tomcat
+
+EXPOSE 8080
+
+ENTRYPOINT ["/entrypoint.sh"]

config/Dockerfile.alt

@@ -0,0 +1,49 @@
+ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
+ARG RUNTIME_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
+
+FROM $BUILDER_IMAGE AS builder
+
+ARG MVN_FLAGS="-Pprod"
+
+RUN apt-get update \
+ && apt-get -y install git glibc-locales java-17-openjdk-devel maven node \
+ && apt-get clean
+
+WORKDIR /app
+
+COPY . .
+
+ENV JAVA_HOME=/usr/lib/jvm/java
+ENV LANG ru_RU.UTF-8
+ENV LANGUAGE ru_RU.UTF-8
+ENV LC_ALL ru_RU.UTF-8
+
+RUN mvn clean \
+ && mvn package -T4C ${MVN_FLAGS}
+
+FROM $RUNTIME_IMAGE
+ARG ADMIN_PASSWORD=Secr3t
+
+COPY config/entrypoint.sh /entrypoint.sh
+
+RUN apt-get update \
+ && apt-get -y install glibc-locales java-17-openjdk-headless mc \
+                       tomcat tomcat-admin-webapps \
+ && apt-get clean \
+ && chmod +x /entrypoint.sh
+
+COPY config/tomcat /
+
+RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /etc/tomcat/tomcat-users.xml \
+ && chown root:tomcat /var/lib/tomcat/webapps \
+ && chmod g+rw /var/lib/tomcat/webapps
+
+COPY --from=builder /app/frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war
+COPY --from=builder /app/backend/target/dashboard*.war /var/lib/tomcat/webapps/dashboard.war
+
+USER tomcat
+
+EXPOSE 8080
+
+ENTRYPOINT ["/entrypoint.sh"]

config/Dockerfile.backend

@@ -1,5 +1,5 @@
 ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
-ARG RUNTIME_IMAGE=tomee:8.0.16-jre17-webprofile
+ARG RUNTIME_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903
 
 FROM $BUILDER_IMAGE AS builder
 
@@ -26,10 +26,15 @@ RUN mkdir -p $HOME/.m2 \
 FROM $RUNTIME_IMAGE
 ARG ADMIN_PASSWORD=Secr3t
 
-COPY config/tomcat/tomee /usr/local/tomee
+USER root
 
-RUN rm -rf /usr/local/tomee/webapps/ROOT \
- && cat /usr/local/tomee/conf/webbpm.properties >> /usr/local/tomee/conf/catalina.properties \
- && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /usr/local/tomee/conf/tomcat-users.xml
+COPY config/tomcat /
 
-COPY --from=builder /app/backend/target/dashboard*.war /usr/local/tomee/webapps/dashboard.war
+RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
+ && sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /etc/tomcat/tomcat-users.xml \
+ && chown root:tomcat /var/lib/tomcat/webapps \
+ && chmod g+rw /var/lib/tomcat/webapps
+
+USER tomcat
+
+COPY --from=builder /app/backend/target/dashboard*.war /var/lib/tomcat/webapps/dashboard.war

config/entrypoint.sh

@@ -0,0 +1,6 @@
+#! /bin/bash
+
+. /etc/tomcat/tomcat.conf
+. /etc/sysconfig/tomcat
+
+/usr/libexec/tomcat/server start

config/tomcat/etc/tomcat/conf.d/db.conf

@@ -1,9 +1,8 @@
-#!/usr/bin/env bash
-
-export JAVA_OPTS="$JAVA_OPTS \
+JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS \
  -Ddb.app.host=${DB_APP_HOST:-db} \
  -Ddb.app.port=${DB_APP_PORT:-5432} \
  -Ddb.app.name=${DB_APP_NAME:-app} \
  -Ddb.app.username=${DB_APP_USERNAME:-app_user} \
  -Ddb.app.password=${DB_APP_PASSWORD:-apppassword} \
 "
+export JDK_JAVA_OPTIONS

config/tomcat/etc/tomcat/context.xml

@@ -29,7 +29,7 @@
     <Manager pathname="" />
     -->
 
-    <Resource name="java:/webbpm/AppDS" auth="Container"
+    <Resource name="webbpm/AppDS" auth="Container"
           type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
           url="jdbc:postgresql://${db.app.host}:${db.app.port}/${db.app.name}"
           username="${db.app.username}" password="${db.app.password}" maxTotal="20" maxIdle="10" maxWaitMillis="-1"/>

config/tomcat/etc/tomcat/tomcat.conf

@@ -0,0 +1,52 @@
+# System-wide configuration file for tomcat services
+# This will be loaded by systemd as an environment file,
+# so please keep the syntax. For shell expansion support
+# place your custom files as /etc/tomcat/conf.d/*.conf
+#
+# There are 2 "classes" of startup behavior in this package.
+# The old one, the default service named tomcat.service.
+# The new named instances are called tomcat@instance.service.
+#
+# Use this file to change default values for all services.
+# Change the service specific ones to affect only one service.
+# For tomcat.service it's /etc/sysconfig/tomcat, for
+# tomcat@instance it's /etc/sysconfig/tomcat@instance.
+
+# This variable is used to figure out if config is loaded or not.
+TOMCAT_CFG_LOADED="1"
+
+# In new-style instances, if CATALINA_BASE isn't specified, it will
+# be constructed by joining TOMCATS_BASE and NAME.
+TOMCATS_BASE="/var/lib/tomcats/"
+
+# Where your java installation lives
+JAVA_HOME="/usr/lib/jvm/jre"
+
+# Where your tomcat installation lives
+CATALINA_HOME="/usr/share/tomcat"
+
+# System-wide tmp
+CATALINA_TMPDIR="/var/cache/tomcat/temp"
+
+# You can pass some parameters to java here if you wish to
+#JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
+
+# Use JAVA_OPTS to set java.library.path for libtcnative.so
+#JAVA_OPTS="-Djava.library.path=/usr/lib"
+
+# Set default javax.sql.DataSource factory to apache commons one. See rhbz#1214381
+#JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
+JAVA_OPTS="-Djavax.sql.DataSource.Factory=org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory"
+
+# You can change your tomcat locale here
+#LANG="en_US"
+
+# Run tomcat under the Java Security Manager
+SECURITY_MANAGER="false"
+
+# SHUTDOWN_WAIT has been deprecated. To change the shutdown wait time, set
+# TimeoutStopSec in tomcat.service.
+
+# If you wish to further customize your tomcat environment,
+# put your own definitions here
+# (i.e. LD_LIBRARY_PATH for some jdbc drivers)

config/tomcat/etc/tomcat/webbpm.properties

@@ -1,4 +1,7 @@
+
+#
 # WebBPM properties
+#
 
 authentication.method=form
 
@@ -6,6 +9,8 @@ bpmn.enable=false
 fias.enable=false
 gar.enable=false
 
+mail.jndi.resource.name=
+
 reset_password.mail.template.path=mail/reset_password.html
 security.password.regex=^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$
 

pom.xml

@@ -100,6 +100,22 @@
             <groupId>ru.cg.webbpm.modules.security</groupId>
             <artifactId>security-adapter</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>ru.micord.fias</groupId>
+            <artifactId>client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>ru.micord.gar</groupId>
+            <artifactId>gar-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-jdbc-template</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -176,11 +192,6 @@
         <version>${webbpm-platform.version}</version>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>ru.cg.webbpm.modules.security</groupId>
-        <artifactId>security-beans</artifactId>
-        <version>${webbpm-platform.version}</version>
-      </dependency>
       <dependency>
         <groupId>ru.cg.webbpm.modules.security</groupId>
         <artifactId>security-api</artifactId>
@@ -274,21 +285,6 @@
         <version>${webbpm-platform.version}</version>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>ru.cg.webbpm.modules.security</groupId>
-        <artifactId>security-esia</artifactId>
-        <version>${webbpm-platform.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>ru.cg.webbpm.modules.security</groupId>
-        <artifactId>security-db-synchronization-api</artifactId>
-        <version>${webbpm-platform.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>ru.cg.webbpm.modules.security</groupId>
-        <artifactId>security-db-synchronization-ldap-impl</artifactId>
-        <version>${webbpm-platform.version}</version>
-      </dependency>
       <dependency>
         <groupId>ru.cg.webbpm</groupId>
         <artifactId>web-tests-core</artifactId>
@@ -304,16 +300,6 @@
         <artifactId>bcpkix-jdk15on</artifactId>
         <version>${org.bouncycastle.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.springframework.security.kerberos</groupId>
-        <artifactId>spring-security-kerberos-core</artifactId>
-        <version>${spring-security-kerberos.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.security.kerberos</groupId>
-        <artifactId>spring-security-kerberos-web</artifactId>
-        <version>${spring-security-kerberos.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
@@ -350,6 +336,31 @@
         <artifactId>slf4j-simple</artifactId>
         <version>1.7.28</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>2.0.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-slf4j2-impl</artifactId>
+        <version>2.23.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>2.23.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-jul</artifactId>
+        <version>2.23.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-web</artifactId>
+        <version>2.23.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <repositories>