Merge branch 'exercise01' into exercise02

Hendrik Jungnitsch

2023-09-19 ff31a3f8d1c439a746fa127f24455a56e03cd9ed

Merge branch 'exercise01' into exercise02

# Conflicts:
#	src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Junction.java

 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>

 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 {

 src/main/java/de/gedoplan/seminar/jpa/exercise/domain/Highway.java

@@ -1,8 +1,8 @@
package de.gedoplan.seminar.jpa.exercise.domain;

import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

@Entity
@Table(name = Highway.TABLE_NAME)

 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;