From 0839abbb2cffc4cf6e181ae5351fde8995dde583 Mon Sep 17 00:00:00 2001
From: Jeanette Clark <jclark@nceas.ucsb.edu>
Date: Fri, 11 Aug 2023 11:37:03 -0700
Subject: [PATCH] config updates for java17

---
 Docker/metadig-controller/Dockerfile |  2 +-
 pom.xml                              | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Docker/metadig-controller/Dockerfile b/Docker/metadig-controller/Dockerfile
index 5f9b3d4..7d67e06 100644
--- a/Docker/metadig-controller/Dockerfile
+++ b/Docker/metadig-controller/Dockerfile
@@ -1,5 +1,5 @@
 #FROM tomcat:8.5
-FROM tomcat:8-alpine
+FROM eclipse-temurin:17.0.7_7-jre-jammy
 
 LABEL org.opencontainers.image.source="https://github.com/nceas/metadig-webapp"
 LABEL org.opencontainers.image.title="metadig-controller"
diff --git a/pom.xml b/pom.xml
index 9de521c..1080286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,11 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+            </plugin>
             <!-- copy built metadig-webapp JAR file to the location needed to build the docker image -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -112,6 +117,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.9.9</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        
     </dependencies>
 
 </project>