From a4c6365ede08a0756c20a5371a72eb72203928c8 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 28 Oct 2014 14:27:15 +0100
Subject: [PATCH 1/5] pom cleanup

---
 pom.xml | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index e2c8314d..74798775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dropwizard.version>0.7.1</dropwizard.version>
+		<guice.version>3.0</guice.version>
+		<querydsl.version>3.5.0</querydsl.version>
+		<rome.version>1.5.0</rome.version>
 	</properties>
 
 	<scm>
@@ -35,7 +38,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<version>3.2</version>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>
@@ -44,7 +47,7 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.1.10</version>
+				<version>2.1.11</version>
 				<executions>
 					<execution>
 						<goals>
@@ -178,12 +181,12 @@
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<version>3.0</version>
+			<version>${guice.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject.extensions</groupId>
 			<artifactId>guice-multibindings</artifactId>
-			<version>3.0</version>
+			<version>${guice.version}</version>
 		</dependency>
 
 		<dependency>
@@ -217,33 +220,32 @@
 			<version>${dropwizard.version}</version>
 			<type>pom</type>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-jaxrs_2.10</artifactId>
 			<version>1.3.10</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>jsr311-api</artifactId>
 					<groupId>javax.ws.rs</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>javassist</artifactId>
-					<groupId>javassist</groupId>
+					<artifactId>jsr311-api</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-apt</artifactId>
-			<version>3.5.0</version>
+			<version>${querydsl.version}</version>
 			<scope>provided</scope>
 			<classifier>hibernate</classifier>
 		</dependency>
 		<dependency>
 			<groupId>com.mysema.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
-			<version>3.5.0</version>
+			<version>${querydsl.version}</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -264,6 +266,7 @@
 			<artifactId>commons-math3</artifactId>
 			<version>3.3</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
@@ -274,15 +277,16 @@
 			<artifactId>javax.mail</artifactId>
 			<version>1.5.2</version>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.5.0</version>
+			<version>${rome.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome-opml</artifactId>
-			<version>1.5.0</version>
+			<version>${rome.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
@@ -303,7 +307,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.181</version>
+			<version>1.4.182</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>

From 443dea50557ac29596e12273cd1194a693e2231c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 29 Oct 2014 08:26:53 +0100
Subject: [PATCH 2/5] huge perf boost

---
 src/main/java/com/commafeed/backend/feed/FeedUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/src/main/java/com/commafeed/backend/feed/FeedUtils.java
index 6c6593ae..6b781e7a 100644
--- a/src/main/java/com/commafeed/backend/feed/FeedUtils.java
+++ b/src/main/java/com/commafeed/backend/feed/FeedUtils.java
@@ -130,7 +130,7 @@ public class FeedUtils {
 	public static String replaceHtmlEntitiesWithNumericEntities(String source) {
 		String result = source;
 		for (String entity : HtmlEntities.NUMERIC_MAPPING.keySet()) {
-			result = result.replace(entity, HtmlEntities.NUMERIC_MAPPING.get(entity));
+			result = StringUtils.replace(result, entity, HtmlEntities.NUMERIC_MAPPING.get(entity));
 		}
 		return result;
 	}
@@ -531,5 +531,5 @@ public class FeedUtils {
 		}
 		return xmlString;
 	}
-	
+
 }

From 2061b68a2f7ed448158fe8001d2dd3bbe72e055d Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 29 Oct 2014 08:27:04 +0100
Subject: [PATCH 3/5] method not used anymore

---
 .../com/commafeed/backend/feed/FeedUtils.java     | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/src/main/java/com/commafeed/backend/feed/FeedUtils.java
index 6b781e7a..c722a2b9 100644
--- a/src/main/java/com/commafeed/backend/feed/FeedUtils.java
+++ b/src/main/java/com/commafeed/backend/feed/FeedUtils.java
@@ -517,19 +517,4 @@ public class FeedUtils {
 			}
 		}
 	}
-
-	public static String parseForImageUrl(byte[] xml) {
-		String xmlString = null;
-		try {
-			String encoding = FeedUtils.guessEncoding(xml);
-			xmlString = FeedUtils.trimInvalidXmlCharacters(new String(xml, encoding));
-			/*if (xmlString == null) {
-				throw new FeedException("Input string is null for url " + feedUrl);
-			}*/
-			xmlString = FeedUtils.replaceHtmlEntitiesWithNumericEntities(xmlString);
-		} catch (Exception e) {
-		}
-		return xmlString;
-	}
-
 }

From 969da0f2a619ad2618fc449f6da43ad7d832d9d0 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 29 Oct 2014 08:29:32 +0100
Subject: [PATCH 4/5] let's release

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 74798775..a57b8a34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>2.0.3-SNAPSHOT</version>
+	<version>2.0.3</version>
 	<packaging>jar</packaging>
 	<name>CommaFeed</name>
 

From 0a2d2c3f438ad236fbd837011e4ea4a78195b804 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 29 Oct 2014 08:42:32 +0100
Subject: [PATCH 5/5] fix travis build

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a57b8a34..0b00a49f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.2</version>
+				<version>3.1</version>
 				<configuration>
 					<source>1.7</source>
 					<target>1.7</target>