small maven upgrades

554330833 · Mar 27, 2015 · 8d51116 · 8d51116
1 parent 8732875
commit 8d51116
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 49 deletions.
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
@@ -195,8 +195,8 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
         <javassist.version>3.18.1-GA</javassist.version>
         <jstl.version>1.2</jstl.version>
 

diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
@@ -204,8 +204,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 		<javassist.version>3.18.1-GA</javassist.version>
 		<jstl.version>1.2</jstl.version>
 

diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
@@ -163,8 +163,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 		<javassist.version>3.18.1-GA</javassist.version>
 
 		<!-- persistence -->

diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml
@@ -170,8 +170,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 		<javassist.version>3.19.0-GA</javassist.version>
 
 		<!-- persistence -->

diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
@@ -176,8 +176,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
@@ -141,8 +141,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml
@@ -145,7 +145,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.9</org.slf4j.version>

diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml
@@ -147,7 +147,7 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.9</org.slf4j.version>

diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
@@ -207,8 +207,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml
@@ -226,8 +226,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-login-and-registration/pom.xml b/spring-security-login-and-registration/pom.xml
@@ -170,7 +170,7 @@
     <properties>
         <java-version>1.7</java-version>
         <org.springframework-version>3.1.4.RELEASE</org.springframework-version>
-        <org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
         <!-- logging -->
         <org.slf4j.version>1.7.7</org.slf4j.version>

diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
@@ -231,8 +231,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
@@ -226,8 +226,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

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
@@ -21,8 +21,8 @@ public class MetricService implements IMetricService {
     @Autowired
     private CounterService counter;
 
-    private List<ArrayList<Integer>> statusMetric;
-    private List<String> statusList;
+    private final List<ArrayList<Integer>> statusMetric;
+    private final List<String> statusList;
     private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
     public MetricService() {
@@ -33,18 +33,20 @@ public MetricService() {
 
     // API
 
+    @Override
     public void increaseCount(final int status) {
         counter.increment("status." + status);
         if (!statusList.contains("counter.status." + status)) {
             statusList.add("counter.status." + status);
         }
     }
 
+    @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 Object[][] getGraphData() {
     @Scheduled(fixedDelay = 60000)
     private void exportMetrics() {
         Metric<?> metric;
-        ArrayList<Integer> statusCount = new ArrayList<Integer>();
-        for (String status : statusList) {
+        final ArrayList<Integer> statusCount = new ArrayList<Integer>();
+        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
@@ -223,8 +223,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
@@ -231,8 +231,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-oauth/pom.xml b/spring-security-oauth/pom.xml
@@ -386,8 +386,8 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
         <hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
@@ -287,8 +287,8 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+        <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
         <hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml
@@ -251,8 +251,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml
@@ -275,8 +275,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git 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 @@
         <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="/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="java-output-path" value="/spring-security-rest-full/target/classes"/>
     </wb-module>

diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
@@ -414,8 +414,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>

diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
@@ -238,8 +238,8 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
-		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
+		<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
+		<org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>4.3.8.Final</hibernate.version>