chore: library updates

mam-dev · Jul 11, 2024 · 2ff6c2b · 2ff6c2b
1 parent 3331d47
commit 2ff6c2b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 45 deletions.
diff --git a/...re/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java b/...re/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibCalendarCollectionStamp.java
@@ -19,11 +19,6 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.unitedinternet.cosmo.hibernate.validator.Color;
 import org.unitedinternet.cosmo.hibernate.validator.DisplayName;
 import org.unitedinternet.cosmo.hibernate.validator.Timezone;
@@ -35,6 +30,8 @@
 import org.unitedinternet.cosmo.model.QName;
 import org.unitedinternet.cosmo.model.Stamp;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.Property;
@@ -48,7 +45,6 @@
  */
 @Entity
 @DiscriminatorValue("calendar")
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class HibCalendarCollectionStamp extends HibStamp implements ICalendarConstants, CalendarCollectionStamp {
 
     private static final long serialVersionUID = 4397868099410967516L;

diff --git a/...o-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java b/...o-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventExceptionStamp.java
@@ -15,11 +15,6 @@
  */
 package org.unitedinternet.cosmo.model.hibernate;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.unitedinternet.cosmo.CosmoException;
 import org.unitedinternet.cosmo.calendar.ICalendarUtils;
 import org.unitedinternet.cosmo.hibernate.validator.EventException;
@@ -29,6 +24,8 @@
 import org.unitedinternet.cosmo.model.NoteItem;
 import org.unitedinternet.cosmo.model.Stamp;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.component.VEvent;
@@ -38,7 +35,6 @@
  */
 @Entity
 @DiscriminatorValue("eventexception")
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class HibEventExceptionStamp extends HibBaseEventStamp implements EventExceptionStamp {
 
     private static final long serialVersionUID = 3992468809776886156L;

diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibEventStamp.java
@@ -18,11 +18,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.unitedinternet.cosmo.CosmoException;
 import org.unitedinternet.cosmo.calendar.ICalendarUtils;
 import org.unitedinternet.cosmo.hibernate.validator.Event;
@@ -32,6 +27,8 @@
 import org.unitedinternet.cosmo.model.NoteItem;
 import org.unitedinternet.cosmo.model.Stamp;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.Component;
 import net.fortuna.ical4j.model.component.VEvent;
@@ -42,7 +39,6 @@
  */
 @Entity
 @DiscriminatorValue("event")
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class HibEventStamp extends HibBaseEventStamp implements EventStamp {
 
     /**

diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibMessageStamp.java
@@ -33,7 +33,6 @@
  */
 @Entity
 @DiscriminatorValue("message")
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class HibMessageStamp extends HibStamp implements MessageStamp {
 
     private static final long serialVersionUID = -6100568628972081120L;

diff --git a/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java b/cosmo-core/src/main/java/org/unitedinternet/cosmo/model/hibernate/HibTaskStamp.java
@@ -15,23 +15,20 @@
  */
 package org.unitedinternet.cosmo.model.hibernate;
 
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.unitedinternet.cosmo.model.Item;
 import org.unitedinternet.cosmo.model.QName;
 import org.unitedinternet.cosmo.model.Stamp;
 import org.unitedinternet.cosmo.model.TaskStamp;
 
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+
 
 /**
  * Hibernate persistent TaskStamp.
  */
 @Entity
 @DiscriminatorValue("task")
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class HibTaskStamp extends HibStamp implements TaskStamp {
 
     private static final long serialVersionUID = -6197756070431706553L;

diff --git a/cosmo-core/src/test/unit/resources/application-test.yaml b/cosmo-core/src/test/unit/resources/application-test.yaml
@@ -63,8 +63,7 @@ spring:
     hikari:
       maximum-pool-size: 10     
   jpa:        
-    properties:
-     hibernate.dialect: org.hibernate.dialect.MariaDB103Dialect     
+    properties:     
      hibernate.cache.use_query_cache: false
      hibernate.cache.use_second_level_cache: false
      hibernate.show_sql: false

diff --git a/cosmo-webapp/pom.xml b/cosmo-webapp/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>cosmo-multimodule</artifactId>
 		<groupId>net.oneandone.cosmo</groupId>
-		<version>6.0.2</version>
+		<version>7.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>net.oneandone.cosmo</groupId>
 			<artifactId>cosmo-core</artifactId>
-			<version>6.0.2</version>
+			<version>7.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

diff --git a/cosmo-webapp/src/main/resources/application.yaml b/cosmo-webapp/src/main/resources/application.yaml
@@ -70,7 +70,6 @@ spring:
       maximum-pool-size: 10
   jpa:        
     properties:
-     hibernate.dialect: org.hibernate.dialect.MariaDB103Dialect     
      hibernate.cache.use_query_cache: false
      hibernate.cache.use_second_level_cache: false
      hibernate.show_sql: false

diff --git a/pom.xml b/pom.xml
@@ -28,24 +28,23 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<spring.boot.version>3.3.1</spring.boot.version>		
-		<hibernate.core.version>6.2.2.Final</hibernate.core.version>
-		<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
-
-		<javax.el.version>2.2.4</javax.el.version>
+		<hibernate.core.version>6.5.2.Final</hibernate.core.version>
+		<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+
 		<jackrabbit.version>3.0.1</jackrabbit.version>
 		<ical4j.version>3.2.14</ical4j.version>
 
-		<aspectjweaver.version>1.9.2</aspectjweaver.version>
+		<aspectjweaver.version>1.9.22.1</aspectjweaver.version>
 
-		<mariadb.version>3.1.4</mariadb.version>		
-		<xerces.version>2.12.0</xerces.version>
+		<mariadb.version>3.4.0</mariadb.version>		
+		<xerces.version>2.12.2</xerces.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<stax.version>1.0.1</stax.version>
 		<woodstox.version>4.0.6</woodstox.version>
 
-		<jackson.version>2.17.1</jackson.version>		
+		<jackson.version>2.17.2</jackson.version>		
 		<abdera.version>1.1.3</abdera.version>
-		<junit.version>5.9.2</junit.version>
+		<junit.version>5.10.3</junit.version>
 
 		<!-- Deactivate checkstyle, findbugs, jacoco and pmd -->
 		<checkstyle.skip>true</checkstyle.skip>
@@ -59,13 +58,13 @@
 		<!-- Overwrite for java 17 -->
                 <spotbugs-maven-plugin.version>4.7.3.4</spotbugs-maven-plugin.version>
                 <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
-	        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+                <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
                 <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
-	        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-	        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+                <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+                <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
                 <maven-license-plugin.version>3.0</maven-license-plugin.version>
-	        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-	        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+                <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+                <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
                 <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
 
 	</properties>
@@ -122,7 +121,7 @@
 			    <groupId>dev.atchison.mariaDB4j</groupId>
 			    <artifactId>mariaDB4j</artifactId>
 			    <scope>test</scope>
-			    <version>2.7.1</version>
+			    <version>2.7.2</version>
 			</dependency>
 
 			<dependency>