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-12-21 23:25:08 +02:00
parent 18c74487ec 01548ef00b
commit eedcbeb186
31 changed files with 156 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apache-fop/pom.xml
View File

@ -143,7 +143,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -167,9 +167,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -177,9 +177,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
core-java/pom.xml
View File

@ -145,7 +145,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -169,9 +169,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -179,9 +179,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
gson/pom.xml
View File

@ -114,7 +114,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -138,9 +138,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -148,9 +148,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
guava/pom.xml
View File

@ -94,7 +94,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -115,9 +115,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -125,9 +125,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -123,7 +123,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.3</version>
<version>2.6</version>
</dependency>
<!-- Handlebars.java -->
@ -172,20 +172,21 @@
<properties>
<java-version>1.7</java-version>
<org.springframework-version>4.1.0.RELEASE</org.springframework-version>
<org.springframework.security-version>3.2.0.RELEASE</org.springframework.security-version>
<!-- Spring -->
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<org.aspectj-version>1.8.1</org.aspectj-version>
<org.slf4j-version>1.6.1</org.slf4j-version>
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.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.34</mysql-connector-java.version>
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
<!-- marshalling -->
@ -205,9 +206,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -215,8 +216,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>
</project>

10
httpclient/pom.xml
View File

@ -154,7 +154,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -175,9 +175,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.4-beta1</httpclient.version> <!-- 4.3.6 --> <!-- 4.4-beta1 -->
<rest-assured.version>2.4.0</rest-assured.version>
@ -185,9 +185,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
jackson/pom.xml
View File

@ -115,7 +115,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -139,9 +139,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -149,9 +149,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
mockito/pom.xml
View File

@ -89,7 +89,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -110,9 +110,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -120,9 +120,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
rest-testing/pom.xml
View File

@ -138,7 +138,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<!-- marshalling -->
<jackson.version>2.4.2</jackson.version>
@ -157,9 +157,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -167,9 +167,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

6
sandbox/pom.xml
View File

@ -157,9 +157,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -167,7 +167,7 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>

10
spring-all/pom.xml
View File

@ -191,7 +191,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.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>
@ -214,9 +214,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -224,9 +224,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
spring-exceptions/pom.xml
View File

@ -204,7 +204,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.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>
@ -228,9 +228,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -239,9 +239,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
spring-hibernate3/pom.xml
View File

@ -163,7 +163,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<javassist.version>3.18.1-GA</javassist.version>
@ -186,18 +186,18 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
spring-hibernate4/pom.xml
View File

@ -170,7 +170,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<javassist.version>3.18.1-GA</javassist.version>
@ -193,18 +193,18 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
spring-jpa/pom.xml
View File

@ -170,7 +170,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -191,18 +191,18 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
<!-- <maven-war-plugin.version>2.5</maven-war-plugin.version> -->
</properties>

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

@ -141,7 +141,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -162,9 +162,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -172,9 +172,9 @@
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -145,7 +145,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -154,9 +154,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -164,9 +164,9 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -147,7 +147,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version>
@ -156,9 +156,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -166,9 +166,9 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

10
spring-rest/pom.xml
View File

@ -207,7 +207,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -228,9 +228,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -242,8 +242,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -226,7 +226,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -247,9 +247,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -257,9 +257,9 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

2
spring-security-login-and-registration/pom.xml
View File

@ -142,7 +142,7 @@
<!-- Inject -->
<javax.inject.version>1</javax.inject.version>
<!-- Spring Data Jpa -->
<spring-data-jpa.version>1.4.5.RELEASE</spring-data-jpa.version>
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
<!-- guava -->
<guava.version>18.0</guava.version>
</properties>

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

@ -231,7 +231,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -252,19 +252,19 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpclient.version>4.3.6</httpclient.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -226,7 +226,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -247,9 +247,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -257,9 +257,9 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -223,7 +223,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -244,9 +244,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -254,9 +254,9 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -260,7 +260,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -281,19 +281,19 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpclient.version>4.3.6</httpclient.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -231,7 +231,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -252,19 +252,19 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpclient.version>4.3.6</httpclient.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -287,7 +287,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -295,7 +295,7 @@
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
<!-- http -->
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<!-- logging -->
@ -312,15 +312,15 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -251,7 +251,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -272,9 +272,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -282,8 +282,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -275,7 +275,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -283,7 +283,7 @@
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
<!-- http -->
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<!-- logging -->
@ -303,15 +303,15 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -375,13 +375,13 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.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.34</mysql-connector-java.version>
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
<!-- marshalling -->
@ -401,9 +401,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -411,8 +411,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>

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

@ -238,7 +238,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@ -259,9 +259,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@ -269,8 +269,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>