From 577b5ea80921e16dc76fd9d0036b77d817feed08 Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Tue, 8 Dec 2020 00:12:50 +0800 Subject: [PATCH 1/7] [maven-release-plugin] prepare release 1.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 890cdd3..c5ad258 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.zeko zeko-sql-builder - 1.2.1-SNAPSHOT + 1.2.1 jar ${project.groupId}:${project.artifactId} @@ -40,7 +40,7 @@ scm:git:https://github.com/darkredz/Zeko-SQL-Builder.git scm:git:ssh://github.com/darkredz/Zeko-SQL-Builder.git https://github.com/darkredz/Zeko-SQL-Builder - HEAD + 1.2.1 From 93db5b29a8fa02b7847808591070fa4536b7dab4 Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Tue, 8 Dec 2020 00:12:51 +0800 Subject: [PATCH 2/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c5ad258..1c0fceb 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.zeko zeko-sql-builder - 1.2.1 + 1.2.2-SNAPSHOT jar ${project.groupId}:${project.artifactId} @@ -40,7 +40,7 @@ scm:git:https://github.com/darkredz/Zeko-SQL-Builder.git scm:git:ssh://github.com/darkredz/Zeko-SQL-Builder.git https://github.com/darkredz/Zeko-SQL-Builder - 1.2.1 + HEAD From 40f95ac04dd59dda55569329e8c20a6834e85307 Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Wed, 23 Dec 2020 11:08:12 +0800 Subject: [PATCH 3/7] update kotlin, jasync and vertx version --- pom.xml | 19 ++++++++++++------- src/main/kotlin/io/zeko/model/Entity.kt | 6 +++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 1c0fceb..02bee95 100755 --- a/pom.xml +++ b/pom.xml @@ -79,8 +79,8 @@ - 1.3.61 - 3.9.2 + 1.4.10 + 4.0.0 2.0.9 5.2.0 UTF-8 @@ -140,28 +140,33 @@ io.vertx - vertx-sql-common + vertx-jdbc-client ${vertx.version} com.github.jasync-sql jasync-postgresql - 1.1.3 + 1.1.5 com.github.jasync-sql jasync-mysql - 1.1.3 + 1.1.5 io.zeko zeko-data-mapper - 1.6.1 + 1.6.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.10.3 com.zaxxer HikariCP - 3.4.3 + 3.4.5 io.vertx diff --git a/src/main/kotlin/io/zeko/model/Entity.kt b/src/main/kotlin/io/zeko/model/Entity.kt index e0b33b7..03b0a3e 100644 --- a/src/main/kotlin/io/zeko/model/Entity.kt +++ b/src/main/kotlin/io/zeko/model/Entity.kt @@ -94,7 +94,7 @@ abstract class Entity { LocalDateTime.parse(dateStr, pattern) } else { //Vertx JDBC client returns date time field as String and already converted to UTC - val pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) { + val pattern = if (value.indexOf("Z") == value.length - 1 && value.indexOf(".") == value.length - 5) { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz") } else { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX") @@ -130,7 +130,7 @@ abstract class Entity { ZonedDateTime.parse(dateStr.removeSuffix("Z") + "Z", pattern) } else { //Vertx JDBC client returns date time field as String and already converted to UTC - val pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) { + val pattern = if (value.indexOf("Z") == value.length - 1 && value.indexOf(".") == value.length - 5) { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz") } else { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX") @@ -152,7 +152,7 @@ abstract class Entity { LocalDateTime.parse(dateStr, pattern).atZone(ZoneOffset.UTC).toInstant() } else { //Vertx JDBC client returns date time field as String and already converted to UTC - val pattern = if (value.indexOf("Z") === value.length - 1 && value.indexOf(".") === value.length - 5) { + val pattern = if (value.indexOf("Z") == value.length - 1 && value.indexOf(".") == value.length - 5) { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSz") } else { DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX") From 4f3218009a722714202f835ea419e74ce156800a Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Wed, 23 Dec 2020 11:12:16 +0800 Subject: [PATCH 4/7] [maven-release-plugin] prepare release 1.2.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 02bee95..b4b2cc9 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.zeko zeko-sql-builder - 1.2.2-SNAPSHOT + 1.2.2 jar ${project.groupId}:${project.artifactId} @@ -40,7 +40,7 @@ scm:git:https://github.com/darkredz/Zeko-SQL-Builder.git scm:git:ssh://github.com/darkredz/Zeko-SQL-Builder.git https://github.com/darkredz/Zeko-SQL-Builder - HEAD + 1.2.2 From 84154bc374805630de1f1d42b14d29c577d585ea Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Wed, 23 Dec 2020 11:12:17 +0800 Subject: [PATCH 5/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b4b2cc9..9c72a97 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.zeko zeko-sql-builder - 1.2.2 + 1.2.3-SNAPSHOT jar ${project.groupId}:${project.artifactId} @@ -40,7 +40,7 @@ scm:git:https://github.com/darkredz/Zeko-SQL-Builder.git scm:git:ssh://github.com/darkredz/Zeko-SQL-Builder.git https://github.com/darkredz/Zeko-SQL-Builder - 1.2.2 + HEAD From 187198b035dfcbcae082e3b0e2a735982843645a Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Wed, 23 Dec 2020 11:24:05 +0800 Subject: [PATCH 6/7] update version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index afca50c..bf31b52 100644 --- a/README.md +++ b/README.md @@ -752,7 +752,7 @@ Add this to your maven pom.xml io.zeko zeko-sql-builder - 1.2.1 + 1.2.2 From 1c5ba44e27ab9c1fb5867529797d6bc3e4bcc651 Mon Sep 17 00:00:00 2001 From: Leng Sheng Hong Date: Wed, 23 Dec 2020 11:24:36 +0800 Subject: [PATCH 7/7] update version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bf31b52..31d917c 100644 --- a/README.md +++ b/README.md @@ -759,13 +759,13 @@ Add this to your maven pom.xml com.github.jasync-sql jasync-mysql - 1.1.3 + 1.1.5 com.zaxxer HikariCP - 3.4.3 + 3.4.5