From bb5887991b153c3ab78f41b5d0c0d389c319c1eb Mon Sep 17 00:00:00 2001
From: Pete Stevenson <jps@pixielabs.ai>
Date: Mon, 16 May 2022 14:48:14 -0700
Subject: [PATCH 1/2] Upgrade to Java 18.

Signed-off-by: Pete Stevenson <jps@pixielabs.ai>
---
 pom.xml                                       | 48 ++++++++++++++++---
 .../weave/socks/cart/CartApplication.java     |  2 -
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f1ef5182..cd35fd868 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,28 +14,60 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.4.RELEASE</version>
+        <version>2.4.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
+        <java.version>18</java.version>
         <prometheus.version>0.0.21</prometheus.version>
     </properties>
 
     <dependencies>
+      <dependency>
+          <groupId>org.hibernate.validator</groupId>
+          <artifactId>hibernate-validator</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-data-jpa</artifactId>
+          <version>2.6.7</version>
+      </dependency>
+      <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-core</artifactId>
+          <version>5.3.19</version>
+      </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>3.12.10</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
+            <version>2.6.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>2.6.6</version>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
@@ -55,6 +87,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-rest-hal-browser</artifactId>
+            <version>3.3.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -81,6 +114,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.5.22.RELEASE</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/works/weave/socks/cart/CartApplication.java b/src/main/java/works/weave/socks/cart/CartApplication.java
index 51d9a8d45..edef51ae7 100644
--- a/src/main/java/works/weave/socks/cart/CartApplication.java
+++ b/src/main/java/works/weave/socks/cart/CartApplication.java
@@ -1,11 +1,9 @@
 package works.weave.socks.cart;
 
-import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@EnablePrometheusEndpoint
 public class CartApplication {
     public static void main(String[] args) {
         SpringApplication.run(CartApplication.class, args);

From 5fa21d82073c34e2f4c68d7a1f9ada400369b15b Mon Sep 17 00:00:00 2001
From: Pete Stevenson <jps@pixielabs.ai>
Date: Mon, 16 May 2022 14:52:01 -0700
Subject: [PATCH 2/2] Use maven on Java v18 for Java upgrade.

Signed-off-by: Pete Stevenson <jps@pixielabs.ai>
---
 scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 7f6271768..ef8955c96 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,7 +24,7 @@ else
 fi
 CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
-$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.6-jdk-11 mvn -q -DskipTests package
+$DOCKER_CMD run --rm -v $HOME/.m2:/root/.m2 -v $CODE_DIR:/usr/src/mymaven -w /usr/src/mymaven maven:3.8.5-openjdk-18 mvn -q -DskipTests package
 
 cp $CODE_DIR/target/*.jar $CODE_DIR/docker/carts