diff --git a/hello-data-commons/hello-data-base-model/src/main/java/ch/badag/dap/hellodata/commons/basemodel/BaseEntity.java b/hello-data-commons/hello-data-base-model/src/main/java/ch/badag/dap/hellodata/commons/basemodel/BaseEntity.java index 8f27420d..38863a13 100644 --- a/hello-data-commons/hello-data-base-model/src/main/java/ch/badag/dap/hellodata/commons/basemodel/BaseEntity.java +++ b/hello-data-commons/hello-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 index dbc3961e..3f599d29 100644 --- 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 @@ 3.1.1 UTF-8 5.2.0 - 3.1.0 - 3.3.7 + 3.1.2 + 3.4.1 3.3.3 - 2023.0.0 + 2024.0.0 4.0.2 2.5.0 3.3.1 diff --git a/hello-data-subsystems/hello-data-dbt-docs/pom.xml b/hello-data-subsystems/hello-data-dbt-docs/pom.xml index bdc3b151..95a5cf3d 100644 --- a/hello-data-subsystems/hello-data-dbt-docs/pom.xml +++ b/hello-data-subsystems/hello-data-dbt-docs/pom.xml @@ -27,7 +27,6 @@ 17 ${java.version} ${java.version} - 2020.0.4 ch.bedag.dap.hellodata.docs.HelloDataDocsApplication Dockerfile 4.22.0 diff --git a/pom.xml b/pom.xml index 056ac84f..74d792ff 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,6 @@ ${java.version} ${java.version} 3.0.0-M4 - 2023.0.0 1.17.6 2.8.2 5.0.0