From eb62a76d2b52f66f6fe730dd5f1b5152d2d9e179 Mon Sep 17 00:00:00 2001
From: koz01 <koz01@PCFEIB113-026.msad.vsb.cz>
Date: Mon, 27 Mar 2023 15:07:41 +0200
Subject: [PATCH] Increase version
---
pom.xml | 18 +++++++++---------
.../java/koz01/java2/lab10/BaseEntity.java | 9 ++++-----
src/main/java/koz01/java2/lab10/Clas.java | 5 ++---
.../java/koz01/java2/lab10/Department.java | 5 ++---
src/main/java/koz01/java2/lab10/Employee.java | 5 ++---
.../koz01/java2/lab10/NonTeachingStaff.java | 3 +--
src/main/java/koz01/java2/lab10/Staff.java | 3 +--
src/main/java/koz01/java2/lab10/Teacher.java | 5 ++---
.../java/koz01/java2/lab10/TeachingStaff.java | 3 +--
src/main/java/module-info.java | 2 +-
src/test/java/koz01/java2/lab10/DemoJPA.java | 13 ++++++-------
11 files changed, 31 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e3a329..15de26b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,14 +8,14 @@
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>15</maven.compiler.source>
- <maven.compiler.target>15</maven.compiler.target>
- <maven.compiler.version>3.8.1</maven.compiler.version>
- <javafx.version>15.0.1</javafx.version>
- <junit.version>5.7.1</junit.version>
- <log4j.version>2.14.1</log4j.version>
- <lombok.version>1.18.20</lombok.version>
- <hibernate.version>5.4.30.Final</hibernate.version>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.version>3.11.0</maven.compiler.version>
+ <javafx.version>17.0.2</javafx.version>
+ <junit.version>5.9.2</junit.version>
+ <log4j.version>2.20.0</log4j.version>
+ <lombok.version>1.18.26</lombok.version>
+ <hibernate.version>6.1.7.Final</hibernate.version>
<derby.version>10.15.2.0</derby.version>
</properties>
<dependencies>
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<configuration>
<sources>
<source>target/generated-sources/annotations</source>
diff --git a/src/main/java/koz01/java2/lab10/BaseEntity.java b/src/main/java/koz01/java2/lab10/BaseEntity.java
index 176191a..d7afffe 100644
--- a/src/main/java/koz01/java2/lab10/BaseEntity.java
+++ b/src/main/java/koz01/java2/lab10/BaseEntity.java
@@ -2,11 +2,10 @@ package koz01.java2.lab10;
import java.io.Serializable;
-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;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
diff --git a/src/main/java/koz01/java2/lab10/Clas.java b/src/main/java/koz01/java2/lab10/Clas.java
index 660d6f3..6c0e551 100644
--- a/src/main/java/koz01/java2/lab10/Clas.java
+++ b/src/main/java/koz01/java2/lab10/Clas.java
@@ -2,9 +2,8 @@ package koz01.java2.lab10;
import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/Department.java b/src/main/java/koz01/java2/lab10/Department.java
index 8ab9522..ab1b47e 100644
--- a/src/main/java/koz01/java2/lab10/Department.java
+++ b/src/main/java/koz01/java2/lab10/Department.java
@@ -2,9 +2,8 @@ package koz01.java2.lab10;
import java.util.List;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/Employee.java b/src/main/java/koz01/java2/lab10/Employee.java
index b4b98df..4d9be7c 100644
--- a/src/main/java/koz01/java2/lab10/Employee.java
+++ b/src/main/java/koz01/java2/lab10/Employee.java
@@ -1,8 +1,7 @@
package koz01.java2.lab10;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
index 59b164a..c2f216f 100644
--- a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
+++ b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java
@@ -1,7 +1,6 @@
package koz01.java2.lab10;
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/src/main/java/koz01/java2/lab10/Staff.java b/src/main/java/koz01/java2/lab10/Staff.java
index 6f09a62..e2a4540 100644
--- a/src/main/java/koz01/java2/lab10/Staff.java
+++ b/src/main/java/koz01/java2/lab10/Staff.java
@@ -1,7 +1,6 @@
package koz01.java2.lab10;
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/src/main/java/koz01/java2/lab10/Teacher.java b/src/main/java/koz01/java2/lab10/Teacher.java
index d2b11e5..de64c87 100644
--- a/src/main/java/koz01/java2/lab10/Teacher.java
+++ b/src/main/java/koz01/java2/lab10/Teacher.java
@@ -3,9 +3,8 @@ package koz01.java2.lab10;
import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/src/main/java/koz01/java2/lab10/TeachingStaff.java b/src/main/java/koz01/java2/lab10/TeachingStaff.java
index 7900ce4..9083e2b 100644
--- a/src/main/java/koz01/java2/lab10/TeachingStaff.java
+++ b/src/main/java/koz01/java2/lab10/TeachingStaff.java
@@ -1,7 +1,6 @@
package koz01.java2.lab10;
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 894207c..a893be8 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
module koz01.java2.lab10 {
- requires java.persistence;
+ requires jakarta.persistence;
requires lombok;
requires java.sql;
requires org.hibernate.orm.core;
diff --git a/src/test/java/koz01/java2/lab10/DemoJPA.java b/src/test/java/koz01/java2/lab10/DemoJPA.java
index deea5f3..66d5e9e 100644
--- a/src/test/java/koz01/java2/lab10/DemoJPA.java
+++ b/src/test/java/koz01/java2/lab10/DemoJPA.java
@@ -6,15 +6,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
import org.junit.jupiter.api.Test;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
import lombok.extern.log4j.Log4j2;
@Log4j2
--
GitLab