Updated dependencies

chkal · May 9, 2021 · 523bdbd · 523bdbd
1 parent 7c327aa
commit 523bdbd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <jersey.version>2.22.2</jersey.version>
+    <jersey.version>2.34</jersey.version>
   </properties>
 
   <build>
@@ -24,9 +24,9 @@
 
     <!-- Servlet API -->
     <dependency>
-      <groupId>org.jboss.spec.javax.servlet</groupId>
-      <artifactId>jboss-servlet-api_3.1_spec</artifactId>
-      <version>1.0.0.Final</version>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>2.3.6</version>
       <scope>provided</scope>
     </dependency>
 
@@ -36,6 +36,11 @@
       <artifactId>jersey-container-servlet</artifactId>
       <version>${jersey.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.ext.cdi</groupId>
       <artifactId>jersey-cdi1x</artifactId>
@@ -47,38 +52,38 @@
       <version>${jersey.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
-      <version>2.0-EDR1</version>
+      <groupId>jakarta.enterprise</groupId>
+      <artifactId>jakarta.enterprise.cdi-api</artifactId>
+      <version>2.0.2</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet-core</artifactId>
-      <version>3.0.0.Alpha12</version>
+      <version>3.1.7.SP1</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-validator-cdi</artifactId>
-      <version>5.2.1.Final</version>
+      <version>6.2.0.Final</version>
     </dependency>
 
     <!-- The MVC API + RI -->
     <dependency>
-      <groupId>javax.mvc</groupId>
-      <artifactId>javax.mvc-api</artifactId>
-      <version>20160715</version>
+      <groupId>jakarta.mvc</groupId>
+      <artifactId>jakarta.mvc-api</artifactId>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.ozark</groupId>
-      <artifactId>ozark</artifactId>
-      <version>20160715</version>
+      <groupId>org.eclipse.krazo</groupId>
+      <artifactId>krazo-jersey</artifactId>
+      <version>1.1.0</version>
     </dependency>
 
     <!-- This example uses JSP as the view technology -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+      <version>1.2.6</version>
     </dependency>
 
     <!-- CSS + JavaScript stuff -->
@@ -100,18 +105,4 @@
 
   </dependencies>
 
-  <repositories>
-    <repository>
-      <id>bintray-mvc-spec-maven</id>
-      <name>bintray</name>
-      <url>http://dl.bintray.com/mvc-spec/maven</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
 </project>
diff --git a/src/main/java/de/chkal/todo/web/Messages.java b/src/main/java/de/chkal/todo/web/Messages.java
@@ -1,7 +1,7 @@
 package de.chkal.todo.web;
 
 import javax.inject.Named;
-import javax.mvc.annotation.RedirectScoped;
+import javax.mvc.RedirectScoped;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/src/main/java/de/chkal/todo/web/TodoListController.java b/src/main/java/de/chkal/todo/web/TodoListController.java
@@ -4,8 +4,8 @@
 import de.chkal.todo.service.TodoService;
 
 import javax.inject.Inject;
+import javax.mvc.Controller;
 import javax.mvc.Models;
-import javax.mvc.annotation.Controller;
 import javax.mvc.binding.BindingResult;
 import javax.validation.Valid;
 import javax.ws.rs.BeanParam;

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
@@ -3,5 +3,5 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
   MvcContext mvc = CDI.current().select(MvcContext.class).get();
-  response.sendRedirect(mvc.getContextPath() + mvc.getApplicationPath() + "/items");
+  response.sendRedirect(mvc.getBasePath() + "/items");
 %>