diff --git a/pom.xml b/pom.xml index e2c8314d..0b00a49f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.commafeed commafeed - 2.0.3-SNAPSHOT + 2.0.3 jar CommaFeed @@ -15,6 +15,9 @@ UTF-8 0.7.1 + 3.0 + 3.5.0 + 1.5.0 @@ -44,7 +47,7 @@ pl.project13.maven git-commit-id-plugin - 2.1.10 + 2.1.11 @@ -178,12 +181,12 @@ com.google.inject guice - 3.0 + ${guice.version} com.google.inject.extensions guice-multibindings - 3.0 + ${guice.version} @@ -217,33 +220,32 @@ ${dropwizard.version} pom + com.wordnik swagger-jaxrs_2.10 1.3.10 - jsr311-api javax.ws.rs - - - javassist - javassist + jsr311-api + com.mysema.querydsl querydsl-apt - 3.5.0 + ${querydsl.version} provided hibernate com.mysema.querydsl querydsl-jpa - 3.5.0 + ${querydsl.version} + commons-io commons-io @@ -264,6 +266,7 @@ commons-math3 3.3 + redis.clients jedis @@ -274,15 +277,16 @@ javax.mail 1.5.2 + com.rometools rome - 1.5.0 + ${rome.version} com.rometools rome-opml - 1.5.0 + ${rome.version} org.jsoup @@ -303,7 +307,7 @@ com.h2database h2 - 1.4.181 + 1.4.182 mysql diff --git a/src/main/java/com/commafeed/backend/feed/FeedUtils.java b/src/main/java/com/commafeed/backend/feed/FeedUtils.java index 6c6593ae..c722a2b9 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; } @@ -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; - } - }