mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup pom (#1846)

Browse Source 
* 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 83bf1f9fd2.

* 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
This commit is contained in:
Doha2012
2017-05-14 18:01:35 +02:00
committed by Eugen
parent 47a97d3177
commit 2b374fa8ae
95 changed files with 1139 additions and 3029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java
View File

@@ -1,6 +1,6 @@
package com.baeldung.cachecontrol;
import static com.jayway.restassured.RestAssured.given;
import static io.restassured.RestAssured.given;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -8,7 +8,7 @@ import org.springframework.boot.context.embedded.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import com.jayway.restassured.http.ContentType;
import io.restassured.http.ContentType;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class)