DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

Upgrade to servlet specification 4.0

Browse Source
This commit is contained in:
Andreas Svanberg 2022-10-18 12:14:42 +02:00
parent 0dadabec07
commit e02006bfd1
4 changed files with 11 additions and 11 deletions
daisy-integration
pom.xml
pom.xml
view
pom.xml
src/main/webapp/WEB-INF
web.xml

4
daisy-integration/pom.xml

@ -21,8 +21,8 @@
<artifactId>guice-servlet</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

8
pom.xml

@ -29,7 +29,7 @@
<hibernate.version>6.1.3.Final</hibernate.version>
<querydsl.version>5.0.0</querydsl.version>
<javax.servlet.version>3.0.1</javax.servlet.version>
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
<junit.version>5.9.1</junit.version>
<hsqldb.version>2.7.0</hsqldb.version>
<mockito.version>4.8.0</mockito.version>
@ -88,9 +88,9 @@
<!-- Servlet API, needed for compilation. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
<scope>provided</scope>
</dependency>

4
view/pom.xml

@ -69,8 +69,8 @@
<!-- Servlet API, needed for compilation. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

6
view/src/main/webapp/WEB-INF/web.xml

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
<display-name>SciPro</display-name>