From 0252e702b8bca2473c1467d8602ca60f2fd0ba9c Mon Sep 17 00:00:00 2001
From: Richard Eckart de Castilho <richard.eckart@gmail.com>
Date: Tue, 22 Nov 2022 13:36:30 +0100
Subject: [PATCH] #3571 - Update dependencies

- Remove disabled ehcache/jcache configurations and dependencies since we do not use them anyway
---
 inception/inception-app-webapp/pom.xml        | 10 --------
 .../src/main/resources/application.yml        | 24 -------------------
 .../src/main/resources/ehcache.xml            | 13 ----------
 inception/pom.xml                             | 10 --------
 4 files changed, 57 deletions(-)
 delete mode 100644 inception/inception-app-webapp/src/main/resources/ehcache.xml

diff --git a/inception/inception-app-webapp/pom.xml b/inception/inception-app-webapp/pom.xml
index 3d3062643cf..b74c81e3c78 100644
--- a/inception/inception-app-webapp/pom.xml
+++ b/inception/inception-app-webapp/pom.xml
@@ -516,14 +516,6 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-entitymanager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-jcache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.hsqldb</groupId>
@@ -938,11 +930,9 @@
               <usedDependency>de.tudarmstadt.ukp.inception.app:inception-telemetry</usedDependency>
               <!-- JDBC drivers and database stuff - used via reflection -->
               <usedDependency>org.hibernate:hibernate-entitymanager</usedDependency>
-              <usedDependency>org.hibernate:hibernate-jcache</usedDependency>
               <usedDependency>org.mariadb.jdbc:mariadb-java-client</usedDependency>
               <usedDependency>org.postgresql:postgresql</usedDependency>
               <usedDependency>org.hsqldb:hsqldb</usedDependency>
-              <usedDependency>org.ehcache:ehcache</usedDependency>
               <!-- Logging - used via reflection / optional -->
               <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
               <usedDependency>org.slf4j:jcl-over-slf4j</usedDependency>
diff --git a/inception/inception-app-webapp/src/main/resources/application.yml b/inception/inception-app-webapp/src/main/resources/application.yml
index 7e2a783913d..a345d1a5110 100644
--- a/inception/inception-app-webapp/src/main/resources/application.yml
+++ b/inception/inception-app-webapp/src/main/resources/application.yml
@@ -54,31 +54,12 @@ spring:
     show-sql: false
     open-in-view: true
     properties:
-      javax:
-        persistence:
-          sharedCache:
-            # L2 CACHE: enable selective caching mode - only entities with @Cacheable annotation
-            # mode: ENABLE_SELECTIVE
-            mode: NONE
       hibernate:
         dialect: ${database.dialect:${INCEPTION_DB_DIALECT:}}
         # Enable SQL statements formatting.
         # format_sql: true
-        # L2 CACHE: generate statistics to check if L2/query cache is actually being used.
-        # generate_statistics: true
         # jmx:
         #   enabled: true
-        # javax.cache:
-        #   provider: org.ehcache.jsr107.EhcacheCachingProvider
-        #  uri: classpath:ehcache.xml
-        cache:
-          # L2 CACHE: turn on L2 cache for individual entities
-          use_second_level_cache: false
-          # L2 CACHE: turn on L2 cache for collections entities
-          use_query_cache: false 
-          # region:
-            # L2 CACHE: classpath to cache region factory.
-            # factory_class: org.hibernate.cache.jcache.JCacheRegionFactory
     hibernate:
       ddl-auto: validate
       naming:
@@ -87,11 +68,6 @@ spring:
         implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 
-#  spring:
-#    cache:
-#      jcache:
-#        config: classpath:/ehcache.xml
-
   liquibase:
     change-log: classpath:/db/changelog/db.changelog-master.xml
 
diff --git a/inception/inception-app-webapp/src/main/resources/ehcache.xml b/inception/inception-app-webapp/src/main/resources/ehcache.xml
deleted file mode 100644
index c3991d366e3..00000000000
--- a/inception/inception-app-webapp/src/main/resources/ehcache.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<config
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-    xmlns='http://www.ehcache.org/v3'
-    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">
-
-
-  <service>
-    <jsr107:defaults enable-management="true" enable-statistics="true"/> 
-  </service>
-</config>
\ No newline at end of file
diff --git a/inception/pom.xml b/inception/pom.xml
index 2279ff7fab8..d7c9825d9b8 100644
--- a/inception/pom.xml
+++ b/inception/pom.xml
@@ -1524,11 +1524,6 @@
         <artifactId>hibernate-entitymanager</artifactId>
         <version>${hibernate.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-jcache</artifactId>
-        <version>${hibernate.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
@@ -1544,11 +1539,6 @@
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernate.validator.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.ehcache</groupId>
-        <artifactId>ehcache</artifactId>
-        <version>3.10.8</version>
-      </dependency>
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>