From 23c9f60d01b4f96943e5369747c0f87e718ed843 Mon Sep 17 00:00:00 2001 From: huguangju Date: Sun, 1 Feb 2015 23:46:59 +0800 Subject: [PATCH 1/4] remove excess import --- .../samples/petclinic/model/ValidatorTests.java | 1 - .../springframework/samples/petclinic/web/VisitsViewTests.java | 3 --- 2 files changed, 4 deletions(-) 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 0c80d06fb..f915d3ec7 100644 --- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -8,7 +8,6 @@ import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; -import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.Test; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java index b2e953c25..eba60d389 100644 --- a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java +++ b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java @@ -18,9 +18,6 @@ package org.springframework.samples.petclinic.web; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath; import org.junit.Before; import org.junit.Test; From 84a828045215f969d343c867da994f79da40780c Mon Sep 17 00:00:00 2001 From: huguangju Date: Sun, 1 Feb 2015 23:47:34 +0800 Subject: [PATCH 2/4] git rid of logback.xml warning --- src/main/resources/logback.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 751726a14..ea69af367 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,4 +1,5 @@ + From 887cac0f2d5213c53a3ff7c3526475345a9496e8 Mon Sep 17 00:00:00 2001 From: huguangju Date: Sun, 1 Feb 2015 23:49:41 +0800 Subject: [PATCH 3/4] remove overriding managed version in pom.xml --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index e0ca8e9d0..4b171a84f 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ 2.7 3.2.0.GA - 2.3.0 1.10.3 @@ -119,7 +118,6 @@ org.springframework spring-aop - ${spring-framework.version} org.springframework @@ -129,7 +127,6 @@ org.springframework spring-tx - ${spring-framework.version} @@ -140,7 +137,6 @@ org.springframework spring-orm - ${spring-framework.version} org.springframework From 0e562ebde90e6d8c3bff63a0cc721c5af0aadaca Mon Sep 17 00:00:00 2001 From: huguangju Date: Mon, 2 Feb 2015 23:32:46 +0800 Subject: [PATCH 4/4] content is centered --- src/main/webapp/resources/css/petclinic.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css index 36ad67082..76a8ef83d 100644 --- a/src/main/webapp/resources/css/petclinic.css +++ b/src/main/webapp/resources/css/petclinic.css @@ -1,6 +1,5 @@ .container { padding-top: 10px; - margin-left: 50px; width: 700px; }