From 9829ac31999c8d4a69c4aae89b855932c7d18fbd Mon Sep 17 00:00:00 2001
From: Hendrik Jungnitsch <hendrik.jungnitsch@gedoplan.de>
Date: Mo, 18 Sep 2023 15:48:38 +0200
Subject: [PATCH] Merge branch 'exercise07' into exercise08
---
src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java | 2 +-
src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java | 2 +-
src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java | 2 +-
src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java | 2 +-
src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java | 2 +-
pom.xml | 2 +-
src/main/resources/application.yaml | 3 +++
7 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index b604e1c..51d7c6f 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.4</version>
+ <version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.gedoplan.seminar.sbt</groupId>
diff --git a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java
index 671d2c6..376a1b6 100644
--- a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java
+++ b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Beverage.java
@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Objects;
@Entity
diff --git a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java
index f1914c4..5480c5f 100644
--- a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java
+++ b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/Cocktail.java
@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;
diff --git a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java
index d73eeb1..7f6f52b 100644
--- a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java
+++ b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/domain/CocktailOrder.java
@@ -1,6 +1,6 @@
package de.gedoplan.seminar.sbt.di.exercise.domain;
-import javax.persistence.*;
+import jakarta.persistence.*;
import java.util.Collections;
import java.util.Date;
import java.util.Map;
diff --git a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java
index 5c70aba..93a60b5 100644
--- a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java
+++ b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/init/DBInit.java
@@ -6,7 +6,7 @@
import de.gedoplan.seminar.sbt.di.exercise.repository.CocktailRepository;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.text.ParseException;
import java.util.List;
diff --git a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java
index a374b40..e7aae1a 100644
--- a/src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java
+++ b/src/main/java/de/gedoplan/seminar/sbt/di/exercise/service/CocktailsProducer.java
@@ -8,7 +8,7 @@
import org.springframework.context.annotation.Primary;
import org.springframework.web.context.annotation.RequestScope;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 3bdc968..3806492 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -8,5 +8,8 @@
hibernate:
ddl-auto: update
+#cocktailService:
+# mock: true
+
barInfo:
barName: Spring Boot Cocktail Bar
--
Gitblit v1.7.1