diff --git a/pom.xml b/pom.xml
index a7462042..1bf278bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,23 +32,23 @@
5.10.2
5.10.2
- 3.25.3
- 4.19.11
- 4.11.0
- 1.21.0
-
-
- 1.6.13
+ 3.25.3
+ 4.19.11
+ 4.11.0
+ 1.21.1
- 3.3.0
- 3.2.2
- 3.13.0
- 3.6.3
- 3.2.5
- 3.3.0
- 1.26.4
- 5.1.9
+ 3.3.0
+ 3.2.2
+ 3.13.0
+ 3.6.3
+ 3.2.5
+ 3.3.0
+ 1.26.4
+ 5.1.9
+
+
+ 1.6.13
UTF-8
@@ -67,7 +67,7 @@
org.apache.maven.plugins
maven-gpg-plugin
- ${version.plugin.gpg}
+ ${version.maven-gpg-plugin}
sign-artifacts
@@ -117,7 +117,7 @@
org.apache.maven.plugins
maven-jar-plugin
- ${version.plugin.jar}
+ ${version.maven-jar-plugin}
@@ -139,13 +139,13 @@
org.apache.felix
maven-scr-plugin
- ${version.plugin.scr}
+ ${version.maven-scr-plugin}
org.apache.felix
maven-bundle-plugin
- ${version.plugin.bundle}
+ ${version.maven-bundle-plugin}
true
@@ -168,7 +168,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- ${version.plugin.compiler}
+ ${version.maven-compiler-plugin}
${maven.compiler.target}
@@ -179,7 +179,7 @@
org.apache.maven.plugins
maven-source-plugin
- ${version.plugin.source}
+ ${version.maven-source-plugin}
attach-sources
@@ -193,7 +193,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- ${version.plugin.javadoc}
+ ${version.maven-javadoc-plugin}
-Xdoclint:none
-Xdoclint:none
@@ -211,7 +211,7 @@
org.sonatype.plugins
nexus-staging-maven-plugin
- ${version.plugin.nexus}
+ ${version.nexus-staging-maven-plugin}
true
ossrh
@@ -223,7 +223,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- ${version.plugin.surefire}
+ ${version.maven-surefire-plugin}
@@ -247,21 +247,21 @@
org.mockito
mockito-junit-jupiter
- ${version.mockito.inline}
+ ${version.mockito-junit-jupiter}
test
org.assertj
assertj-core
- ${version.assertj}
+ ${version.assertj-core}
test
com.cedarsoftware
json-io
- 4.19.11
+ ${version.json-io}
test
diff --git a/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java b/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
index fe69cc63..f98f45dd 100644
--- a/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
+++ b/src/test/java/com/cedarsoftware/util/convert/ConverterEverythingTest.java
@@ -3818,7 +3818,8 @@ private static java.sql.Date sqlDate(String s) {
}
private static Timestamp timestamp(String s) {
- return Timestamp.from(Instant.parse(s));
+ ZonedDateTime zdt = ZonedDateTime.parse(s);
+ return Timestamp.from(zdt.toInstant());
}
private static ZonedDateTime zdt(String s) {