Skip to content

Commit

Permalink
maven upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
eugenp committed Nov 20, 2014
1 parent b349d6b commit cc52029
Show file tree
Hide file tree
Showing 32 changed files with 126 additions and 115 deletions.
13 changes: 9 additions & 4 deletions core-java-8/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import org.apache.commons.io.FileUtils;
import org.junit.Test;


public class JavaFolderSizeTest {

@Test
Expand Down
8 changes: 4 additions & 4 deletions core-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions gson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions handling-spring-static-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions httpclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions jackson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions mockito/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions rest-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions sandbox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions spring-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions spring-exceptions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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 -->
Expand Down
8 changes: 4 additions & 4 deletions spring-hibernate3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions spring-hibernate4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down
Loading

0 comments on commit cc52029

Please sign in to comment.