upgrade dockerfile and dependencies to java 17

NCEAS · Aug 14, 2023 · 1cdc6ca · 1cdc6ca
1 parent 602b33b
commit 1cdc6ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Docker/metadig-controller/Dockerfile b/Docker/metadig-controller/Dockerfile
@@ -1,5 +1,5 @@
 #FROM tomcat:8.5
-FROM tomcat:10-jre17
+FROM tomcat:8-jre17
 
 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
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <properties>
-        <jersey.version>2.23.1</jersey.version>
+        <jersey.version>2.35</jersey.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- <docker.registry>docker.io</docker.registry> -->
         <docker.repo>metadig</docker.repo>
@@ -118,9 +118,9 @@
             <version>2.9.9</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
         </dependency>
 
     </dependencies>