From 0cc1d43d5ed3e705fbd6b7ddb408301a13140e59 Mon Sep 17 00:00:00 2001
From: jgravi <jgravi@werfen.com>
Date: Tue, 3 Jan 2023 15:55:18 +0100
Subject: [PATCH 1/2] remove-unused-cache

---
 pom.xml                            |  7 +------
 src/main/resources/application.yml | 10 ----------
 src/main/resources/ehcache.xml     | 14 --------------
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 src/main/resources/ehcache.xml

diff --git a/pom.xml b/pom.xml
index 135a2f5..b71b764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,17 +74,12 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-envers</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-            <version>3.6.2</version>
-        </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt-api</artifactId>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c778f5b..c075334 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -86,16 +86,6 @@ spring:
       enabled: true
       path: /h2
 
-  cache:
-    jcache:
-      config: classpath:ehcache.xml
-  web:
-    resources:
-      cache:
-        cachecontrol:
-          max-age: 120
-          must-revalidate: true
-
 patient:
   maintenance:
     cron:
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
deleted file mode 100644
index d43802c..0000000
--- a/src/main/resources/ehcache.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<config xmlns='http://www.ehcache.org/v3'
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns:jsr107="http://www.ehcache.org/v3/jsr107"
-        xsi:schemaLocation="http://www.ehcache.org/v3 http://www.ehcache.org/schema/ehcache-core-3.0.xsd
-							http://www.ehcache.org/v3/jsr107 http://www.ehcache.org/schema/ehcache-107-ext-3.0.xsd">
-    <cache alias="buckets">
-        <expiry>
-            <ttl unit="seconds">3600</ttl>
-        </expiry>
-        <heap unit="entries">1000000</heap>
-        <jsr107:mbeans enable-statistics="true"/>
-    </cache>
-
-</config>
\ No newline at end of file

From f804f798b8f62c76a9e2d648d1ab70c879dee19d Mon Sep 17 00:00:00 2001
From: jgravi <jgravi@werfen.com>
Date: Thu, 5 Jan 2023 12:57:03 +0100
Subject: [PATCH 2/2] restored cachecontrol

---
 src/main/resources/application.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c075334..67b02c5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -85,6 +85,12 @@ spring:
     console:
       enabled: true
       path: /h2
+  web:
+    resources:
+      cache:
+        cachecontrol:
+          max-age: 120
+          must-revalidate: true
 
 patient:
   maintenance: