From 6d971fa3f358223de7a371a8daa4586d3ade4bd6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 31 Mar 2013 11:57:50 +0200
Subject: [PATCH] dependencies update

---
 pom.xml                                        | 18 +++++++++++-------
 .../rest/resources/SubscriptionsREST.java      |  8 ++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdabba6c..332fbfb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,10 @@
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>CommaFeed</name>
+	
+	<prerequisites>
+		<maven>3.0.0</maven>
+	</prerequisites>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +48,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.1.1</version>
+				<version>2.3</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
@@ -172,7 +176,7 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.2.2</version>
+			<version>1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.lambdaj</groupId>
@@ -215,7 +219,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.4</version>
+			<version>1.7.5</version>
 		</dependency>
 
 		<dependency>
@@ -237,7 +241,7 @@
 		<dependency>
 			<groupId>org.jboss</groupId>
 			<artifactId>jboss-vfs</artifactId>
-			<version>3.0.1.GA</version>
+			<version>3.1.0.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>de.agilecoders.wicket</groupId>
@@ -259,7 +263,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>angularjs</artifactId>
-			<version>1.0.5</version>
+			<version>1.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
@@ -355,14 +359,14 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.12</version>
+						<version>2.14</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
 					</plugin>
 					<plugin>
 						<artifactId>maven-war-plugin</artifactId>
-						<version>2.1.1</version>
+						<version>2.3</version>
 						<configuration>
 							<outputDirectory>deployments</outputDirectory>
 							<warName>ROOT</warName>
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java b/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
index 97edada2..4fa07dfd 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/SubscriptionsREST.java
@@ -119,13 +119,11 @@ public class SubscriptionsREST extends AbstractREST {
 	@POST
 	@Path("import")
 	@Consumes(MediaType.MULTIPART_FORM_DATA)
-	@SuppressWarnings("unchecked")
 	public Response importOpml() {
 		try {
 			FileItemFactory factory = new DiskFileItemFactory(1000000, null);
 			ServletFileUpload upload = new ServletFileUpload(factory);
-			List<FileItem> items = upload.parseRequest(request);
-			for (FileItem item : items) {
+			for (FileItem item : upload.parseRequest(request)) {
 				if ("file".equals(item.getFieldName())) {
 					opmlImporter.importOpml(getUser(),
 							IOUtils.toString(item.getInputStream(), "UTF-8"));
@@ -133,7 +131,9 @@ public class SubscriptionsREST extends AbstractREST {
 				}
 			}
 		} catch (Exception e) {
-			throw new RuntimeException(e.getMessage(), e);
+			throw new WebApplicationException(Response
+					.status(Status.INTERNAL_SERVER_ERROR)
+					.entity(e.getMessage()).build());
 		}
 		return Response.ok(Status.OK).build();
 	}