From dfcc8fa23f270ee141ae21e331ea031bb372d310 Mon Sep 17 00:00:00 2001
From: Darren Labey <darren.labey@sony.com>
Date: Tue, 24 Jan 2023 15:49:08 -0800
Subject: [PATCH 1/2] Using UUID.randomUUID().toString instead of
 createAutoDeregisterServiceId() for catalog service registration

---
 .../java/com/orbitz/consul/CatalogITest.java  | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/itest/java/com/orbitz/consul/CatalogITest.java b/src/itest/java/com/orbitz/consul/CatalogITest.java
index e5ef7ec8..1d784b64 100644
--- a/src/itest/java/com/orbitz/consul/CatalogITest.java
+++ b/src/itest/java/com/orbitz/consul/CatalogITest.java
@@ -1,16 +1,9 @@
 package com.orbitz.consul;
 
-import com.orbitz.consul.async.ConsulResponseCallback;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.model.catalog.*;
-import com.orbitz.consul.model.health.ImmutableService;
-import com.orbitz.consul.model.health.Node;
-import com.orbitz.consul.model.health.Service;
-import com.orbitz.consul.model.health.ServiceHealth;
-import com.orbitz.consul.option.ImmutableQueryOptions;
-import com.orbitz.consul.option.QueryOptions;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.math.BigInteger;
 import java.net.UnknownHostException;
@@ -24,7 +17,25 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.junit.Assert.*;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import com.orbitz.consul.async.ConsulResponseCallback;
+import com.orbitz.consul.model.ConsulResponse;
+import com.orbitz.consul.model.catalog.CatalogDeregistration;
+import com.orbitz.consul.model.catalog.CatalogNode;
+import com.orbitz.consul.model.catalog.CatalogRegistration;
+import com.orbitz.consul.model.catalog.CatalogService;
+import com.orbitz.consul.model.catalog.ImmutableCatalogDeregistration;
+import com.orbitz.consul.model.catalog.ImmutableCatalogRegistration;
+import com.orbitz.consul.model.catalog.ImmutableCatalogService;
+import com.orbitz.consul.model.catalog.ImmutableServiceWeights;
+import com.orbitz.consul.model.health.ImmutableService;
+import com.orbitz.consul.model.health.Node;
+import com.orbitz.consul.model.health.Service;
+import com.orbitz.consul.model.health.ServiceHealth;
+import com.orbitz.consul.option.ImmutableQueryOptions;
+import com.orbitz.consul.option.QueryOptions;
 
 public class CatalogITest extends BaseIntegrationTest {
 
@@ -284,7 +295,7 @@ public void shouldGetNodeInCallback() throws ExecutionException, InterruptedExce
 
         String nodeName = "node";
         String serviceName = UUID.randomUUID().toString();
-        String serviceId = createAutoDeregisterServiceId();
+        String serviceId = UUID.randomUUID().toString();
         String catalogId = UUID.randomUUID().toString();
 
         CatalogRegistration registration = ImmutableCatalogRegistration.builder()

From 6819c2516ba1d03d73175e23842036b10b46f019 Mon Sep 17 00:00:00 2001
From: Darren Labey <darren.labey@sony.com>
Date: Tue, 24 Jan 2023 15:49:37 -0800
Subject: [PATCH 2/2] Upgrading TestContainers to 1.17.6 for M1 support and
 fixing compiler config option

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d115382a..0cab26a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
         <okhttp.version>4.9.0</okhttp.version>
         <slf4j.version>1.7.30</slf4j.version>
         <logback.version>1.2.3</logback.version>
-        <testcontainers.version>1.15.1</testcontainers.version>
+        <testcontainers.version>1.17.6</testcontainers.version>
     </properties>
     <distributionManagement>
         <snapshotRepository>
@@ -260,7 +260,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>${java.version}</release>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
             <plugin>