From b1eb936c723b619a72627e9e8848a846a4f408e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 19:24:52 +0000
Subject: [PATCH 1/2] Bump org.kiwiproject:kiwi-bom from 1.0.0 to 1.1.0

Bumps [org.kiwiproject:kiwi-bom](https://github.com/kiwiproject/kiwi-bom) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/kiwiproject/kiwi-bom/releases)
- [Commits](https://github.com/kiwiproject/kiwi-bom/compare/v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: org.kiwiproject:kiwi-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9ae83771..33d0f3cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <properties>
         <!-- Versions for required dependencies -->
-        <kiwi-bom.version>1.0.0</kiwi-bom.version>
+        <kiwi-bom.version>1.1.0</kiwi-bom.version>
 
         <!-- Versions for provided dependencies -->
         <retrying-again.version>1.0.17</retrying-again.version>

From a35eabb26f37716adcd7dbdc1140c66b10736dce Mon Sep 17 00:00:00 2001
From: Scott Leberknight <174812+sleberknight@users.noreply.github.com>
Date: Tue, 25 Jul 2023 13:55:51 +0000
Subject: [PATCH 2/2] Normalize the ZoneId in JsonHelperBasicsTest

Doing this ensures that the two tests which compare ZonedDateTime
objects (in Foo instances) pass.
---
 src/test/java/org/kiwiproject/json/JsonHelperBasicsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/kiwiproject/json/JsonHelperBasicsTest.java b/src/test/java/org/kiwiproject/json/JsonHelperBasicsTest.java
index ba9c1512..46b12fc4 100644
--- a/src/test/java/org/kiwiproject/json/JsonHelperBasicsTest.java
+++ b/src/test/java/org/kiwiproject/json/JsonHelperBasicsTest.java
@@ -730,7 +730,7 @@ private Foo newFoo() {
     private Foo newFoo(Instant instant) {
         var date = Date.from(instant);
         var timestamp = Timestamp.from(instant);
-        var utcZoneId = ZoneId.of("UTC");
+        var utcZoneId = ZoneId.of("UTC").normalized();
         var localDT = LocalDateTime.ofInstant(instant, utcZoneId);
         var zonedDT = ZonedDateTime.from(instant.atOffset(ZoneOffset.of("Z")).atZoneSameInstant(utcZoneId));
         var duration = Duration.ofMinutes(1);