iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DOHA 2014-11-23 21:53:19 +02:00
parent 4c731284ef 6668c11c3c
commit 3450a076da
32 changed files with 132 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core-java-8/pom.xml
View File

@ -1,5 +1,4 @@
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>spring-rest</artifactId>
@ -11,10 +10,16 @@
<!-- utils -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
<version>${guava.version}</version>
</dependency>
<dependency>
@ -121,7 +126,7 @@
<hibernate-validator.version>5.1.1.Final</hibernate-validator.version>
<!-- util -->
<guava.version>17.0</guava.version>
<guava.version>18.0</guava.version>
<commons-lang3.version>3.3.2</commons-lang3.version>
<!-- testing -->

13
core-java-8/src/test/java/org/baeldung/java8/JavaFolderSizeTest.java
View File

@ -17,12 +17,11 @@ import java.util.stream.StreamSupport;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
public class JavaFolderSizeTest {
@Test
public void whenGetFolderSizeRecursive_thenCorrect() {
final long expectedSize = 124;
final long expectedSize = 136;
final File folder = new File("src/test/resources");
final long size = getFolderSize(folder);
@ -32,7 +31,7 @@ public class JavaFolderSizeTest {
@Test
public void whenGetFolderSizeUsingJava7_thenCorrect() throws IOException {
final long expectedSize = 124;
final long expectedSize = 136;
final AtomicLong size = new AtomicLong(0);
final Path folder = Paths.get("src/test/resources");
@ -50,7 +49,7 @@ public class JavaFolderSizeTest {
@Test
public void whenGetFolderSizeUsingJava8_thenCorrect() throws IOException {
final long expectedSize = 124;
final long expectedSize = 136;
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();
@ -60,7 +59,7 @@ public class JavaFolderSizeTest {
@Test
public void whenGetFolderSizeUsingApacheCommonsIO_thenCorrect() {
final long expectedSize = 124;
final long expectedSize = 136;
final File folder = new File("src/test/resources");
final long size = FileUtils.sizeOfDirectory(folder);
@ -70,7 +69,7 @@ public class JavaFolderSizeTest {
@Test
public void whenGetFolderSizeUsingGuava_thenCorrect() {
final long expectedSize = 124;
final long expectedSize = 136;
final File folder = new File("src/test/resources");
@ -90,7 +89,7 @@ public class JavaFolderSizeTest {
final double unitValue = 1 << (unitIndex * 10);
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) {

8
core-java/pom.xml
View File

@ -145,12 +145,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<jackson.version>2.4.2</jackson.version>
@ -172,9 +172,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
gson/pom.xml
View File

@ -114,12 +114,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<gson.version>2.3</gson.version>
@ -141,9 +141,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
guava/pom.xml
View File

@ -94,12 +94,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -118,9 +118,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
handling-spring-static-resources/pom.xml
View File

@ -179,12 +179,12 @@
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
<!-- 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>
<!-- persistence -->
<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>
<!-- marshalling -->
@ -208,9 +208,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

6
httpclient/pom.xml
View File

@ -149,12 +149,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -175,7 +175,7 @@
<httpcore.version>4.3.3</httpcore.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
jackson/pom.xml
View File

@ -114,12 +114,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<jackson.version>2.4.2</jackson.version>
@ -141,9 +141,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
mockito/pom.xml
View File

@ -89,12 +89,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -113,9 +113,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

6
rest-testing/pom.xml
View File

@ -138,7 +138,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<!-- marshalling -->
<jackson.version>2.4.2</jackson.version>
@ -160,9 +160,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

4
sandbox/pom.xml
View File

@ -160,9 +160,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-all/pom.xml
View File

@ -191,14 +191,14 @@
<properties>
<!-- 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>
<javassist.version>3.18.1-GA</javassist.version>
<jstl.version>1.2</jstl.version>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -217,9 +217,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-exceptions/pom.xml
View File

@ -204,14 +204,14 @@
<properties>
<!-- 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>
<javassist.version>3.18.1-GA</javassist.version>
<jstl.version>1.2</jstl.version>
<!-- persistence -->
<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>
<!-- logging -->
@ -231,9 +231,9 @@
<mockito.version>1.10.8</mockito.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>
<!-- maven plugins -->

8
spring-hibernate3/pom.xml
View File

@ -163,13 +163,13 @@
<properties>
<!-- 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>
<javassist.version>3.18.1-GA</javassist.version>
<!-- persistence -->
<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>
<!-- logging -->
@ -189,9 +189,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-hibernate4/pom.xml
View File

@ -170,13 +170,13 @@
<properties>
<!-- 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>
<javassist.version>3.18.1-GA</javassist.version>
<!-- persistence -->
<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>
<!-- logging -->
@ -196,9 +196,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-jpa/pom.xml
View File

@ -170,12 +170,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -194,9 +194,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-mvc-java/pom.xml
View File

@ -141,12 +141,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -165,9 +165,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

6
spring-mvc-no-xml/pom.xml
View File

@ -145,7 +145,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -157,9 +157,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

6
spring-mvc-xml/pom.xml
View File

@ -147,7 +147,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -159,9 +159,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-rest/pom.xml
View File

@ -202,12 +202,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
@ -226,9 +226,9 @@
<mockito.version>1.10.8</mockito.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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>

8
spring-security-basic-auth/pom.xml
View File

@ -226,12 +226,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -250,9 +250,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-mvc-custom/pom.xml
View File

@ -231,12 +231,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -254,10 +254,10 @@
<junit.version>4.11</junit.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>
<rest-assured.version>2.3.4</rest-assured.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-mvc-digest-auth/pom.xml
View File

@ -226,12 +226,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -250,9 +250,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-mvc-login/pom.xml
View File

@ -223,12 +223,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -247,9 +247,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-mvc-persisted-remember-me/pom.xml
View File

@ -260,12 +260,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -283,10 +283,10 @@
<junit.version>4.11</junit.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>
<rest-assured.version>2.3.4</rest-assured.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-mvc-session/pom.xml
View File

@ -231,12 +231,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -254,10 +254,10 @@
<junit.version>4.11</junit.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>
<rest-assured.version>2.3.4</rest-assured.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-rest-basic-auth/pom.xml
View File

@ -287,16 +287,16 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<httpcore.version>4.3.3</httpcore.version>
<httpclient.version>4.3.5</httpclient.version>
<httpclient.version>4.3.6</httpclient.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -314,7 +314,7 @@
<junit.version>4.11</junit.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-rest-custom/pom.xml
View File

@ -251,12 +251,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -275,9 +275,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-rest-digest-auth/pom.xml
View File

@ -275,16 +275,16 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<httpcore.version>4.3.3</httpcore.version>
<httpclient.version>4.3.5</httpclient.version>
<httpclient.version>4.3.6</httpclient.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -305,7 +305,7 @@
<junit.version>4.11</junit.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

8
spring-security-rest-full/pom.xml
View File

@ -375,12 +375,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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>
<!-- marshalling -->
@ -404,9 +404,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>

7
spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java
View File

@ -43,6 +43,13 @@ public class FooController {
// API
@RequestMapping(method = RequestMethod.GET, value = "/count")
@ResponseBody
@ResponseStatus(value = HttpStatus.OK)
public long count() {
return 2l;
}
// read - one
@RequestMapping(value = "/{id}", method = RequestMethod.GET)

8
spring-security-rest/pom.xml
View File

@ -238,12 +238,12 @@
<properties>
<!-- 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>
<!-- persistence -->
<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 -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -262,9 +262,9 @@
<mockito.version>1.10.8</mockito.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-compiler-plugin.version>3.2</maven-compiler-plugin.version>