migrated to Spring 4.1.1.RELEASE

Also had to make changes because Spring now uses com.rometools for RSS
feeds
See here for more details: https://jira.spring.io/browse/SPR-11893
This commit is contained in:
michaelisvy 2014-10-18 23:36:15 +08:00
parent f5cf426e43
commit 475f5f5349
2 changed files with 12 additions and 13 deletions

View file

@ -16,7 +16,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Spring --> <!-- Spring -->
<spring-framework.version>4.0.6.RELEASE</spring-framework.version> <spring-framework.version>4.1.1.RELEASE</spring-framework.version>
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version> <spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
@ -45,7 +45,7 @@
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<!-- RSS --> <!-- RSS -->
<rome.version>1.0</rome.version> <rome.version>1.5.0</rome.version>
<!-- Test --> <!-- Test -->
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
@ -187,7 +187,7 @@
<!-- used for Atom --> <!-- used for Atom -->
<dependency> <dependency>
<groupId>rome</groupId> <groupId>com.rometools</groupId>
<artifactId>rome</artifactId> <artifactId>rome</artifactId>
<version>${rome.version}</version> <version>${rome.version}</version>
</dependency> </dependency>

View file

@ -15,20 +15,19 @@
*/ */
package org.springframework.samples.petclinic.web; package org.springframework.samples.petclinic.web;
import java.util.ArrayList; import com.rometools.rome.feed.atom.Entry;
import java.util.List; import com.rometools.rome.feed.atom.Feed;
import java.util.Map; import com.rometools.rome.feed.atom.Content;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.samples.petclinic.model.Vet; import org.springframework.samples.petclinic.model.Vet;
import org.springframework.samples.petclinic.model.Vets; import org.springframework.samples.petclinic.model.Vets;
import org.springframework.web.servlet.view.feed.AbstractAtomFeedView; import org.springframework.web.servlet.view.feed.AbstractAtomFeedView;
import com.sun.syndication.feed.atom.Content; import javax.servlet.http.HttpServletRequest;
import com.sun.syndication.feed.atom.Entry; import javax.servlet.http.HttpServletResponse;
import com.sun.syndication.feed.atom.Feed; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/** /**
* A view creating a Atom representation from a list of Visit objects. * A view creating a Atom representation from a list of Visit objects.