From 35a179f88b4ba301612957f953121c85a1cdfd83 Mon Sep 17 00:00:00 2001 From: michaelisvy <misvy@gopivotal,com> Date: Tue, 20 Jan 2015 21:21:27 +0800 Subject: [PATCH] latest versions and imports cleanup --- pom.xml | 12 ++++++------ .../samples/petclinic/model/BaseEntity.java | 2 -- .../samples/petclinic/model/ValidatorTests.java | 5 ----- .../service/AbstractClinicServiceTests.java | 1 - 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index a8db6f1..6968fa6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!-- Spring --> - <spring-framework.version>4.1.1.RELEASE</spring-framework.version> + <spring-framework.version>4.1.4.RELEASE</spring-framework.version> <spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version> @@ -27,14 +27,14 @@ <jaxb-impl.version>2.2.7</jaxb-impl.version> <!-- Hibernate / JPA --> - <hibernate.version>4.3.6.Final</hibernate.version> + <hibernate.version>4.3.8.Final</hibernate.version> <!-- Bean validation --> <hibernate-validator.version>4.3.1.Final</hibernate-validator.version> <!-- Database access --> <tomcat-jdbc.version>7.0.42</tomcat-jdbc.version> - <ehcache.version>2.6.9</ehcache.version> + <ehcache.version>2.6.10</ehcache.version> <hsqldb.version>2.3.2</hsqldb.version> <!-- AOP --> @@ -42,19 +42,19 @@ <!-- Logging --> <logback.version>1.1.2</logback.version> - <slf4j.version>1.7.7</slf4j.version> + <slf4j.version>1.7.10</slf4j.version> <!-- RSS --> <rome.version>1.5.0</rome.version> <!-- Test --> - <junit.version>4.11</junit.version> + <junit.version>4.12</junit.version> <hamcrest.version>1.3</hamcrest.version> <!-- Dates --> <jodatime-hibernate.version>1.3</jodatime-hibernate.version> <jodatime-jsptags.version>1.1.1</jodatime-jsptags.version> - <jodatime.version>2.5</jodatime.version> + <jodatime.version>2.7</jodatime.version> <jadira-usertype-core.version>3.2.0.GA</jadira-usertype-core.version> diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java index b76bf6f..8dfbfe9 100644 --- a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java +++ b/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java @@ -15,8 +15,6 @@ */ package org.springframework.samples.petclinic.model; -import java.io.Serializable; - import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java index 0b8c7a7..566eb3a 100644 --- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -6,14 +6,9 @@ import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; - import org.junit.Assert; import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; /** diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java index d9dc349..bcef69f 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import org.joda.time.DateTime; -import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.model.Owner; -- GitLab