From f7dbdb817f5e2f72ad8bf7fe8bcf21972f58458a Mon Sep 17 00:00:00 2001
From: Giulio Pulina <giuliopulina@users.noreply.github.com>
Date: Wed, 26 Feb 2020 14:52:08 +0100
Subject: [PATCH] Fixes: #60 - spring rabbit stocks web-app doesn't work

---
 stocks/pom.xml                         | 23 ++++++++++----------
 stocks/src/main/webapp/WEB-INF/web.xml | 30 +++++++++++++-------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/stocks/pom.xml b/stocks/pom.xml
index 0f6c931..bd30648 100644
--- a/stocks/pom.xml
+++ b/stocks/pom.xml
@@ -64,21 +64,20 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.1.2</version>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>taglibs-standard-spec</artifactId>
+			<version>1.2.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<artifactId>standard</artifactId>
-			<groupId>taglibs</groupId>
-			<version>1.1.2</version>
-			<type>jar</type>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>taglibs-standard-impl</artifactId>
+			<version>1.2.5</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
@@ -158,9 +157,9 @@
 		</pluginManagement>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>9.4.24.v20191120</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/stocks/src/main/webapp/WEB-INF/web.xml b/stocks/src/main/webapp/WEB-INF/web.xml
index 57de231..0aa6855 100644
--- a/stocks/src/main/webapp/WEB-INF/web.xml
+++ b/stocks/src/main/webapp/WEB-INF/web.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-			http://java.sun.com/xml/ns/j2ee
-			https://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
+<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_3_1.xsd"
+		 version="3.1">
 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath*:/server-bootstrap-*.xml</param-value>
-	</context-param>
-
-	<listener>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath*:/server-bootstrap-*.xml</param-value>
+	</context-param>
+
+	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
 
@@ -34,14 +34,14 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<servlet>
-		<servlet-name>main</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+	<servlet>
+		<servlet-name>main</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
 			<param-value>classpath*:/servlet-config.xml</param-value>
 		</init-param>
-		<load-on-startup>1</load-on-startup>
+		<load-on-startup>1</load-on-startup>
 	</servlet>
 
 	<servlet-mapping>