From abcba3013173377322e046c76a0afd434d39f784 Mon Sep 17 00:00:00 2001
From: Erik Forkalsrud <erik@forkalsrud.org>
Date: Thu, 28 Aug 2014 00:11:19 -0700
Subject: [PATCH] update dependencies

---
 pom.xml | 67 +++++++++++++++++++++------------------------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b3c9f1..bfda646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.9</version>
         <configuration>
           <wtpversion>1.5</wtpversion>
           <wtpContextName>photo</wtpContextName>
@@ -94,13 +94,13 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.6.1</version>
+      <version>1.7</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-tools</artifactId>
-      <version>2.0-beta3</version>
+      <version>2.0</version>
       <scope>runtime</scope>
       <exclusions>
         <exclusion>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
+      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>com.drewnoakes</groupId>
@@ -122,14 +122,9 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -143,30 +138,8 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>3.0.0.RELEASE</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.0.RELEASE</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>3.0.0.RELEASE</version>
+      <artifactId>spring-web</artifactId>
+      <version>4.0.6.RELEASE</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -179,6 +152,11 @@
       <artifactId>lucene-core</artifactId>
       <version>4.4.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+      <version>4.4.0</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
@@ -199,22 +177,25 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.6</version>
+      <version>1.7.7</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.6</version>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
-      <version>1.6.6</version>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.6</version>
+      <version>1.7.7</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
     	<groupId>commons-io</groupId>
@@ -226,18 +207,18 @@
     <dependency>
 	    <groupId>org.codehaus.jackson</groupId>
 	    <artifactId>jackson-mapper-asl</artifactId>
-	    <version>1.9.11</version>
+	    <version>1.9.13</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.6.8.v20121106</version>
+      <version>7.6.15.v20140411</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>7.6.8.v20121106</version>
+      <version>7.6.15.v20140411</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -262,7 +243,7 @@
       <url>http://download.oracle.com/maven</url>
       <layout>default</layout>
     </repository>
-  </repositories -->
+  </repositories>
   <pluginRepositories>
     <pluginRepository>
       <id>central</id>
@@ -278,7 +259,7 @@
       <snapshots><enabled>true</enabled></snapshots>
       <url>http://forkalsrud.org:8080/nexus/content/groups/public-snapshots</url>
     </pluginRepository>
-  </pluginRepositories>
+  </pluginRepositories -->
     <distributionManagement>
       <!-- use the following if you're not using a snapshot version. -->
       <repository>