maven upgrades
This commit is contained in:
@@ -143,11 +143,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -170,16 +170,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -145,11 +145,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -172,16 +172,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
10
gson/pom.xml
10
gson/pom.xml
@@ -114,11 +114,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -141,16 +141,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -94,11 +94,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -118,16 +118,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -173,18 +173,18 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<java-version>1.7</java-version>
|
<java-version>1.7</java-version>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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>
|
||||||
|
|
||||||
<org.aspectj-version>1.8.1</org.aspectj-version>
|
<org.aspectj-version>1.8.1</org.aspectj-version>
|
||||||
<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.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
@@ -209,15 +209,15 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -154,11 +154,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -184,10 +184,10 @@
|
|||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -133,11 +133,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -160,16 +160,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -89,11 +89,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -113,16 +113,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
<jackson.version>2.4.4</jackson.version>
|
<jackson.version>2.4.4</jackson.version>
|
||||||
@@ -160,16 +160,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,7 @@
|
|||||||
<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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.29</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.29</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -160,13 +160,13 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|||||||
@@ -195,13 +195,13 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -221,16 +221,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -204,13 +204,13 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</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>
|
||||||
|
|
||||||
@@ -231,17 +231,17 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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 -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -163,7 +163,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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>
|
||||||
|
|
||||||
@@ -189,7 +189,7 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@
|
|||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -170,12 +170,12 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</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>
|
||||||
|
|
||||||
@@ -196,7 +196,7 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
@@ -204,7 +204,7 @@
|
|||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -176,11 +176,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -200,7 +200,7 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
@@ -208,8 +208,8 @@
|
|||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
<!-- <maven-war-plugin.version>2.5</maven-war-plugin.version> -->
|
<!-- <maven-war-plugin.version>2.6</maven-war-plugin.version> -->
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -141,11 +141,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -165,16 +165,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.9</org.slf4j.version>
|
<org.slf4j.version>1.7.9</org.slf4j.version>
|
||||||
@@ -157,16 +157,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -147,7 +147,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.9</org.slf4j.version>
|
<org.slf4j.version>1.7.9</org.slf4j.version>
|
||||||
@@ -159,16 +159,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -207,11 +207,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@@ -231,7 +231,7 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</rest-assured.version>
|
<rest-assured.version>2.4.0</rest-assured.version>
|
||||||
|
|
||||||
@@ -241,9 +241,9 @@
|
|||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -226,11 +226,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -250,16 +250,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -231,11 +231,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -254,17 +254,17 @@
|
|||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -226,11 +226,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -250,16 +250,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -20,11 +20,6 @@
|
|||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>org.springframework.ide.eclipse.core.springbuilder</name>
|
<name>org.springframework.ide.eclipse.core.springbuilder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
@@ -40,6 +35,11 @@
|
|||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
</buildSpec>
|
</buildSpec>
|
||||||
<natures>
|
<natures>
|
||||||
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
|
||||||
|
|||||||
@@ -223,11 +223,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -247,16 +247,16 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -231,11 +231,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -254,17 +254,17 @@
|
|||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -381,11 +381,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
@@ -410,15 +410,15 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -287,16 +287,16 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.9</org.slf4j.version>
|
<org.slf4j.version>1.7.9</org.slf4j.version>
|
||||||
@@ -318,9 +318,9 @@
|
|||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -251,11 +251,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -275,15 +275,15 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -275,16 +275,16 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.9</org.slf4j.version>
|
<org.slf4j.version>1.7.9</org.slf4j.version>
|
||||||
@@ -309,9 +309,9 @@
|
|||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -1,23 +1,23 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src/main/java">
|
<classpathentry kind="src" output="target/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="src" path="target/generated-sources/java">
|
<classpathentry kind="src" output="target/classes" path="target/generated-sources/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" path="src/test/resources">
|
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="src" path="src/test/java">
|
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
|
|||||||
@@ -5,8 +5,6 @@
|
|||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/java"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/java"/>
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
|
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
|
|
||||||
<property name="context-root" value="spring-security-rest-full"/>
|
<property name="context-root" value="spring-security-rest-full"/>
|
||||||
<property name="java-output-path" value="/spring-security-rest-full/target/classes"/>
|
<property name="java-output-path" value="/spring-security-rest-full/target/classes"/>
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|||||||
@@ -414,11 +414,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.7.1.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
@@ -443,15 +443,15 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
@@ -238,11 +238,11 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.1.4.RELEASE</org.springframework.version>
|
<org.springframework.version>4.1.5.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.8.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@@ -262,15 +262,15 @@
|
|||||||
<mockito.version>1.10.19</mockito.version>
|
<mockito.version>1.10.19</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.4</httpcore.version>
|
<httpcore.version>4.4</httpcore.version>
|
||||||
<httpclient.version>4.3.6</httpclient.version>
|
<httpclient.version>4.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.4.0</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>
|
||||||
<maven-war-plugin.version>2.5</maven-war-plugin.version>
|
<maven-war-plugin.version>2.6</maven-war-plugin.version>
|
||||||
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.12</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user