Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
532d279337
@ -127,18 +127,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.4</httpclient.version>
|
<httpclient.version>4.3.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.2</rest-assured.version>
|
<rest-assured.version>2.3.2</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -149,7 +149,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@ -160,7 +160,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>17.0</guava.version> <!-- upgrade to 18.0 -->
|
<guava.version>17.0</guava.version> <!-- upgrade to 18.0 -->
|
||||||
@ -169,19 +169,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -3,6 +3,9 @@ package org.baeldung.java;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
@ -15,11 +18,11 @@ public class JavaTimerUnitTest {
|
|||||||
final TimerTask timerTask = new TimerTask() {
|
final TimerTask timerTask = new TimerTask() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
System.out.println("Task performed on " + new Date() + "\n" + "Thread's name: " + Thread.currentThread().getName());
|
System.out.println("Task performed on: " + new Date() + "\n" + "Thread's name: " + Thread.currentThread().getName());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
final Timer timer = new Timer("Timer");
|
final Timer timer = new Timer("Timer");
|
||||||
|
|
||||||
final long delay = 1000L;
|
final long delay = 1000L;
|
||||||
timer.schedule(timerTask, delay);
|
timer.schedule(timerTask, delay);
|
||||||
|
|
||||||
@ -27,4 +30,90 @@ public class JavaTimerUnitTest {
|
|||||||
timer.cancel();
|
timer.cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenUsingTimer_whenSchedulingRepeatedTask_thenCorrect() throws InterruptedException {
|
||||||
|
final TimerTask repeatedTask = new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
System.out.println("Task performed on " + new Date());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
final Timer timer = new Timer("Timer");
|
||||||
|
|
||||||
|
final long delay = 1000L;
|
||||||
|
final long period = 1000L;
|
||||||
|
timer.scheduleAtFixedRate(repeatedTask, delay, period);
|
||||||
|
|
||||||
|
Thread.sleep(delay * 2);
|
||||||
|
timer.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenUsingTimer_whenSchedulingDailyTask_thenCorrect() throws InterruptedException {
|
||||||
|
final TimerTask repeatedTask = new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
System.out.println("Task performed on " + new Date());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
final Timer timer = new Timer("Timer");
|
||||||
|
|
||||||
|
final long delay = 1000L;
|
||||||
|
final long period = 1000L * 60L * 60L * 24L;
|
||||||
|
timer.scheduleAtFixedRate(repeatedTask, delay, period);
|
||||||
|
|
||||||
|
Thread.sleep(delay * 2);
|
||||||
|
timer.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenUsingTimer_whenCancelingTimerTask_thenCorrect() throws InterruptedException {
|
||||||
|
final TimerTask task = new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
System.out.println("Task performed on " + new Date());
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
final Timer timer = new Timer("Timer");
|
||||||
|
|
||||||
|
final long delay = 1000L;
|
||||||
|
final long period = 1000L;
|
||||||
|
timer.scheduleAtFixedRate(task, delay, period);
|
||||||
|
|
||||||
|
Thread.sleep(delay * 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenUsingTimer_whenCancelingTimer_thenCorrect() throws InterruptedException {
|
||||||
|
final TimerTask task = new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
System.out.println("Task performed on " + new Date());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
final Timer timer = new Timer("Timer");
|
||||||
|
|
||||||
|
timer.scheduleAtFixedRate(task, 1000L, 1000L);
|
||||||
|
|
||||||
|
Thread.sleep(1000L * 2);
|
||||||
|
timer.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void givenUsingExecutorService_whenSchedulingRepeatedTask_thenCorrect() throws InterruptedException {
|
||||||
|
final TimerTask repeatedTask = new TimerTask() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
System.out.println("Task performed on " + new Date());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
|
||||||
|
final long delay = 1000L;
|
||||||
|
final long period = 1000L;
|
||||||
|
executor.scheduleAtFixedRate(repeatedTask, delay, period, TimeUnit.MILLISECONDS);
|
||||||
|
Thread.sleep(delay + period * 3);
|
||||||
|
executor.shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
18
gson/pom.xml
18
gson/pom.xml
@ -118,7 +118,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@ -129,7 +129,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -138,19 +138,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -98,7 +98,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -106,7 +106,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -115,19 +115,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -153,7 +153,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -161,7 +161,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -170,19 +170,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.4</httpclient.version>
|
<httpclient.version>4.3.4</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -118,7 +118,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@ -129,7 +129,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -138,19 +138,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -93,7 +93,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -101,7 +101,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -110,19 +110,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -148,7 +148,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -157,19 +157,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.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 -->
|
||||||
@ -148,7 +148,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<guava.version>16.0.1</guava.version>
|
||||||
@ -157,18 +157,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</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>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -197,7 +197,7 @@
|
|||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -205,7 +205,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -214,19 +214,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -210,7 +210,7 @@
|
|||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
||||||
|
|
||||||
@ -219,7 +219,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -228,20 +228,20 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</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.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -177,7 +177,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -186,18 +186,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@
|
|||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
<tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
|
||||||
|
|
||||||
@ -184,7 +184,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -193,18 +193,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -174,7 +174,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -182,7 +182,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -191,19 +191,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
<!-- <maven-war-plugin.version>2.4</maven-war-plugin.version> -->
|
<!-- <maven-war-plugin.version>2.5</maven-war-plugin.version> -->
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -145,7 +145,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -153,7 +153,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -162,19 +162,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -154,19 +154,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -156,19 +156,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -206,7 +206,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- marshalling -->
|
<!-- marshalling -->
|
||||||
@ -214,7 +214,7 @@
|
|||||||
<jackson.version>2.4.2</jackson.version>
|
<jackson.version>2.4.2</jackson.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -223,22 +223,22 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
<org.slf4j.version>1.7.7</org.slf4j.version>
|
<org.slf4j.version>1.7.7</org.slf4j.version>
|
||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -230,7 +230,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -238,7 +238,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -247,19 +247,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -17,18 +17,16 @@
|
|||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<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 exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="owner.project.facets" value="java"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
|
|
||||||
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
<classpathentry kind="output" path="target/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
@ -30,11 +30,6 @@
|
|||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>org.hibernate.eclipse.console.hibernateBuilder</name>
|
<name>org.hibernate.eclipse.console.hibernateBuilder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
@ -45,6 +40,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>
|
||||||
|
@ -235,7 +235,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -243,7 +243,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -252,19 +252,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -230,7 +230,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -238,7 +238,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -247,19 +247,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -227,7 +227,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -235,7 +235,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -244,19 +244,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -264,7 +264,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -272,7 +272,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -281,19 +281,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -235,7 +235,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -243,7 +243,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -252,19 +252,19 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -291,11 +291,11 @@
|
|||||||
<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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -303,7 +303,7 @@
|
|||||||
<logback.version>1.1.2</logback.version> <!-- do not upgrade - see http://jira.qos.ch/browse/LOGBACK-851 -->
|
<logback.version>1.1.2</logback.version> <!-- do not upgrade - see http://jira.qos.ch/browse/LOGBACK-851 -->
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -312,15 +312,15 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -255,7 +255,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -263,7 +263,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -272,18 +272,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -279,11 +279,11 @@
|
|||||||
<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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- http -->
|
<!-- http -->
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -294,7 +294,7 @@
|
|||||||
<jackson.version>2.4.2</jackson.version>
|
<jackson.version>2.4.2</jackson.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -303,15 +303,15 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -26,12 +26,12 @@
|
|||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
<name>org.hibernate.eclipse.console.hibernateBuilder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
<buildCommand>
|
<buildCommand>
|
||||||
<name>org.hibernate.eclipse.console.hibernateBuilder</name>
|
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||||
<arguments>
|
<arguments>
|
||||||
</arguments>
|
</arguments>
|
||||||
</buildCommand>
|
</buildCommand>
|
||||||
|
@ -379,7 +379,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
<spring-data-jpa.version>1.6.2.RELEASE</spring-data-jpa.version>
|
||||||
|
|
||||||
@ -392,7 +392,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -401,18 +401,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
@ -242,7 +242,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.6.Final</hibernate.version>
|
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||||
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
|
||||||
|
|
||||||
<!-- logging -->
|
<!-- logging -->
|
||||||
@ -250,7 +250,7 @@
|
|||||||
<logback.version>1.1.2</logback.version>
|
<logback.version>1.1.2</logback.version>
|
||||||
|
|
||||||
<!-- various -->
|
<!-- various -->
|
||||||
<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
|
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>18.0</guava.version>
|
<guava.version>18.0</guava.version>
|
||||||
@ -259,18 +259,18 @@
|
|||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
<junit.version>4.11</junit.version>
|
<junit.version>4.11</junit.version>
|
||||||
<mockito.version>1.9.5</mockito.version>
|
<mockito.version>1.10.8</mockito.version>
|
||||||
|
|
||||||
<httpcore.version>4.3.2</httpcore.version>
|
<httpcore.version>4.3.3</httpcore.version>
|
||||||
<httpclient.version>4.3.5</httpclient.version>
|
<httpclient.version>4.3.5</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.3</rest-assured.version>
|
<rest-assured.version>2.3.4</rest-assured.version>
|
||||||
|
|
||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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.17</maven-surefire-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.9</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user