From fbe70e57ac4562d5fce5297d9b457f2a2c16eea6 Mon Sep 17 00:00:00 2001
From: Hendrik Jungnitsch <hendrik.jungnitsch@gedoplan.de>
Date: Di, 19 Sep 2023 10:48:31 +0200
Subject: [PATCH] Merge branch 'exercise05' into exercise06
---
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java | 16 ++++++++--------
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java | 8 ++++----
src/main/java/de/gedoplan/seminar/jpa/exercise/domain/MaintenanceDepartment.java | 10 +++++-----
pom.xml | 2 +-
src/main/java/de/gedoplan/seminar/jpa/exercise/common/GeneratedIntegerIdEntity.java | 8 ++++----
5 files changed, 22 insertions(+), 22 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/Highway.java b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java
index dcc0964..fdeb41b 100644
--- a/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java
+++ b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java
@@ -3,10 +3,10 @@
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java
index 3cb3293..232025d 100644
--- a/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java
+++ b/src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java
@@ -2,14 +2,14 @@
import java.util.Objects;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
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 c2b4b98..ed07269 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
@@ -5,11 +5,11 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
import de.gedoplan.seminar.jpa.exercise.common.GeneratedIntegerIdEntity;
--
Gitblit v1.7.1