Merge pull request #198 from hazendaz/master

Drop oscache and add reload4j fixes #195
mybatis · Nov 4, 2023 · 62f3ed4 · 62f3ed4
2 parents 9880dd5 + 02de05b
commit 62f3ed4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 91 deletions.
diff --git a/pom.xml b/pom.xml
@@ -98,6 +98,12 @@
       <version>2.0.9</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>ch.qos.reload4j</groupId>
+      <artifactId>reload4j</artifactId>
+      <version>1.2.25</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
@@ -116,18 +122,6 @@
       <version>1.3.3</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>oscache</artifactId>
-      <version>2.4.1</version>
-      <scope>provided</scope>
-      <exclusions>
-          <exclusion>
-              <artifactId>jms</artifactId>
-              <groupId>javax.jms</groupId>
-          </exclusion>
-      </exclusions>
-    </dependency>
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/src/main/java/com/ibatis/sqlmap/engine/cache/oscache/OSCacheController.java b/src/main/java/com/ibatis/sqlmap/engine/cache/oscache/OSCacheController.java
diff --git a/src/main/java/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java b/src/main/java/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java
@@ -473,8 +473,6 @@ private void registerDefaultTypeAliases() {
     typeHandlerFactory.putTypeAlias("FIFO", FifoCacheController.class.getName());
     typeHandlerFactory.putTypeAlias("LRU", LruCacheController.class.getName());
     typeHandlerFactory.putTypeAlias("MEMORY", MemoryCacheController.class.getName());
-    // use a string for OSCache to avoid unnecessary loading of properties upon init
-    typeHandlerFactory.putTypeAlias("OSCACHE", "com.ibatis.sqlmap.engine.cache.oscache.OSCacheController");
 
     // TYPE ALIASEs
     typeHandlerFactory.putTypeAlias("dom", DomTypeMarker.class.getName());