diff --git a/core-java/src/main/java/com/baeldung/optional/Modem.java b/core-java/src/main/java/com/baeldung/optional/Modem.java new file mode 100644 index 0000000000..c37739819c --- /dev/null +++ b/core-java/src/main/java/com/baeldung/optional/Modem.java @@ -0,0 +1,13 @@ +package com.baeldung.optional; + +public class Modem { + private Double price; + + public Modem(Double price) { + this.price = price; + } + + public Double getPrice() { + return price; + } +} diff --git a/core-java/src/main/java/com/baeldung/java_8_features/Person.java b/core-java/src/main/java/com/baeldung/optional/Person.java similarity index 95% rename from core-java/src/main/java/com/baeldung/java_8_features/Person.java rename to core-java/src/main/java/com/baeldung/optional/Person.java index 82b6819699..47473c29ea 100644 --- a/core-java/src/main/java/com/baeldung/java_8_features/Person.java +++ b/core-java/src/main/java/com/baeldung/optional/Person.java @@ -1,4 +1,4 @@ -package com.baeldung.java_8_features; +package com.baeldung.optional; import java.util.Optional; diff --git a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java index 93cb3e1eb6..9e20a7144f 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java @@ -33,4 +33,4 @@ public class AsyncEchoTest { client.stop(); } -} +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java index 1038043d49..c0538931b0 100644 --- a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java +++ b/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java @@ -1,17 +1,15 @@ package com.baeldung.java8.optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.baeldung.optional.Modem; +import com.baeldung.optional.Person; +import org.junit.Test; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; import java.util.Optional; -import org.junit.Test; - -import com.baeldung.java_8_features.Person; +import static org.junit.Assert.*; public class OptionalTest { // creating Optional @@ -95,7 +93,40 @@ public class OptionalTest { boolean is2017 = yearOptional.filter(y -> y == 2017).isPresent(); assertFalse(is2017); } + @Test + public void whenFiltersWithoutOptional_thenCorrect() { + assertTrue(priceIsInRange1(new Modem(10.0))); + assertFalse(priceIsInRange1(new Modem(9.9))); + assertFalse(priceIsInRange1(new Modem(null))); + assertFalse(priceIsInRange1(new Modem(15.5))); + assertFalse(priceIsInRange1(null)); + } + + @Test + public void whenFiltersWithOptional_thenCorrect() { + assertTrue(priceIsInRange2(new Modem(10.0))); + assertFalse(priceIsInRange2(new Modem(9.9))); + assertFalse(priceIsInRange2(new Modem(null))); + assertFalse(priceIsInRange2(new Modem(15.5))); + assertFalse(priceIsInRange1(null)); + } + + public boolean priceIsInRange1(Modem modem) { + boolean isInRange = false; + if (modem != null && modem.getPrice() != null && (modem.getPrice() >= 10 && modem.getPrice() <= 15)) { + isInRange = true; + } + return isInRange; + } + + public boolean priceIsInRange2(Modem modem2) { + return Optional.ofNullable(modem2) + .map(Modem::getPrice) + .filter(p -> p >= 10) + .filter(p -> p <= 15) + .isPresent(); + } // Transforming Value With map() @Test public void givenOptional_whenMapWorks_thenCorrect() { @@ -203,4 +234,4 @@ public class OptionalTest { System.out.println("Getting default value..."); return "Default Value"; } -} +} \ No newline at end of file diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index a2555259b0..5d29b55a19 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -1,131 +1,123 @@ - 4.0.0 - com.baeldung - spring-boot - 0.0.1-SNAPSHOT - war - Spring Boot Actuator - This is simple boot application for Spring boot actuator test + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-boot + 0.0.1-SNAPSHOT + war + Spring Boot Actuator + This is simple boot application for Spring boot actuator test - - - org.springframework.boot - spring-boot-starter-parent - 1.4.0.RC1 - - + + + org.springframework.boot + spring-boot-starter-parent + 1.4.2.RELEASE + + - - - org.baeldung.boot.DemoApplication - UTF-8 - 1.8 - 4.3.1.RELEASE - + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - + + org.springframework.boot + spring-boot-starter-data-jpa + - - org.springframework.boot - spring-boot-starter-data-jpa - + + org.springframework.boot + spring-boot-starter-actuator + - - org.springframework.boot - spring-boot-starter-actuator - + + org.springframework.boot + spring-boot-starter-security + - - org.springframework.boot - spring-boot-starter-security - + + io.dropwizard.metrics + metrics-core + - - io.dropwizard.metrics - metrics-core - + + com.h2database + h2 + - - com.h2database - h2 - + + org.springframework.boot + spring-boot-starter-test + test + - - org.springframework.boot - spring-boot-starter-test - test - + + org.springframework.boot + spring-boot-starter + + + com.jayway.jsonpath + json-path + test + + + org.springframework.boot + spring-boot-starter-mail + + + org.subethamail + subethasmtp + 3.1.7 + test + - - org.springframework.boot - spring-boot-starter - - - com.jayway.jsonpath - json-path - test - - - org.springframework.boot - spring-boot-starter-mail - - - org.subethamail - subethasmtp - 3.1.7 - test - - - - org.webjars - bootstrap - 3.3.7-1 - - - org.webjars - jquery - 3.1.1 - - + + org.webjars + bootstrap + 3.3.7-1 + + + org.webjars + jquery + 3.1.1 + + - - spring-boot - - - src/main/resources - true - - + + spring-boot + + + src/main/resources + true + + - + - - org.springframework.boot - spring-boot-maven-plugin - + + org.springframework.boot + spring-boot-maven-plugin + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-war-plugin - + + org.apache.maven.plugins + maven-war-plugin + pl.project13.maven @@ -143,10 +135,10 @@ - + - + @@ -182,42 +174,14 @@ - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - + + + + + org.baeldung.boot.DemoApplication + UTF-8 + 1.8 + 4.3.4.RELEASE + diff --git a/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-data-flow/batch-job/pom.xml index 99e57d4c20..3d05732027 100644 --- a/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-data-flow/batch-job/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,13 +22,14 @@ UTF-8 UTF-8 1.8 + 1.0.3.RELEASE org.springframework.cloud spring-cloud-task-starter - 1.0.1.RELEASE + ${spring-cloud-task-starter.version} diff --git a/spring-cloud-data-flow/data-flow-server/pom.xml b/spring-cloud-data-flow/data-flow-server/pom.xml index 451a58e12a..689d09ead9 100644 --- a/spring-cloud-data-flow/data-flow-server/pom.xml +++ b/spring-cloud-data-flow/data-flow-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,6 +22,8 @@ UTF-8 UTF-8 1.8 + 1.1.0.RELEASE + Brixton.SR7 @@ -42,14 +44,14 @@ org.springframework.cloud spring-cloud-dataflow-dependencies - 1.0.0.BUILD-SNAPSHOT + ${spring-cloud-dataflow-dependencies.version} pom import org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + ${spring-cloud-dependencies.version} pom import diff --git a/spring-cloud-data-flow/data-flow-shell/pom.xml b/spring-cloud-data-flow/data-flow-shell/pom.xml index 31d3dce507..2b825aa363 100644 --- a/spring-cloud-data-flow/data-flow-shell/pom.xml +++ b/spring-cloud-data-flow/data-flow-shell/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,6 +22,8 @@ UTF-8 UTF-8 1.8 + 1.1.0.RELEASE + Brixton.SR7 @@ -42,14 +44,14 @@ org.springframework.cloud spring-cloud-dataflow-dependencies - 1.0.0.BUILD-SNAPSHOT + ${spring-cloud-dataflow-dependencies.version} pom import org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + ${spring-cloud-dependencies.version} pom import diff --git a/spring-cloud-data-flow/log-sink/pom.xml b/spring-cloud-data-flow/log-sink/pom.xml index db488c05ef..6443ed88c8 100644 --- a/spring-cloud-data-flow/log-sink/pom.xml +++ b/spring-cloud-data-flow/log-sink/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Brixton.SR7 @@ -42,7 +43,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + ${spring-cloud-dependencies.version} pom import diff --git a/spring-cloud-data-flow/time-processor/pom.xml b/spring-cloud-data-flow/time-processor/pom.xml index 8277c9c836..d7553b110f 100644 --- a/spring-cloud-data-flow/time-processor/pom.xml +++ b/spring-cloud-data-flow/time-processor/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Brixton.SR7 @@ -42,7 +43,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + ${spring-cloud-dependencies.version} pom import diff --git a/spring-cloud-data-flow/time-source/pom.xml b/spring-cloud-data-flow/time-source/pom.xml index 086d761f78..2523dfabea 100644 --- a/spring-cloud-data-flow/time-source/pom.xml +++ b/spring-cloud-data-flow/time-source/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Brixton.SR7 @@ -42,7 +43,7 @@ org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + ${spring-cloud-dependencies.version} pom import diff --git a/spring-core/pom.xml b/spring-core/pom.xml index bf8c8f3ebc..cca6e7f08f 100644 --- a/spring-core/pom.xml +++ b/spring-core/pom.xml @@ -14,43 +14,43 @@ org.mockito mockito-all - 1.10.19 + ${mockito.version} org.springframework spring-test - 4.2.6.RELEASE + ${spring.version} org.springframework spring-core - 4.2.6.RELEASE + ${spring.version} org.springframework spring-beans - 4.2.6.RELEASE + ${spring.version} org.springframework spring-context - 4.2.6.RELEASE + ${spring.version} javax.inject javax.inject - 1 + ${javax.inject.version} junit junit - 4.12 + ${junit.version} test com.google.guava guava - 20.0 + ${guava.version} @@ -124,6 +124,11 @@ + 1.10.19 + 4.3.4.RELEASE + 1 + 4.12 + 20.0 2.6 diff --git a/spring-cucumber/pom.xml b/spring-cucumber/pom.xml index b493962a75..644ddff1d8 100644 --- a/spring-cucumber/pom.xml +++ b/spring-cucumber/pom.xml @@ -14,14 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 1.4.2.RELEASE UTF-8 1.8 - 1.2.4 + 1.2.5 + 1.3.2 @@ -68,14 +69,11 @@ org.apache.commons commons-io - 1.3.2 + ${commons-io.version} - - - @@ -130,6 +128,5 @@ - diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 5c1a42b8bd..ef664fef79 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -11,19 +11,20 @@ UTF-8 - - 4.2.5.RELEASE - + + 4.3.4.RELEASE 1.3.2.RELEASE - - 4.11 - 1.7.12 - 1.1.3 + + 4.12 + 1.7.21 + 1.1.7 2.1.5 2.1.9.2 - 2.1.9.2 + 2.1.9.2 2.0-0 - 2.19.1 + 19.0 + 3.6.0 + 2.19.1 @@ -39,7 +40,7 @@ junit - junit-dep + junit ${junit.version} test @@ -64,7 +65,7 @@ org.cassandraunit cassandra-unit-shaded - ${cassandra-unit-shaded} + ${cassandra-unit-shaded.version} test @@ -103,58 +104,58 @@ maven-compiler-plugin - 2.3.2 + ${maven-compiler-plugin.version} - 1.7 - 1.7 + 1.8 + 1.8 - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + diff --git a/spring-data-couchbase-2/pom.xml b/spring-data-couchbase-2/pom.xml index 6716f82246..9284234638 100644 --- a/spring-data-couchbase-2/pom.xml +++ b/spring-data-couchbase-2/pom.xml @@ -1,13 +1,14 @@ - + 4.0.0 org.baeldung spring-data-couchbase-2 0.1-SNAPSHOT spring-data-couchbase-2 jar - + - + org.springframework @@ -20,9 +21,9 @@ ${spring-framework.version} - org.springframework.data - spring-data-couchbase - ${spring-data-couchbase.version} + org.springframework.data + spring-data-couchbase + ${spring-data-couchbase.version} @@ -45,21 +46,21 @@ ${org.slf4j.version} compile - - ch.qos.logback - logback-classic - ${logback.version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + ch.qos.logback + logback-classic + ${logback.version} + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + @@ -74,43 +75,44 @@ ${junit.version} test - + maven-compiler-plugin - 2.3.2 + ${maven-compiler-plugin.version} - 1.7 - 1.7 + 1.8 + 1.8 - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*IntegrationTest.java + **/*LiveTest.java + + + - 1.7 + 1.8 UTF-8 - 4.2.4.RELEASE - 2.1.1.RELEASE - 5.2.4.Final - 2.9.2 - 1.1.3 - 1.7.12 - 4.11 - 2.19.1 + 4.3.4.RELEASE + 2.1.5.RELEASE + 5.3.3.Final + 2.9.6 + 1.1.7 + 1.7.21 + 4.12 + 3.6.0 + 2.19.1 - + diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml index 11e1366f3e..0ce9b3a399 100644 --- a/spring-data-dynamodb/pom.xml +++ b/spring-data-dynamodb/pom.xml @@ -11,7 +11,7 @@ spring-boot-starter-parent org.springframework.boot - 1.2.3.RELEASE + 1.4.2.RELEASE @@ -20,7 +20,11 @@ com.baeldung.Application UTF-8 1.8 - 4.3.1.RELEASE + 4.3.4.RELEASE + 4.5.2 + 4.4.1 + 1.11.64 + 3.3.7-1 @@ -83,23 +87,23 @@ org.webjars bootstrap - 3.3.4 + ${bootstrap.version} com.amazonaws aws-java-sdk-dynamodb - 1.11.34 + ${aws-java-sdk-dynamodb.version} com.github.derjust spring-data-dynamodb - 4.3.1 + ${spring-data-dynamodb.version} org.apache.httpcomponents httpclient - 4.5.2 + ${httpclient.version} diff --git a/spring-data-elasticsearch/pom.xml b/spring-data-elasticsearch/pom.xml index dcb702ab16..b38a6a10bc 100644 --- a/spring-data-elasticsearch/pom.xml +++ b/spring-data-elasticsearch/pom.xml @@ -14,12 +14,14 @@ 1.8 1.8 - 4.2.5.RELEASE - - 4.11 - 1.7.12 - 1.1.3 - 2.0.1.RELEASE + 4.3.4.RELEASE + 2.0.5.RELEASE + 4.12 + 1.7.21 + 1.1.7 + 4.2.2 + 2.4.2 + 1.2.21 2.19.1 @@ -32,12 +34,12 @@ org.springframework.data spring-data-elasticsearch - ${elasticsearch.version} + ${spring-data-elasticsearch.version} junit - junit-dep + junit ${junit.version} test @@ -50,7 +52,7 @@ net.java.dev.jna jna - 4.1.0 + ${jna.version} test @@ -78,12 +80,12 @@ org.elasticsearch elasticsearch - 2.3.5 + ${elasticsearch.version} com.alibaba fastjson - 1.2.13 + ${fastjson.version} diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index fd212548d0..7d7c9cd590 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -23,7 +23,7 @@ junit - junit-dep + junit ${junit.version} test @@ -106,7 +106,7 @@ maven-compiler-plugin - 2.3.2 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -164,18 +164,19 @@ UTF-8 - 4.2.5.RELEASE + 4.3.4.RELEASE - 1.7.1.RELEASE + 1.8.6.RELEASE 1.3 - 4.11 + 4.12 2.9.0 - 3.6.6 + 3.7.4 1.1.3 - 1.7.12 - 1.1.3 + 1.7.21 + 1.1.7 + 3.6.0 2.19.1 diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 653dd6b2f6..a151d129a7 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -11,8 +11,13 @@ 1.8 UTF-8 UTF-8 - 3.0.1 - 4.1.1.RELEASE + 3.0.7 + 4.1.5.RELEASE + 1.1 + 1.4.2.RELEASE + 4.3.4.RELEASE + 2.0.5 + 4.12 2.19.1 @@ -26,14 +31,14 @@ com.voodoodyne.jackson.jsog jackson-jsog - 1.1 + ${jackson-jsog.version} compile org.springframework.boot spring-boot-starter-test - 1.3.6.RELEASE + ${spring-boot.version} test @@ -61,7 +66,7 @@ org.neo4j neo4j-ogm-test - 2.0.2 + ${neo4j-ogm-test.version} test @@ -74,12 +79,12 @@ junit junit - 4.12 + ${junit.version} org.springframework spring-test - 4.2.3.RELEASE + ${spring-test.version} diff --git a/spring-data-redis/pom.xml b/spring-data-redis/pom.xml index 6f1fc9294d..9700dd7091 100644 --- a/spring-data-redis/pom.xml +++ b/spring-data-redis/pom.xml @@ -9,9 +9,13 @@ UTF-8 - 4.2.5.RELEASE - 1.6.2.RELEASE - 0.8.0 + 4.3.4.RELEASE + 1.7.5.RELEASE + 3.2.4 + 2.9.0 + 1.2.17 + 4.12 + 0.10.0 2.19.1 @@ -25,19 +29,19 @@ cglib cglib-nodep - 2.2 + ${cglib.version} log4j log4j - 1.2.16 + ${log4j.version} redis.clients jedis - 2.5.1 + ${jedis.version} jar @@ -56,7 +60,7 @@ junit junit - 4.12 + ${junit.version} test diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml index 5ae694a04f..da5d844211 100644 --- a/spring-data-rest/pom.xml +++ b/spring-data-rest/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.3.RELEASE + 1.4.2.RELEASE diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml index ec6eb7bf46..e43b3ff774 100644 --- a/spring-data-solr/pom.xml +++ b/spring-data-solr/pom.xml @@ -11,9 +11,11 @@ UTF-8 - 4.2.5.RELEASE + 4.3.4.RELEASE 2.19.1 - 2.0.4.RELEASE + 2.0.5.RELEASE + 1.2.17 + 4.12 @@ -25,7 +27,7 @@ org.springframework.data spring-data-solr - ${spring-data-solr} + ${spring-data-solr.version} org.springframework @@ -35,12 +37,12 @@ log4j log4j - 1.2.16 + ${log4j.version} junit junit - 4.12 + ${junit.version} test diff --git a/spring-dispatcher-servlet/pom.xml b/spring-dispatcher-servlet/pom.xml index 646db663db..13ad062195 100644 --- a/spring-dispatcher-servlet/pom.xml +++ b/spring-dispatcher-servlet/pom.xml @@ -18,33 +18,33 @@ javax.servlet javax.servlet-api - 3.1.0 + ${javax.servlet.version} provided org.springframework spring-webmvc - 4.3.3.RELEASE + ${org.springframework.version} org.thymeleaf thymeleaf-spring4 - 3.0.2.RELEASE + ${thymeleaf.version} org.slf4j slf4j-api - 1.7.21 + ${org.slf4j.version} org.apache.logging.log4j log4j-core - 2.7 + ${log4j.version} org.apache.logging.log4j log4j-slf4j-impl - 2.7 + ${log4j.version} @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-war-plugin - 3.0.0 + ${maven-war-plugin.version} false @@ -70,7 +70,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.3.12.v20160915 + ${jetty-maven-plugin.version} / @@ -79,4 +79,22 @@ + + + + 4.3.4.RELEASE + 3.0.2.RELEASE + + + 1.7.21 + 2.7 + + + 3.1.0 + + + 3.6.0 + 3.0.0 + 9.3.14.v20161028 + diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 6994a518fe..a8254151aa 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -69,7 +69,7 @@ javax.servlet javax.servlet-api - 3.0.1 + ${javax.servlet-api.version} provided @@ -133,28 +133,28 @@ javax.el el-api - 2.2 + ${javax.el.version} org.apache.derby derby - 10.12.1.1 + ${derby.version} org.apache.derby derbyclient - 10.12.1.1 + ${derby.version} org.apache.derby derbynet - 10.12.1.1 + ${derby.version} org.apache.derby derbytools - 10.12.1.1 + ${derby.version} @@ -208,44 +208,46 @@ - 4.3.2.RELEASE - 4.1.1.RELEASE - 3.20.0-GA + 4.3.4.RELEASE + 4.2.0.RELEASE + 3.21.0-GA 1.2 - 4.3.11.Final - 5.1.38 - 7.0.42 + 5.2.5.Final + 5.1.40 + 7.0.73 + 10.13.1.1 - 1.7.13 - 1.1.3 + 1.7.21 + 1.1.7 - 5.2.2.Final + 5.3.3.Final + 3.1.0 + 2.2 19.0 - 3.4 + 3.5 1.3 4.12 1.10.19 - 4.4.1 - 4.5 + 4.4.5 + 4.5.2 2.9.0 - 1.8.9 - 3.5.1 + 3.6.0 2.6 2.19.1 2.7 - 1.4.18 + 1.6.1 diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java index 760d082f54..ea90b3d6cc 100644 --- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java +++ b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java @@ -7,9 +7,9 @@ import java.util.Properties; import org.baeldung.ex.mappingexception.cause4.persistence.model.Foo; import org.hibernate.Session; import org.hibernate.SessionFactory; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.ServiceRegistryBuilder; import org.junit.Test; public class Cause4MappingExceptionManualTest { @@ -35,7 +35,7 @@ public class Cause4MappingExceptionManualTest { configuration.addAnnotatedClass(Foo.class); - final ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings(configuration.getProperties()).build(); + final ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build(); final SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry); return sessionFactory; } diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml index 51df4e6647..7e61a3f081 100644 --- a/spring-freemarker/pom.xml +++ b/spring-freemarker/pom.xml @@ -9,12 +9,13 @@ 1.8 - 4.2.4.RELEASE + 4.3.4.RELEASE 2.3.23 - 1.1.3 - 1.7.12 + 1.1.7 + 1.7.21 3.1.0 false + 3.6.0 @@ -73,7 +74,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + ${maven-compiler-plugin.version} ${jdk.version} ${jdk.version} diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 9f99d83a42..f7b198a2b1 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -181,42 +181,42 @@ - 4.2.5.RELEASE - 4.0.4.RELEASE - 3.20.0-GA + 4.3.4.RELEASE + 4.2.0.RELEASE + 3.21.0-GA 3.6.10.Final - 5.1.38 - 7.0.47 - 1.4.191 + 5.1.40 + 7.0.73 + 1.4.193 - 1.7.13 - 1.1.3 + 1.7.21 + 1.1.7 - 5.2.2.Final + 5.3.3.Final 19.0 - 3.4 + 3.5 1.3 4.12 1.10.19 - 4.4.1 - 4.5 + 4.4.5 + 4.5.2 2.9.0 - 3.5.1 + 3.6.0 2.19.1 2.7 - 1.4.18 + 1.6.1 diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index d4dabcc274..ead46fa02a 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -53,11 +53,6 @@ jta ${jta.version} - - javax.el - javax.el-api - ${el-api.version} - mysql mysql-connector-java @@ -80,7 +75,7 @@ javax.el javax.el-api - 2.2.5 + ${javax.el-api.version} @@ -152,7 +147,7 @@ org.hsqldb hsqldb - 2.3.4 + ${hsqldb.version} test @@ -199,29 +194,29 @@ - 4.2.5.RELEASE - 4.0.4.RELEASE - 1.9.2.RELEASE - 3.20.0-GA + 4.3.4.RELEASE + 4.2.0.RELEASE + 1.10.5.RELEASE 4.3.11.Final ${hibernate.version} - 5.1.38 - 8.0.30 + 5.1.40 + 8.5.8 1.1 - 2.2.4 + 2.3.4 - 1.7.13 - 1.1.3 + 1.7.21 + 1.1.7 - 5.2.2.Final + 5.3.3.Final + 2.2.5 19.0 - 3.4 + 3.5 1.3 @@ -234,10 +229,10 @@ 2.9.0 - 3.5.1 + 3.6.0 2.19.1 2.7 - 1.4.18 + 1.6.1 diff --git a/spring-hibernate4/src/main/resources/webSecurityConfig.xml b/spring-hibernate4/src/main/resources/webSecurityConfig.xml index d9423d31e7..e5c19a4ad7 100644 --- a/spring-hibernate4/src/main/resources/webSecurityConfig.xml +++ b/spring-hibernate4/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml index b33f8bd740..6083afcf76 100644 --- a/spring-integration/pom.xml +++ b/spring-integration/pom.xml @@ -16,9 +16,16 @@ UTF-8 - 2.2.4.RELEASE + 4.3.5.RELEASE + 1.1.4.RELEASE + 1.4.7 + 1.1.1 1.2.17 - 4.11 + 4.12 + + 2.10 + 3.6.0 + 1.5.0 @@ -33,7 +40,7 @@ maven-eclipse-plugin - 2.9 + ${maven-eclipse-plugin.version} org.springframework.ide.eclipse.core.springnature @@ -48,10 +55,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin.version} - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true @@ -60,7 +67,7 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 + ${exec-maven-plugin.version} com.baeldung.samples.Main @@ -81,18 +88,18 @@ org.springframework.integration spring-integration-core - 4.3.4.RELEASE + ${spring.integration.version} javax.activation activation - 1.1.1 + ${javax-activation.version} true javax.mail mail - 1.4.7 + ${javax-mail.version} log4j @@ -102,32 +109,27 @@ org.springframework.integration spring-integration-twitter - 4.3.4.RELEASE + ${spring.integration.version} org.springframework.integration spring-integration-mail - 4.3.4.RELEASE + ${spring.integration.version} org.springframework.integration spring-integration-ftp - 4.3.4.RELEASE + ${spring.integration.version} org.springframework.social spring-social-core - 1.1.4.RELEASE + ${spring-social.version} org.springframework.integration spring-integration-file - 4.3.4.RELEASE - - - junit - junit - 4.12 + ${spring.integration.version} diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml index 8e83f82f38..de7c734316 100644 --- a/spring-jms/pom.xml +++ b/spring-jms/pom.xml @@ -9,9 +9,12 @@ Introduction to Spring JMS - 4.3.2.RELEASE - 5.12.0 + 4.3.4.RELEASE + 5.14.1 4.12 + + 3.6.0 + 2.6 @@ -41,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + ${maven-compiler-plugin.version} 1.8 1.8 @@ -50,7 +53,7 @@ org.apache.maven.plugins maven-war-plugin - 2.4 + ${maven-war-plugin.version} src/main/webapp spring-jms diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml index bf60acd6f6..bf0dffd68c 100644 --- a/spring-jooq/pom.xml +++ b/spring-jooq/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-dependencies - 1.3.5.RELEASE + 1.4.2.RELEASE pom import @@ -23,14 +23,12 @@ org.jooq jooq - ${org.jooq.version} com.h2database h2 - ${com.h2database.version} @@ -70,6 +68,11 @@ spring-test test + + org.springframework.boot + spring-boot-starter-test + + @@ -77,7 +80,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + ${properties-maven-plugin.version} initialize @@ -96,7 +99,7 @@ org.codehaus.mojo sql-maven-plugin - 1.5 + ${sql-maven-plugin.version} initialize @@ -179,7 +182,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle-mapping.version} @@ -244,15 +247,19 @@ - 3.7.3 - 1.4.191 - 4.2.5.RELEASE - 1.7.18 - 1.1.3 + 3.8.6 + 1.4.193 + 4.3.4.RELEASE + 1.7.21 + 1.1.7 4.12 - 3.5.1 - 2.19.1 + 3.6.0 + 2.19.1 + 1.0.0 + 1.5 + 1.0.0 + \ No newline at end of file diff --git a/spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java b/spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java index fa3f342ecd..25317309ee 100644 --- a/spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java +++ b/spring-jooq/src/test/java/com/baeldung/jooq/springboot/SpringBootIntegrationTest.java @@ -1,5 +1,10 @@ package com.baeldung.jooq.springboot; +import static com.baeldung.jooq.introduction.db.public_.tables.Author.AUTHOR; +import static com.baeldung.jooq.introduction.db.public_.tables.AuthorBook.AUTHOR_BOOK; +import static com.baeldung.jooq.introduction.db.public_.tables.Book.BOOK; +import static org.junit.Assert.assertEquals; + import org.jooq.DSLContext; import org.jooq.Record3; import org.jooq.Result; @@ -7,19 +12,14 @@ import org.jooq.impl.DSL; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataAccessException; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import static com.baeldung.jooq.introduction.db.public_.tables.Author.AUTHOR; -import static com.baeldung.jooq.introduction.db.public_.tables.AuthorBook.AUTHOR_BOOK; -import static com.baeldung.jooq.introduction.db.public_.tables.Book.BOOK; -import static org.junit.Assert.assertEquals; - -@SpringApplicationConfiguration(Application.class) +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) @Transactional("transactionManager") -@RunWith(SpringJUnit4ClassRunner.class) public class SpringBootIntegrationTest { @Autowired diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index cf0c2246af..2229d64abe 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -43,7 +43,7 @@ xml-apis xml-apis - 1.4.01 + ${xml-apis.version} org.javassist @@ -77,7 +77,7 @@ javax.el javax.el-api - 2.2.5 + ${javax.el-api.version} @@ -196,47 +196,48 @@ - 4.3.2.RELEASE - 3.20.0-GA + 4.3.4.RELEASE + 3.21.0-GA - 5.2.2.Final - 5.1.38 - 1.10.2.RELEASE - 1.4.192 + 5.2.5.Final + 5.1.40 + 1.10.5.RELEASE + 1.4.193 1.2 2.5 - 1.7.13 - 1.1.3 + 1.7.21 + 1.1.7 - 5.2.2.Final + 5.3.3.Final + 1.4.01 + 2.2.5 19.0 - 3.4 + 3.5 1.3 4.12 1.10.19 - 4.4.1 - 4.5 + 4.4.5 + 4.5.2 2.9.0 - 3.5.1 + 3.6.0 2.19.1 2.7 - 1.4.18 - 2.4 - + 1.6.1 + 2.6 diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml index e2e3ea6f97..32f24231a9 100644 --- a/spring-katharsis/pom.xml +++ b/spring-katharsis/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.3.RELEASE + 1.4.2.RELEASE @@ -61,9 +61,9 @@ 1.8 - 1.0.0 - 2.4.0 - 1.6.0 + 1.0.1 + 2.9.0 + 1.6.1 diff --git a/spring-mockito/pom.xml b/spring-mockito/pom.xml index c8e0d3b7f5..ca9bad2bc0 100644 --- a/spring-mockito/pom.xml +++ b/spring-mockito/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.3.RELEASE + 1.4.2.RELEASE @@ -30,7 +30,7 @@ org.mockito mockito-all - 1.10.19 + ${mockito.version} @@ -91,6 +91,7 @@ UTF-8 1.8 + 1.10.19 diff --git a/spring-mvc-email/pom.xml b/spring-mvc-email/pom.xml index 0d3acec1fe..a04097e027 100644 --- a/spring-mvc-email/pom.xml +++ b/spring-mvc-email/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.RELEASE + 1.4.2.RELEASE @@ -24,18 +24,15 @@ org.springframework.boot spring-boot-starter-mail - 1.4.0.RELEASE org.apache.tomcat.embed tomcat-embed-jasper - 8.5.4 javax.servlet jstl - 1.2 diff --git a/spring-mvc-forms/pom.xml b/spring-mvc-forms/pom.xml index 370fd7feb2..c0cac4d349 100644 --- a/spring-mvc-forms/pom.xml +++ b/spring-mvc-forms/pom.xml @@ -84,14 +84,14 @@ - 4.0.6.RELEASE - 2.4 + 4.3.4.RELEASE + 2.6 1.2 2.3.1 3.1.0 - 3.5.1 + 3.6.0 1.8 - 5.1.1.Final + 5.3.3.Final enter-location-of-server diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 8e2db044a6..3c1e44d13a 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -47,13 +47,13 @@ javax.servlet javax.servlet-api - 3.0.1 + ${javax.servlet-api.version} provided javax.servlet jstl - 1.2 + ${jstl.version} runtime @@ -78,7 +78,7 @@ commons-fileupload commons-fileupload - 1.3.1 + ${commons-fileupload.version} net.sourceforge.htmlunit @@ -150,7 +150,7 @@ com.jayway.jsonpath json-path - 2.2.0 + ${jsonpath.version} test @@ -184,7 +184,7 @@ maven-resources-plugin - 2.7 + ${maven-resources-plugin.version} @@ -250,42 +250,46 @@ 4.3.4.RELEASE 4.2.0.RELEASE - 2.1.4.RELEASE - 2.7.8 + 2.1.5.RELEASE + 2.8.5 - 4.3.11.Final - 5.1.38 + 5.2.5.Final + 5.1.40 1.7.21 - 1.1.5 + 1.1.7 - 5.2.2.Final + 5.3.3.Final + 3.1.0 + 1.2 19.0 - 3.4 + 3.5 + 1.3.2 + 2.2.0 1.3 4.12 1.10.19 - 4.4.1 - 4.5 + 4.4.5 + 4.5.2 2.9.0 2.23 - 3.5.1 + 3.6.0 2.6 2.19.1 2.7 - 1.4.18 + 1.6.1 - 1.8.7 + 1.8.9 diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScraping.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScraping.java index f97bedddef..327bfc4596 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScraping.java +++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScraping.java @@ -2,6 +2,11 @@ package com.baeldung.htmlunit; import java.util.List; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import com.gargoylesoftware.htmlunit.WebClient; import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlHeading1; @@ -9,34 +14,31 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; public class HtmlUnitWebScraping { - private WebClient webClient; + private WebClient webClient; - @Before - public void init() throws Exception { - webClient = new WebClient(); - } + @Before + public void init() throws Exception { + webClient = new WebClient(); + } - @After - public void close() throws Exception { - webClient.close(); - } + @After + public void close() throws Exception { + webClient.close(); + } - @Test - public void givenBaeldungArchive_whenRetrievingArticle_thenHasH1() - throws Exception { - webClient.getOptions().setCssEnabled(false); - webClient.getOptions().setJavaScriptEnabled(false); + @Test + public void givenBaeldungArchive_whenRetrievingArticle_thenHasH1() throws Exception { + webClient.getOptions().setCssEnabled(false); + webClient.getOptions().setJavaScriptEnabled(false); - String url = "http://www.baeldung.com/full_archive"; - HtmlPage page = webClient.getPage(url); - String xpath = "(//ul[@class='car-monthlisting']/li)[1]/a"; - HtmlAnchor latestPostLink - = (HtmlAnchor) page.getByXPath(xpath).get(0); - HtmlPage postPage = latestPostLink.click(); + final String url = "http://www.baeldung.com/full_archive"; + final HtmlPage page = webClient.getPage(url); + final String xpath = "(//ul[@class='car-monthlisting']/li)[1]/a"; + final HtmlAnchor latestPostLink = (HtmlAnchor) page.getByXPath(xpath).get(0); + final HtmlPage postPage = latestPostLink.click(); - List h1 - = (List) postPage.getByXPath("//h1"); + final List h1 = (List) postPage.getByXPath("//h1"); - Assert.assertTrue(h1.size() > 0); - } + Assert.assertTrue(h1.size() > 0); + } } diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java index db984eadfb..ca8c37175e 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerIntegrationTest.java @@ -32,7 +32,7 @@ public class GreetControllerIntegrationTest { private MockMvc mockMvc; - private static final String CONTENT_TYPE = "application/json"; + private static final String CONTENT_TYPE = "application/json;charset=UTF-8"; @Before public void setup() throws Exception { @@ -41,7 +41,7 @@ public class GreetControllerIntegrationTest { @Test public void givenWAC_whenServletContext_thenItProvidesGreetController() { - ServletContext servletContext = wac.getServletContext(); + final ServletContext servletContext = wac.getServletContext(); Assert.assertNotNull(servletContext); Assert.assertTrue(servletContext instanceof MockServletContext); Assert.assertNotNull(wac.getBean("greetController")); @@ -54,7 +54,7 @@ public class GreetControllerIntegrationTest { @Test public void givenGreetURI_whenMockMVC_thenVerifyResponse() throws Exception { - MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn(); + final MvcResult mvcResult = this.mockMvc.perform(MockMvcRequestBuilders.get("/greet")).andDo(print()).andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.jsonPath("$.message").value("Hello World!!!")).andReturn(); Assert.assertEquals(CONTENT_TYPE, mvcResult.getResponse().getContentType()); } diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerUnitTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerUnitTest.java index eacd256438..0475bd933d 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerUnitTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/web/controller/GreetControllerUnitTest.java @@ -16,7 +16,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; public class GreetControllerUnitTest { private MockMvc mockMvc; - private static final String CONTENT_TYPE = "application/json"; + private static final String CONTENT_TYPE = "application/json;charset=UTF-8"; @Before public void setup() { diff --git a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml index b9e15c7bae..febac349b0 100644 --- a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml +++ b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@