From 9d8b2c308e101ff607953fb4ca6a346eccc85e68 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Sat, 13 Dec 2014 22:49:17 +0200
Subject: [PATCH] cleanup in the jackson project

---
 jackson/pom.xml                               |  7 ++--
 .../src/main/webapp/WEB-INF/api-servlet.xml   |  6 ---
 jackson/src/main/webapp/WEB-INF/web.xml       | 42 -------------------
 3 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 jackson/src/main/webapp/WEB-INF/api-servlet.xml
 delete mode 100644 jackson/src/main/webapp/WEB-INF/web.xml

diff --git a/jackson/pom.xml b/jackson/pom.xml
index 654be183f1..b5ff00ced1 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -14,8 +14,9 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>17.0</version>
+			<version>${guava.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -47,7 +48,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.3</version>
+			<version>2.3.1</version>
 		</dependency>
 
 		<!-- test scoped -->
@@ -122,7 +123,7 @@
 		<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
 
 		<!-- marshalling -->
-		<jackson.version>2.4.2</jackson.version>
+		<jackson.version>2.4.4</jackson.version>
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.7</org.slf4j.version>
diff --git a/jackson/src/main/webapp/WEB-INF/api-servlet.xml b/jackson/src/main/webapp/WEB-INF/api-servlet.xml
deleted file mode 100644
index 4c74be8912..0000000000
--- a/jackson/src/main/webapp/WEB-INF/api-servlet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" >
-
-</beans>
\ No newline at end of file
diff --git a/jackson/src/main/webapp/WEB-INF/web.xml b/jackson/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 48d4b8fe61..0000000000
--- a/jackson/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xsi:schemaLocation="
-      http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	id="WebApp_ID" version="3.0">
-
-	<display-name>Spring MVC Application</display-name>
-
-	<!-- Spring root -->
-	<context-param>
-		<param-name>contextClass</param-name>
-		<param-value>
-        	org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-      	</param-value>
-	</context-param>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>org.baeldung.config</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- Spring child -->
-	<servlet>
-		<servlet-name>api</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>api</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<welcome-file-list>
-		<welcome-file />
-	</welcome-file-list>
-
-</web-app>
\ No newline at end of file