Merge branch 'develop'

Author: guFalcon

pom.xml

@@ -17,20 +17,20 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.1.21</version>
+	<version>0.1.22</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>rdb-utils</artifactId>
-			<version>0.1.2</version>
+			<version>0.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>

src/main/java/info/unterrainer/commons/httpserver/Information.java

@@ -2,6 +2,6 @@
 
 public class Information {
 	public static final String name = "Http-Server";
-	public static final String buildTime = "2021-01-22T08:06:36Z";
-	public static final String pomVersion = "0.1.21";
+	public static final String buildTime = "2021-03-05T08:17:16Z";
+	public static final String pomVersion = "0.1.22";
 }

src/main/java/info/unterrainer/commons/httpserver/daos/JpqlDao.java

@@ -1,7 +1,6 @@
 package info.unterrainer.commons.httpserver.daos;
 
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -13,6 +12,7 @@
 import javax.persistence.TypedQuery;
 
 import info.unterrainer.commons.httpserver.jsons.ListJson;
+import info.unterrainer.commons.jreutils.DateUtils;
 import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ public P create(final P entity) {
 
 	@Override
 	public P create(final EntityManager em, final P entity) {
-		LocalDateTime time = LocalDateTime.now(ZoneOffset.UTC);
+		LocalDateTime time = DateUtils.nowUtc();
 		entity.setCreatedOn(time);
 		entity.setEditedOn(time);
 		em.persist(entity);
@@ -61,7 +61,7 @@ public P update(final P entity) {
 
 	@Override
 	public P update(final EntityManager em, final P entity) {
-		LocalDateTime time = LocalDateTime.now(ZoneOffset.UTC);
+		LocalDateTime time = DateUtils.nowUtc();
 		entity.setEditedOn(time);
 		return em.merge(entity);
 	}