iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small maven upgrades

Browse Source
This commit is contained in:
eugenp 2015-03-27 10:47:39 +02:00
parent 8732875d4d
commit 8d511164a8
23 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-all/pom.xml
View File

@ -195,8 +195,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<javassist.version>3.18.1-GA</javassist.version> <javassist.version>3.18.1-GA</javassist.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>

4
spring-exceptions/pom.xml
View File

@ -204,8 +204,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<javassist.version>3.18.1-GA</javassist.version> <javassist.version>3.18.1-GA</javassist.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>

4
spring-hibernate3/pom.xml
View File

@ -163,8 +163,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<javassist.version>3.18.1-GA</javassist.version> <javassist.version>3.18.1-GA</javassist.version>
<!-- persistence --> <!-- persistence -->

4
spring-hibernate4/pom.xml
View File

@ -170,8 +170,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<javassist.version>3.19.0-GA</javassist.version> <javassist.version>3.19.0-GA</javassist.version>
<!-- persistence --> <!-- persistence -->

4
spring-jpa/pom.xml
View File

@ -176,8 +176,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-mvc-java/pom.xml
View File

@ -141,8 +141,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

2
spring-mvc-no-xml/pom.xml
View File

@ -145,7 +145,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.9</org.slf4j.version> <org.slf4j.version>1.7.9</org.slf4j.version>

2
spring-mvc-xml/pom.xml
View File

@ -147,7 +147,7 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.RELEASE</org.springframework.version>
<!-- logging --> <!-- logging -->
<org.slf4j.version>1.7.9</org.slf4j.version> <org.slf4j.version>1.7.9</org.slf4j.version>

4
spring-rest/pom.xml
View File

@ -207,8 +207,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-basic-auth/pom.xml
View File

@ -226,8 +226,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

2
spring-security-login-and-registration/pom.xml
View File

@ -170,7 +170,7 @@
<properties> <properties>
<java-version>1.7</java-version> <java-version>1.7</java-version>
<org.springframework-version>3.1.4.RELEASE</org.springframework-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 --> <!-- logging -->
<org.slf4j.version>1.7.7</org.slf4j.version> <org.slf4j.version>1.7.7</org.slf4j.version>

4
spring-security-mvc-custom/pom.xml
View File

@ -231,8 +231,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-mvc-digest-auth/pom.xml
View File

@ -226,8 +226,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

18
spring-security-mvc-ldap/src/main/java/org/baeldung/metric/MetricService.java
View File

@ -21,8 +21,8 @@ public class MetricService implements IMetricService {
@Autowired @Autowired
private CounterService counter; private CounterService counter;
private List<ArrayList<Integer>> statusMetric; private final List<ArrayList<Integer>> statusMetric;
private List<String> statusList; private final List<String> statusList;
private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
public MetricService() { public MetricService() {
@ -33,6 +33,7 @@ public class MetricService implements IMetricService {
// API // API
@Override
public void increaseCount(final int status) { public void increaseCount(final int status) {
counter.increment("status." + status); counter.increment("status." + status);
if (!statusList.contains("counter.status." + status)) { if (!statusList.contains("counter.status." + status)) {
@ -40,11 +41,12 @@ public class MetricService implements IMetricService {
} }
} }
@Override
public Object[][] getGraphData() { public Object[][] getGraphData() {
Date current = new Date(); final Date current = new Date();
int colCount = statusList.size() + 1; final int colCount = statusList.size() + 1;
int rowCount = statusMetric.size() + 1; final int rowCount = statusMetric.size() + 1;
Object[][] result = new Object[rowCount][colCount]; final Object[][] result = new Object[rowCount][colCount];
result[0][0] = "Time"; result[0][0] = "Time";
int j = 1; int j = 1;
@ -73,8 +75,8 @@ public class MetricService implements IMetricService {
@Scheduled(fixedDelay = 60000) @Scheduled(fixedDelay = 60000)
private void exportMetrics() { private void exportMetrics() {
Metric<?> metric; Metric<?> metric;
ArrayList<Integer> statusCount = new ArrayList<Integer>(); final ArrayList<Integer> statusCount = new ArrayList<Integer>();
for (String status : statusList) { for (final String status : statusList) {
metric = repo.findOne(status); metric = repo.findOne(status);
if (metric != null) { if (metric != null) {
statusCount.add(metric.getValue().intValue()); statusCount.add(metric.getValue().intValue());

4
spring-security-mvc-login/pom.xml
View File

@ -223,8 +223,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-mvc-session/pom.xml
View File

@ -231,8 +231,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-oauth/pom.xml
View File

@ -386,8 +386,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-rest-basic-auth/pom.xml
View File

@ -287,8 +287,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-rest-custom/pom.xml
View File

@ -251,8 +251,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-rest-digest-auth/pom.xml
View File

@ -275,8 +275,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

2
spring-security-rest-full/.settings/org.eclipse.wst.common.component
View File

@ -5,8 +5,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
<property name="context-root" value="spring-security-rest-full"/> <property name="context-root" value="spring-security-rest-full"/>
<property name="java-output-path" value="/spring-security-rest-full/target/classes"/> <property name="java-output-path" value="/spring-security-rest-full/target/classes"/>
</wb-module> </wb-module>

4
spring-security-rest-full/pom.xml
View File

@ -414,8 +414,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>

4
spring-security-rest/pom.xml
View File

@ -238,8 +238,8 @@
<properties> <properties>
<!-- Spring --> <!-- Spring -->
<org.springframework.version>4.1.5.RELEASE</org.springframework.version> <org.springframework.version>4.1.6.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>
<!-- persistence --> <!-- persistence -->
<hibernate.version>4.3.8.Final</hibernate.version> <hibernate.version>4.3.8.Final</hibernate.version>