From 8d511164a80f21c85e3bba7b3467d93973900dc0 Mon Sep 17 00:00:00 2001 From: eugenp Date: Fri, 27 Mar 2015 10:47:39 +0200 Subject: [PATCH] small maven upgrades --- spring-all/pom.xml | 4 ++-- spring-exceptions/pom.xml | 4 ++-- spring-hibernate3/pom.xml | 4 ++-- spring-hibernate4/pom.xml | 4 ++-- spring-jpa/pom.xml | 4 ++-- spring-mvc-java/pom.xml | 4 ++-- spring-mvc-no-xml/pom.xml | 2 +- spring-mvc-xml/pom.xml | 2 +- spring-rest/pom.xml | 4 ++-- spring-security-basic-auth/pom.xml | 4 ++-- spring-security-login-and-registration/pom.xml | 2 +- spring-security-mvc-custom/pom.xml | 4 ++-- spring-security-mvc-digest-auth/pom.xml | 4 ++-- .../org/baeldung/metric/MetricService.java | 18 ++++++++++-------- spring-security-mvc-login/pom.xml | 4 ++-- spring-security-mvc-session/pom.xml | 4 ++-- spring-security-oauth/pom.xml | 4 ++-- spring-security-rest-basic-auth/pom.xml | 4 ++-- spring-security-rest-custom/pom.xml | 4 ++-- spring-security-rest-digest-auth/pom.xml | 4 ++-- .../.settings/org.eclipse.wst.common.component | 2 -- spring-security-rest-full/pom.xml | 4 ++-- spring-security-rest/pom.xml | 4 ++-- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 8e3185d991..387e312a36 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -195,8 +195,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 3.18.1-GA 1.2 diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 68ff77042b..27035996cd 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -204,8 +204,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 3.18.1-GA 1.2 diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index ffd6aee698..640d935ce8 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -163,8 +163,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 3.18.1-GA diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index c561dd8160..564ba15e02 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -170,8 +170,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 3.19.0-GA diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index d95905190b..be82b8d42d 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -176,8 +176,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index d61c6649c1..0d0482ea5a 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -141,8 +141,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index 381c21afd2..684f0f9f78 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -145,7 +145,7 @@ - 4.1.5.RELEASE + 4.1.6.RELEASE 1.7.9 diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 3026ea0302..5db020a5dc 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -147,7 +147,7 @@ - 4.1.5.RELEASE + 4.1.6.RELEASE 1.7.9 diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index e729d67fe8..a3ca9bd6f3 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -207,8 +207,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index f977d9e010..8bc6d54284 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -226,8 +226,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-login-and-registration/pom.xml b/spring-security-login-and-registration/pom.xml index 124f307dd3..c01a24b8de 100644 --- a/spring-security-login-and-registration/pom.xml +++ b/spring-security-login-and-registration/pom.xml @@ -170,7 +170,7 @@ 1.7 3.1.4.RELEASE - 3.2.5.RELEASE + 3.2.7.RELEASE 1.7.7 diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 4e7d25095d..de08328ecf 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -231,8 +231,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 893a1f6b18..3fe95e9200 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -226,8 +226,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-mvc-ldap/src/main/java/org/baeldung/metric/MetricService.java b/spring-security-mvc-ldap/src/main/java/org/baeldung/metric/MetricService.java index 73c9f538e7..6767f1b540 100644 --- a/spring-security-mvc-ldap/src/main/java/org/baeldung/metric/MetricService.java +++ b/spring-security-mvc-ldap/src/main/java/org/baeldung/metric/MetricService.java @@ -21,8 +21,8 @@ public class MetricService implements IMetricService { @Autowired private CounterService counter; - private List> statusMetric; - private List statusList; + private final List> statusMetric; + private final List statusList; private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); public MetricService() { @@ -33,6 +33,7 @@ public class MetricService implements IMetricService { // API + @Override public void increaseCount(final int status) { counter.increment("status." + status); if (!statusList.contains("counter.status." + status)) { @@ -40,11 +41,12 @@ public class MetricService implements IMetricService { } } + @Override public Object[][] getGraphData() { - Date current = new Date(); - int colCount = statusList.size() + 1; - int rowCount = statusMetric.size() + 1; - Object[][] result = new Object[rowCount][colCount]; + final Date current = new Date(); + final int colCount = statusList.size() + 1; + final int rowCount = statusMetric.size() + 1; + final Object[][] result = new Object[rowCount][colCount]; result[0][0] = "Time"; int j = 1; @@ -73,8 +75,8 @@ public class MetricService implements IMetricService { @Scheduled(fixedDelay = 60000) private void exportMetrics() { Metric metric; - ArrayList statusCount = new ArrayList(); - for (String status : statusList) { + final ArrayList statusCount = new ArrayList(); + for (final String status : statusList) { metric = repo.findOne(status); if (metric != null) { statusCount.add(metric.getValue().intValue()); diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index a66a5f4542..c89886ce7a 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -223,8 +223,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index b4386bd292..d1e90f1e9f 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -231,8 +231,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-oauth/pom.xml b/spring-security-oauth/pom.xml index 01ab77afc0..3172113b8f 100644 --- a/spring-security-oauth/pom.xml +++ b/spring-security-oauth/pom.xml @@ -386,8 +386,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index 9dace2acd5..78601de6a8 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -287,8 +287,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index f6d3c78e80..36853edd56 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -251,8 +251,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 2ed93fb1ec..3d3b9bfd47 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -275,8 +275,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-rest-full/.settings/org.eclipse.wst.common.component b/spring-security-rest-full/.settings/org.eclipse.wst.common.component index 7ad7c118a0..3b942952f2 100644 --- a/spring-security-rest-full/.settings/org.eclipse.wst.common.component +++ b/spring-security-rest-full/.settings/org.eclipse.wst.common.component @@ -5,8 +5,6 @@ - - diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 1df595da4d..1751ca06c4 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -414,8 +414,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 5b62dd2477..2b35f94eae 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -238,8 +238,8 @@ - 4.1.5.RELEASE - 3.2.5.RELEASE + 4.1.6.RELEASE + 3.2.7.RELEASE 4.3.8.Final