HELLODATA-1926 - further adjustments after spring-boot upgrade

kanton-bern · Jan 17, 2025 · 958ee78 · 958ee78
1 parent c2f7db0
commit 958ee78
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/...lo-data-base-model/src/main/java/ch/badag/dap/hellodata/commons/basemodel/BaseEntity.java b/...lo-data-base-model/src/main/java/ch/badag/dap/hellodata/commons/basemodel/BaseEntity.java
@@ -28,25 +28,23 @@
 
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.Id;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
 import jakarta.persistence.MappedSuperclass;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Objects;
-import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Objects;
+import java.util.UUID;
+
 @Getter
 @Setter
 @ToString
 @MappedSuperclass
 @RequiredArgsConstructor
-@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 @EntityListeners(TrackedEntityListener.class)
 public abstract class BaseEntity implements Trackable, Serializable {
     @Id
@@ -60,6 +58,11 @@ public synchronized void setId(UUID id) {
         this.id = id;
     }
 
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -71,9 +74,4 @@ public boolean equals(Object o) {
         BaseEntity that = (BaseEntity) o;
         return getId() != null && Objects.equals(getId(), that.getId());
     }
-
-    @Override
-    public int hashCode() {
-        return getClass().hashCode();
-    }
 }
diff --git a/hello-data-commons/hello-data-spring-boot-starter-parent/pom.xml b/hello-data-commons/hello-data-spring-boot-starter-parent/pom.xml
@@ -32,10 +32,10 @@
         <modelmapper.version>3.1.1</modelmapper.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <rest-assured.version>5.2.0</rest-assured.version>
-        <spring-boot-starter-kubernetes.version>3.1.0</spring-boot-starter-kubernetes.version>
-        <spring-boot.version>3.3.7</spring-boot.version>
+        <spring-boot-starter-kubernetes.version>3.1.2</spring-boot-starter-kubernetes.version>
+        <spring-boot.version>3.4.1</spring-boot.version>
         <spring-boot-admin-dependencies.version>3.3.3</spring-boot-admin-dependencies.version>
-        <spring-cloud.version>2023.0.0</spring-cloud.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <spring-ws-test.version>4.0.2</spring-ws-test.version>
         <springdoc.version>2.5.0</springdoc.version>
         <testcontainers-keycloak.version>3.3.1</testcontainers-keycloak.version>

diff --git a/hello-data-subsystems/hello-data-dbt-docs/pom.xml b/hello-data-subsystems/hello-data-dbt-docs/pom.xml
@@ -27,7 +27,6 @@
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <spring-cloud.version>2020.0.4</spring-cloud.version>
         <main.class>ch.bedag.dap.hellodata.docs.HelloDataDocsApplication</main.class>
         <docker.file>Dockerfile</docker.file>
         <liquibase.version>4.22.0</liquibase.version>

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,6 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <spring-boot-admin.version>3.0.0-M4</spring-boot-admin.version>
-        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <testcontainers.version>1.17.6</testcontainers.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>