From 475f5f534910aa2bff5563eab9c4eec486430e48 Mon Sep 17 00:00:00 2001
From: michaelisvy <misvy@gopivotal,com>
Date: Sat, 18 Oct 2014 23:36:15 +0800
Subject: [PATCH] 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
---
pom.xml | 6 +++---
.../samples/petclinic/web/VetsAtomView.java | 19 +++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78b70c5..5b3b1ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- 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>
@@ -45,7 +45,7 @@
<slf4j.version>1.7.7</slf4j.version>
<!-- RSS -->
- <rome.version>1.0</rome.version>
+ <rome.version>1.5.0</rome.version>
<!-- Test -->
<junit.version>4.11</junit.version>
@@ -187,7 +187,7 @@
<!-- used for Atom -->
<dependency>
- <groupId>rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>${rome.version}</version>
</dependency>
diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java b/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java
index 3de619a..bf26c39 100644
--- a/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java
+++ b/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java
@@ -15,20 +15,19 @@
*/
package org.springframework.samples.petclinic.web;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.rometools.rome.feed.atom.Entry;
+import com.rometools.rome.feed.atom.Feed;
+import com.rometools.rome.feed.atom.Content;
import org.springframework.samples.petclinic.model.Vet;
import org.springframework.samples.petclinic.model.Vets;
import org.springframework.web.servlet.view.feed.AbstractAtomFeedView;
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
/**
* A view creating a Atom representation from a list of Visit objects.
--
GitLab