From 772fb9ea5c998ab0daa90e065e7eaa7fd8a1136d Mon Sep 17 00:00:00 2001
From: Hendrik Jungnitsch <hendrik.jungnitsch@gedoplan.de>
Date: Di, 19 Sep 2023 10:13:31 +0200
Subject: [PATCH] Merge branch 'exercise' into exercise01
---
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java | 4 ++--
pom.xml | 2 +-
src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a57d9e7..b3b2dad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.7.3</version>
+ <version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.gedoplan.edumat.sbt</groupId>
diff --git a/src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java b/src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java
index 27da6bd..1c07ff4 100644
--- a/src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java
+++ b/src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java
@@ -2,10 +2,10 @@
import java.util.Objects;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
@MappedSuperclass
public abstract class GeneratedIntegerIdEntity {
diff --git a/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java
index ee57a0f..f74460b 100644
--- a/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java
+++ b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java
@@ -1,7 +1,7 @@
package de.gedoplan.seminar.jpa.exercise.domain;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
import de.gedoplan.seminar.jpa.exercise.common.GeneratedIntegerIdEntity;
--
Gitblit v1.7.1