Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
3450a076da
|
@ -1,5 +1,4 @@
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.baeldung</groupId>
|
<groupId>org.baeldung</groupId>
|
||||||
<artifactId>spring-rest</artifactId>
|
<artifactId>spring-rest</artifactId>
|
||||||
|
@ -11,10 +10,16 @@
|
||||||
|
|
||||||
<!-- utils -->
|
<!-- utils -->
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-io</groupId>
|
||||||
|
<artifactId>commons-io</artifactId>
|
||||||
|
<version>2.4</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.guava</groupId>
|
<groupId>com.google.guava</groupId>
|
||||||
<artifactId>guava</artifactId>
|
<artifactId>guava</artifactId>
|
||||||
<version>17.0</version>
|
<version>${guava.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -121,7 +126,7 @@
|
||||||
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>17.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
<commons-lang3.version>3.3.2</commons-lang3.version>
|
<commons-lang3.version>3.3.2</commons-lang3.version>
|
||||||
|
|
||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
|
|
|
@ -17,12 +17,11 @@ import java.util.stream.StreamSupport;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
|
||||||
public class JavaFolderSizeTest {
|
public class JavaFolderSizeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetFolderSizeRecursive_thenCorrect() {
|
public void whenGetFolderSizeRecursive_thenCorrect() {
|
||||||
final long expectedSize = 124;
|
final long expectedSize = 136;
|
||||||
|
|
||||||
final File folder = new File("src/test/resources");
|
final File folder = new File("src/test/resources");
|
||||||
final long size = getFolderSize(folder);
|
final long size = getFolderSize(folder);
|
||||||
|
@ -32,7 +31,7 @@ public class JavaFolderSizeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetFolderSizeUsingJava7_thenCorrect() throws IOException {
|
public void whenGetFolderSizeUsingJava7_thenCorrect() throws IOException {
|
||||||
final long expectedSize = 124;
|
final long expectedSize = 136;
|
||||||
|
|
||||||
final AtomicLong size = new AtomicLong(0);
|
final AtomicLong size = new AtomicLong(0);
|
||||||
final Path folder = Paths.get("src/test/resources");
|
final Path folder = Paths.get("src/test/resources");
|
||||||
|
@ -50,7 +49,7 @@ public class JavaFolderSizeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetFolderSizeUsingJava8_thenCorrect() throws IOException {
|
public void whenGetFolderSizeUsingJava8_thenCorrect() throws IOException {
|
||||||
final long expectedSize = 124;
|
final long expectedSize = 136;
|
||||||
|
|
||||||
final Path folder = Paths.get("src/test/resources");
|
final Path folder = Paths.get("src/test/resources");
|
||||||
final long size = Files.walk(folder).filter(p -> p.toFile().isFile()).mapToLong(p -> p.toFile().length()).sum();
|
final long size = Files.walk(folder).filter(p -> p.toFile().isFile()).mapToLong(p -> p.toFile().length()).sum();
|
||||||
|
@ -60,7 +59,7 @@ public class JavaFolderSizeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetFolderSizeUsingApacheCommonsIO_thenCorrect() {
|
public void whenGetFolderSizeUsingApacheCommonsIO_thenCorrect() {
|
||||||
final long expectedSize = 124;
|
final long expectedSize = 136;
|
||||||
|
|
||||||
final File folder = new File("src/test/resources");
|
final File folder = new File("src/test/resources");
|
||||||
final long size = FileUtils.sizeOfDirectory(folder);
|
final long size = FileUtils.sizeOfDirectory(folder);
|
||||||
|
@ -70,7 +69,7 @@ public class JavaFolderSizeTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void whenGetFolderSizeUsingGuava_thenCorrect() {
|
public void whenGetFolderSizeUsingGuava_thenCorrect() {
|
||||||
final long expectedSize = 124;
|
final long expectedSize = 136;
|
||||||
|
|
||||||
final File folder = new File("src/test/resources");
|
final File folder = new File("src/test/resources");
|
||||||
|
|
||||||
|
@ -90,7 +89,7 @@ public class JavaFolderSizeTest {
|
||||||
final double unitValue = 1 << (unitIndex * 10);
|
final double unitValue = 1 << (unitIndex * 10);
|
||||||
|
|
||||||
final String readableSize = new DecimalFormat("#,##0.#").format(size / unitValue) + " " + units[unitIndex];
|
final String readableSize = new DecimalFormat("#,##0.#").format(size / unitValue) + " " + units[unitIndex];
|
||||||
assertEquals("124 B", readableSize);
|
assertEquals("136 B", readableSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
private long getFolderSize(final File folder) {
|
private long getFolderSize(final File folder) {
|
||||||
|
|
|
@ -145,12 +145,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<jackson.version>2.4.2</jackson.version>
|
<jackson.version>2.4.2</jackson.version>
|
||||||
|
@ -172,9 +172,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -114,12 +114,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<gson.version>2.3</gson.version>
|
<gson.version>2.3</gson.version>
|
||||||
|
@ -141,9 +141,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -94,12 +94,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -118,9 +118,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -179,12 +179,12 @@
|
||||||
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
|
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
|
||||||
|
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
|
@ -208,9 +208,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -149,12 +149,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -175,7 +175,7 @@
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.4</httpclient.version>
|
<httpclient.version>4.3.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -114,12 +114,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<jackson.version>2.4.2</jackson.version>
|
<jackson.version>2.4.2</jackson.version>
|
||||||
|
@ -141,9 +141,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -89,12 +89,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -113,9 +113,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<jackson.version>2.4.2</jackson.version>
|
<jackson.version>2.4.2</jackson.version>
|
||||||
|
@ -160,9 +160,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -160,9 +160,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -191,14 +191,14 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -217,9 +217,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -204,14 +204,14 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
|
@ -231,9 +231,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
<groovy.version>1.8.9</groovy.version>
|
<groovy.version>1.8.9</groovy.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
|
|
|
@ -163,13 +163,13 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>3.6.10.Final</hibernate.version>
|
<hibernate.version>3.6.10.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
|
<tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
|
@ -189,9 +189,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -170,13 +170,13 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
|
@ -196,9 +196,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -170,12 +170,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -194,9 +194,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -141,12 +141,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -165,9 +165,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -157,9 +157,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -147,7 +147,7 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -159,9 +159,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -202,12 +202,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
|
|
||||||
|
@ -226,9 +226,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
|
|
@ -226,12 +226,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -250,9 +250,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -231,12 +231,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -254,10 +254,10 @@
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -226,12 +226,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -250,9 +250,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -223,12 +223,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -247,9 +247,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -260,12 +260,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -283,10 +283,10 @@
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -231,12 +231,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -254,10 +254,10 @@
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -287,16 +287,16 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -314,7 +314,7 @@
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -251,12 +251,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -275,9 +275,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -275,16 +275,16 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -305,7 +305,7 @@
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -375,12 +375,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
|
@ -404,9 +404,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
|
@ -43,6 +43,13 @@ public class FooController {
|
||||||
|
|
||||||
// API
|
// API
|
||||||
|
|
||||||
|
@RequestMapping(method = RequestMethod.GET, value = "/count")
|
||||||
|
@ResponseBody
|
||||||
|
@ResponseStatus(value = HttpStatus.OK)
|
||||||
|
public long count() {
|
||||||
|
return 2l;
|
||||||
|
}
|
||||||
|
|
||||||
// read - one
|
// read - one
|
||||||
|
|
||||||
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
||||||
|
|
|
@ -238,12 +238,12 @@
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
|
||||||
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
|
@ -262,9 +262,9 @@
|
||||||
<mockito.version>1.10.8</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.3</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.6</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.4</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
|
|
Loading…
Reference in New Issue