garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

tomee upgrade

Browse Source
This commit is contained in:
Athou
2013-11-29 16:10:43 +01:00
parent 94b293202c
commit b8fe89b2f4
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@@ -77,9 +77,9 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
<version>1.5.2</version>
<version>1.6.0</version>
<configuration>
<tomeeVersion>1.5.2</tomeeVersion>
<tomeeVersion>1.6.0</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
<tomeeHttpPort>8082</tomeeHttpPort>
<args>-Xmx1024m -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled</args>
@@ -104,6 +104,7 @@
<lib>org.hibernate.common:hibernate-commons-annotations:4.0.1.Final</lib>
<lib>org.hibernate:hibernate-validator:4.3.1.Final</lib>
<lib>org.jboss.logging:jboss-logging:3.1.3.GA</lib>
<lib>org.javassist:javassist:3.15.0-GA</lib>
<lib>dom4j:dom4j:1.6.1</lib>
<lib>antlr:antlr:2.7.7</lib>
@@ -238,9 +239,9 @@
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.0</version>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>

2
src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
View File

@@ -15,7 +15,7 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.time.DateUtils;

2
src/main/java/com/commafeed/backend/opml/OPMLImporter.java
View File

@@ -11,7 +11,7 @@ import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.cache.CacheService;

2
src/main/java/com/commafeed/backend/rome/RSSRDF10Parser.java
View File

@@ -2,7 +2,7 @@ package com.commafeed.backend.rome;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.Namespace;

2
src/main/java/com/commafeed/frontend/pages/NextUnreadRedirectPage.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import javax.inject.Inject;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.flow.RedirectToUrlException;

2
src/main/java/com/commafeed/frontend/rest/resources/CategoryREST.java
View File

@@ -21,7 +21,7 @@ import javax.ws.rs.core.Response.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.ObjectUtils;

3
src/main/webapp/WEB-INF/scan.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<scan>
<packages>
<package>com.commafeed</package>
<package>com.commafeed.backend</package>
<package>com.commafeed.frontend.rest</package>
</packages>
</scan>