cleanup pom (#1846)

* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9fd2e1a9a55f9cacb085669568b06b49ec. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies * cleanup pom * cleanup pom
2017-05-14 18:01:35 +02:00
parent 47a97d3177
commit 2b374fa8ae
95 changed files with 1139 additions and 3029 deletions
@@ -1,13 +1,13 @@
 package org.baeldung.web.controller.mediatypes;

-import com.jayway.restassured.http.ContentType;
+import io.restassured.http.ContentType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;

-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;

@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class)
@@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.equalTo;

 import org.junit.Test;

-import com.jayway.restassured.RestAssured;
+import io.restassured.RestAssured;

 public class RequestMappingLiveTest {
    private static String BASE_URI = "http://localhost:8082/spring-rest/ex/";