diff --git a/mail-service/pom.xml b/mail-service/pom.xml
index 5cd1ad57b2b7696922dcaa8e8530bf7ecbc6b62b..b513fb0a43d5be4cace46e7e345807aceae6325f 100644
--- a/mail-service/pom.xml
+++ b/mail-service/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -13,7 +11,7 @@
<groupId>de.itvsh.ozg.mail</groupId>
<artifactId>mail-service</artifactId>
<version>0.29.0-SNAPSHOT</version>
-
+
<properties>
<java.version>17</java.version>
<!-- TODO version management -->
@@ -32,15 +30,18 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
+
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
+
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId>
@@ -102,10 +103,10 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>io.github.hakky54</groupId>
- <artifactId>logcaptor</artifactId>
- <version>${logcaptor.version}</version>
- <scope>test</scope>
+ <groupId>io.github.hakky54</groupId>
+ <artifactId>logcaptor</artifactId>
+ <version>${logcaptor.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -118,7 +119,7 @@
<skip>true</skip>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -167,4 +168,4 @@
<url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
</snapshotRepository>
</distributionManagement>
-</project>
+</project>
\ No newline at end of file
diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml
index ea13fc62a301e26da9543df35f18ffdf81753a60..3990a7f2d1dfc2a4c13f8735d9f823fb37110397 100644
--- a/pluto-server/pom.xml
+++ b/pluto-server/pom.xml
@@ -28,7 +28,7 @@
<mongock.version>5.0.35</mongock.version>
<testcontainer.version>1.17.3</testcontainer.version>
-
+
<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
</properties>
@@ -71,9 +71,14 @@
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <artifactId>spring-boot-starter-freemarker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
@@ -90,10 +95,10 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
<!-- aspectJ -->
@@ -214,10 +219,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${testcontainer.version}</version>
- <scope>test</scope>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>elasticsearch</artifactId>
+ <version>${testcontainer.version}</version>
+ <scope>test</scope>
</dependency>
<!-- mongock -->
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/BeansConfig.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/BeansConfig.java
deleted file mode 100644
index 840adb80b320ab1469f9556ab9fd16190030825a..0000000000000000000000000000000000000000
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/BeansConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.itvsh.ozg.pluto;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
-
-@Configuration
-public class BeansConfig {
-
- @Bean
- FreeMarkerConfigurer freeMarkerConfigurer() {
- FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer();
- freeMarkerConfigurer.setTemplateLoaderPath("classpath:/templates");
- freeMarkerConfigurer.setDefaultEncoding("UTF-8");
- return freeMarkerConfigurer;
- }
-
-}
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
index a5c0ae54725873d338885337feb67fea791efc16..411bc8bd87e78074f64b603200ca7966e45edf98 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.util.MimeTypeUtils;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.itvsh.ozg.mail.email.MailSendRequest;
@@ -30,6 +29,7 @@ import de.itvsh.ozg.pluto.command.PersistedCommand;
import de.itvsh.ozg.pluto.vorgang.Vorgang;
import de.itvsh.ozg.pluto.vorgang.VorgangService;
import de.itvsh.ozg.pluto.vorgang.redirect.Forwarding.Status;
+import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -65,7 +65,7 @@ public class ForwardingService {
private ForwardingRepository repository;
@Autowired
- private FreeMarkerConfigurer freemarkerCfg;
+ private Configuration freemarkerCfg;
@Autowired
private ZipBuilderService zipService;
@@ -258,7 +258,7 @@ public class ForwardingService {
Template getTemplate(String templateName) {
try {
- return freemarkerCfg.getConfiguration().getTemplate(templateName);
+ return freemarkerCfg.getTemplate(templateName);
} catch (IOException e) {
throw new TechnicalException("Error loading mail template", e);
}