From 2b374fa8ae4c5060031f97c2c85592b03d6fabad Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Sun, 14 May 2017 18:01:35 +0200 Subject: [PATCH] cleanup pom (#1846) * upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml * remove log4j dependencies * remove commons-logging * merge * fix conflict * exclude commons-logging dependency * cleanup * minor fix * minor fix * fix dependency issues * Revert "fix dependency issues" This reverts commit 83bf1f9fd2e1a9a55f9cacb085669568b06b49ec. * fix dependency issues * minor fix * minor fix * minor fix * cleanup generated files * fix commons-logging issue * add parent to pom * cleanup parent dependencies * cleanup pom * cleanup pom --- annotations/annotation-user/pom.xml | 30 -- ejb/ejb-client/pom.xml | 33 +- hystrix/pom.xml | 59 +-- javaxval/bin/pom.xml | 73 ++-- .../jhipster-microservice/car-app/pom.xml | 11 +- .../jhipster-microservice/dealer-app/pom.xml | 16 +- .../jhipster-microservice/gateway-app/pom.xml | 12 +- jhipster/jhipster-monolithic/pom.xml | 16 +- jjwt/pom.xml | 36 +- mesos-marathon/pom.xml | 22 +- mocks/jmockit/pom.xml | 90 ++--- mocks/mock-comparisons/pom.xml | 123 +++---- parent-boot-4/pom.xml | 81 ++++ parent-boot-5/pom.xml | 83 +++++ resteasy/bin/pom.xml | 275 ++++++-------- spring-all/pom.xml | 52 +-- spring-amqp-simple/pom.xml | 34 +- spring-aop/pom.xml | 42 +-- .../greeter-spring-boot-sample-app/pom.xml | 16 +- spring-boot-custom-starter/greeter/pom.xml | 29 -- spring-boot/pom.xml | 43 +-- spring-cloud-data-flow/batch-job/pom.xml | 36 +- .../data-flow-server/pom.xml | 36 +- .../data-flow-shell/pom.xml | 38 +- spring-cloud-data-flow/log-sink/pom.xml | 37 +- spring-cloud-data-flow/time-processor/pom.xml | 37 +- spring-cloud-data-flow/time-source/pom.xml | 37 +- .../spring-cloud-bootstrap/config/pom.xml | 32 +- .../spring-cloud-bootstrap/discovery/pom.xml | 32 +- .../spring-cloud-bootstrap/gateway/pom.xml | 48 +-- .../spring-cloud-bootstrap/svc-book/pom.xml | 32 +- .../spring-cloud-bootstrap/svc-rating/pom.xml | 32 +- .../spring-cloud-bootstrap/zipkin/pom.xml | 42 +-- spring-cloud/spring-cloud-config/pom.xml | 30 +- .../spring-cloud-rest-books-api/pom.xml | 46 +-- .../spring-cloud-rest-config-server/pom.xml | 37 +- .../pom.xml | 39 +- .../spring-cloud-rest-reviews-api/pom.xml | 43 +-- .../spring-cloud-ribbon-client/pom.xml | 35 +- .../spring-cloud-zookeeper/Greeting/pom.xml | 18 +- spring-cucumber/pom.xml | 36 +- spring-custom-aop/spring-custom-aop/pom.xml | 44 +-- spring-data-dynamodb/pom.xml | 30 +- spring-data-javaslang/pom.xml | 51 +-- spring-data-rest/pom.xml | 36 +- spring-hibernate5/pom.xml | 308 ++++++++-------- spring-kafka/pom.xml | 17 +- spring-katharsis/pom.xml | 53 +-- .../org/baeldung/test/JsonApiLiveTest.java | 4 +- spring-mobile/pom.xml | 69 ++-- spring-mockito/pom.xml | 34 +- spring-mvc-email/pom.xml | 21 +- spring-mvc-web-vs-initializer/pom.xml | 47 +-- spring-protobuf/pom.xml | 44 +-- spring-quartz/pom.xml | 37 +- spring-reactor/pom.xml | 36 +- spring-remoting/pom.xml | 17 +- .../remoting-amqp-server/pom.xml | 5 - spring-rest-angular/pom.xml | 45 +-- spring-rest-docs/pom.xml | 33 +- spring-rest/pom.xml | 68 +--- .../CustomMediaTypeControllerLiveTest.java | 4 +- .../web/test/RequestMappingLiveTest.java | 2 +- spring-security-cache-control/pom.xml | 42 +-- .../ResourceEndpointIntegrationTest.java | 4 +- .../pom.xml | 21 +- .../spring-security-jsp-authorize/pom.xml | 21 +- .../spring-security-jsp-config/pom.xml | 21 +- .../spring-security-mvc/pom.xml | 21 +- .../pom.xml | 22 +- .../pom.xml | 22 +- .../spring-security-thymeleaf-config/pom.xml | 22 +- spring-security-core/pom.xml | 74 +--- spring-security-mvc-boot/pom.xml | 66 +--- .../test/java/org/baeldung/web/LiveTest.java | 8 +- spring-security-mvc-ldap/pom.xml | 21 +- spring-security-openid/pom.xml | 26 +- spring-security-rest-custom/pom.xml | 63 +--- spring-security-rest-full/pom.xml | 76 +--- .../common/web/AbstractBasicLiveTest.java | 2 +- .../web/AbstractDiscoverabilityLiveTest.java | 2 +- .../baeldung/common/web/AbstractLiveTest.java | 6 +- .../query/JPASpecificationLiveTest.java | 6 +- .../java/org/baeldung/web/MyUserLiveTest.java | 6 +- spring-security-stormpath/pom.xml | 115 +++--- spring-security-x509/pom.xml | 21 +- spring-session/pom.xml | 39 +- spring-sleuth/pom.xml | 30 +- spring-social-login/pom.xml | 40 +- spring-zuul/pom.xml | 37 +- spring-zuul/spring-zuul-ui/pom.xml | 31 -- .../test/java/org/baeldung/web/LiveTest.java | 4 +- stripe/pom.xml | 28 +- video-tutorials/jackson-annotations/pom.xml | 348 +++++++----------- xml/src/test/resources/example_new.xml | 19 +- 95 files changed, 1139 insertions(+), 3029 deletions(-) create mode 100644 parent-boot-4/pom.xml create mode 100644 parent-boot-5/pom.xml diff --git a/annotations/annotation-user/pom.xml b/annotations/annotation-user/pom.xml index 988e86c249..eb827b2ea5 100644 --- a/annotations/annotation-user/pom.xml +++ b/annotations/annotation-user/pom.xml @@ -12,11 +12,6 @@ annotation-user - - 4.12 - 3.6.0 - - @@ -25,31 +20,6 @@ ${project.parent.version} - - junit - junit - ${junit.version} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - - - \ No newline at end of file diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml index ba5763a3e7..ca8ec55f12 100755 --- a/ejb/ejb-client/pom.xml +++ b/ejb/ejb-client/pom.xml @@ -1,20 +1,17 @@ - 4.0.0 - - com.baeldung.ejb - ejb - 1.0-SNAPSHOT - - ejb-client - EJB3 Client Maven - EJB3 Client Maven + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - 4.12 - 2.19 - + + com.baeldung.ejb + ejb + 1.0-SNAPSHOT + + + ejb-client + EJB3 Client Maven + EJB3 Client Maven @@ -29,13 +26,8 @@ ejb - - junit - junit - ${junit.version} - test - + @@ -50,4 +42,5 @@ + \ No newline at end of file diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 44b4678e4f..7e9a217dba 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -8,33 +8,27 @@ hystrix - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - 1.8 - 1.5.8 0.20.7 1.3 - 4.12 - 3.6.0 2.6 - 2.19.1 2.7 1.5.8 1.5.8 - 1.4.2.RELEASE @@ -80,54 +74,13 @@ ${hamcrest-all.version} test - - junit - junit - ${junit.version} - test - org.springframework spring-test test - - org.springframework.boot - spring-boot-starter-test - ${spring-boot-starter-test.version} - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -162,7 +115,5 @@ + - - - diff --git a/javaxval/bin/pom.xml b/javaxval/bin/pom.xml index 803793c294..68e65e4d02 100644 --- a/javaxval/bin/pom.xml +++ b/javaxval/bin/pom.xml @@ -1,51 +1,44 @@ - 4.0.0 - com.baeldung - javaxval - 0.1-SNAPSHOT + 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 + javaxval + 0.1-SNAPSHOT - + + + + javax.validation + validation-api + 1.1.0.Final + + + org.hibernate + hibernate-validator + 5.2.1.Final + - - junit - junit - 4.12 - + + org.hibernate + hibernate-validator-annotation-processor + 5.2.1.Final + - - javax.validation - validation-api - 1.1.0.Final - + + javax.el + javax.el-api + 2.2.4 + - - org.hibernate - hibernate-validator - 5.2.1.Final - + + org.glassfish.web + javax.el + 2.2.4 + - - org.hibernate - hibernate-validator-annotation-processor - 5.2.1.Final - - - - javax.el - javax.el-api - 2.2.4 - - - - org.glassfish.web - javax.el - 2.2.4 - - - + \ No newline at end of file diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster/jhipster-microservice/car-app/pom.xml index bf26818f66..23da8767cb 100644 --- a/jhipster/jhipster-microservice/car-app/pom.xml +++ b/jhipster/jhipster-microservice/car-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.car.app @@ -40,12 +40,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster/jhipster-microservice/dealer-app/pom.xml index 199d383e39..359783ef81 100644 --- a/jhipster/jhipster-microservice/dealer-app/pom.xml +++ b/jhipster/jhipster-microservice/dealer-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.dealer.app @@ -40,12 +40,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 @@ -326,11 +323,6 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.security spring-security-test diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster/jhipster-microservice/gateway-app/pom.xml index dc9168d824..32aa432279 100644 --- a/jhipster/jhipster-microservice/gateway-app/pom.xml +++ b/jhipster/jhipster-microservice/gateway-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.gateway @@ -32,7 +32,6 @@ 5.2.8.Final 2.6.0 0.7.9 - 1.8 3.21.0-GA 1.0.0 1.1.0 @@ -43,12 +42,9 @@ 1.3.0 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml index 80c51734e7..eb4c2ca2d3 100644 --- a/jhipster/jhipster-monolithic/pom.xml +++ b/jhipster/jhipster-monolithic/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 com.baeldung @@ -43,12 +43,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 @@ -360,11 +357,6 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/jjwt/pom.xml b/jjwt/pom.xml index fa97038a8d..83a1131211 100644 --- a/jjwt/pom.xml +++ b/jjwt/pom.xml @@ -12,15 +12,13 @@ Exercising the JJWT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 0.7.0 @@ -40,12 +38,6 @@ spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - - io.jsonwebtoken jjwt @@ -53,25 +45,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -106,4 +79,5 @@ + diff --git a/mesos-marathon/pom.xml b/mesos-marathon/pom.xml index 6dab55528c..b0060a260e 100644 --- a/mesos-marathon/pom.xml +++ b/mesos-marathon/pom.xml @@ -8,9 +8,10 @@ 0.0.1-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -18,11 +19,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - @@ -39,16 +35,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - diff --git a/mocks/jmockit/pom.xml b/mocks/jmockit/pom.xml index 7edf994865..173a981e09 100644 --- a/mocks/jmockit/pom.xml +++ b/mocks/jmockit/pom.xml @@ -1,68 +1,38 @@ - 4.0.0 + 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 - mocks - 1.0.0-SNAPSHOT - ../pom.xml - + + com.baeldung + mocks + 1.0.0-SNAPSHOT + ../pom.xml + - jmockit - jmockit + jmockit + jmockit - - 4.12 - 1.24 + + 1.24 + - - 3.6.0 - 2.19.1 - + + + org.jmockit + jmockit + ${jmockit.version} + test + + - - - junit - junit - ${junit.version} - test - - - - org.jmockit - jmockit - ${jmockit.version} - test - - - - - jmockit - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - + + jmockit + + + src/main/resources + true + + + \ No newline at end of file diff --git a/mocks/mock-comparisons/pom.xml b/mocks/mock-comparisons/pom.xml index e4e3fbfffc..2ab35651f1 100644 --- a/mocks/mock-comparisons/pom.xml +++ b/mocks/mock-comparisons/pom.xml @@ -1,91 +1,58 @@ - 4.0.0 + 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 - mocks - 1.0.0-SNAPSHOT - ../pom.xml - + + com.baeldung + mocks + 1.0.0-SNAPSHOT + ../pom.xml + - mock-comparisons - mock-comparisons + mock-comparisons + mock-comparisons - - 4.12 - 1.10.19 - 3.4 - 1.29 + + 1.10.19 + 3.4 + 1.29 - UTF-8 + UTF-8 + - - 3.6.0 - 2.19.1 - + - - - junit - junit - ${junit.version} - test - + + org.mockito + mockito-core + ${mockito.version} + test + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.easymock + easymock + ${easymock.version} + test + - - org.easymock - easymock - ${easymock.version} - test - + + org.jmockit + jmockit + ${jmockit.version} + test + - - org.jmockit - jmockit - ${jmockit.version} - test - - - - - - mock-comparisons - - - src/main/resources - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - + + + mock-comparisons + + + src/main/resources + true + + + \ No newline at end of file diff --git a/parent-boot-4/pom.xml b/parent-boot-4/pom.xml new file mode 100644 index 0000000000..2af36e9365 --- /dev/null +++ b/parent-boot-4/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + com.baeldung + parent-boot-4 + 0.0.1-SNAPSHOT + pom + Parent Boot 4 + Parent for all spring boot 1.4 modules + + + UTF-8 + UTF-8 + 1.8 + 3.0.1 + + 2.19.1 + 3.6.0 + + + + spring-boot-starter-parent + org.springframework.boot + 1.4.4.RELEASE + + + + + + junit + junit + test + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 3 + true + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + **/JdbcTest.java + **/*LiveTest.java + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/parent-boot-5/pom.xml b/parent-boot-5/pom.xml new file mode 100644 index 0000000000..57e9ed3c67 --- /dev/null +++ b/parent-boot-5/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + com.baeldung + parent-boot-5 + 0.0.1-SNAPSHOT + pom + Parent Boot 5 + Parent for all spring boot 1.5 modules + + + UTF-8 + UTF-8 + 1.8 + 3.0.1 + + 2.19.1 + 3.6.0 + + + + spring-boot-starter-parent + org.springframework.boot + 1.5.3.RELEASE + + + + + + junit + junit + test + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 3 + true + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + **/JdbcTest.java + **/AutoconfigurationTest.java + **/*EntryPointsTest.java + **/*LiveTest.java + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/resteasy/bin/pom.xml b/resteasy/bin/pom.xml index 3138256e3a..2e1f839a55 100644 --- a/resteasy/bin/pom.xml +++ b/resteasy/bin/pom.xml @@ -1,173 +1,138 @@ - 4.0.0 + 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 - resteasy-tutorial - 1.0 - war + com.baeldung + resteasy-tutorial + 1.0 + war - - 3.0.19.Final - 4.12 - 2.5 - 2.19.1 - 1.6.1 - + + 3.0.19.Final + 2.5 + 1.6.1 + - - RestEasyTutorial - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - + + RestEasyTutorial + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + 8082 + + + + + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - 8082 - - - - - - + - + - - - - org.jboss.resteasy - resteasy-servlet-initializer - ${resteasy.version} - + + org.jboss.resteasy + resteasy-servlet-initializer + ${resteasy.version} + - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + - + - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jaxb-provider + ${resteasy.version} + - - org.jboss.resteasy - resteasy-jackson-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jackson-provider + ${resteasy.version} + - + + commons-io + commons-io + ${commons-io.version} + - - junit - junit - ${junit.version} - + - - commons-io - commons-io - ${commons-io.version} - - - - - - - live - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*IntegrationTest.java - - - **/*LiveTest.java - - - - - - - json - - - - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - false - - - - start-server - pre-integration-test - - start - - - - stop-server - post-integration-test - - stop - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*IntegrationTest.java + + + **/*LiveTest.java + + + + + + + json + + + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + false + + + + start-server + pre-integration-test + + start + + + + stop-server + post-integration-test + + stop + + + + + + + + \ No newline at end of file diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 537854a947..5464437e3b 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -9,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -125,23 +126,6 @@ - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -150,11 +134,6 @@ test - - junit - junit - test - org.assertj @@ -226,15 +205,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -243,19 +213,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - - @@ -296,6 +253,7 @@ + org.baeldung.sample.App 4.3.4.RELEASE 4.2.0.RELEASE diff --git a/spring-amqp-simple/pom.xml b/spring-amqp-simple/pom.xml index 9b49c81f7c..0cf4ad0e47 100644 --- a/spring-amqp-simple/pom.xml +++ b/spring-amqp-simple/pom.xml @@ -4,9 +4,10 @@ 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 com.baeldung @@ -14,10 +15,6 @@ 1.0.0-SNAPSHOT Spring AMQP Simple App - - 1.8 - - org.springframework.boot @@ -27,29 +24,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - \ No newline at end of file diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml index 9f5cccd327..0e8dbe46ce 100644 --- a/spring-aop/pom.xml +++ b/spring-aop/pom.xml @@ -8,52 +8,18 @@ spring-aop - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - org.springframework.boot spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml index bb1d35cfaa..e90e6ca280 100644 --- a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml +++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml @@ -7,15 +7,13 @@ 0.0.1-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 - UTF-8 - 1.8 0.0.1-SNAPSHOT @@ -26,12 +24,6 @@ greeter-spring-boot-starter ${greeter-starter.version} - - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/spring-boot-custom-starter/greeter/pom.xml b/spring-boot-custom-starter/greeter/pom.xml index b0e37a9ed9..e2048bf5c7 100644 --- a/spring-boot-custom-starter/greeter/pom.xml +++ b/spring-boot-custom-starter/greeter/pom.xml @@ -6,33 +6,4 @@ greeter 0.0.1-SNAPSHOT - - UTF-8 - - - - - - junit - junit - 4.12 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - - \ No newline at end of file diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index c99f6c6137..691137e495 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -8,12 +8,11 @@ spring-boot This is simple boot application for Spring boot actuator test - - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -70,12 +69,6 @@ ${h2.version} - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter @@ -167,20 +160,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -192,18 +171,6 @@ ${git-commit-id-plugin.version} - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - **/AutoconfigurationTest.java - - - - @@ -281,8 +248,6 @@ org.baeldung.boot.DemoApplication - UTF-8 - 1.8 4.3.4.RELEASE 2.2.1 3.1.1 diff --git a/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-data-flow/batch-job/pom.xml index 313bbd25cc..9a40c80e37 100644 --- a/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-data-flow/batch-job/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 1.0.3.RELEASE @@ -42,12 +39,6 @@ h2 runtime - - - org.springframework.boot - spring-boot-starter-test - test - @@ -62,23 +53,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - diff --git a/spring-cloud-data-flow/data-flow-server/pom.xml b/spring-cloud-data-flow/data-flow-server/pom.xml index bd3b4ab150..ec0057191b 100644 --- a/spring-cloud-data-flow/data-flow-server/pom.xml +++ b/spring-cloud-data-flow/data-flow-server/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 1.1.0.RELEASE Brixton.SR7 @@ -31,12 +28,6 @@ org.springframework.cloud spring-cloud-starter-dataflow-server-local - - - org.springframework.boot - spring-boot-starter-test - test - @@ -58,23 +49,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - diff --git a/spring-cloud-data-flow/data-flow-shell/pom.xml b/spring-cloud-data-flow/data-flow-shell/pom.xml index 350f199d4b..b34c3cefeb 100644 --- a/spring-cloud-data-flow/data-flow-shell/pom.xml +++ b/spring-cloud-data-flow/data-flow-shell/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Brixton.SR7 1.1.0.RELEASE @@ -31,12 +28,6 @@ org.springframework.cloud spring-cloud-dataflow-shell - - - org.springframework.boot - spring-boot-starter-test - test - @@ -58,25 +49,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - diff --git a/spring-cloud-data-flow/log-sink/pom.xml b/spring-cloud-data-flow/log-sink/pom.xml index 6ca25ef1ab..b97a72d9c4 100644 --- a/spring-cloud-data-flow/log-sink/pom.xml +++ b/spring-cloud-data-flow/log-sink/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Brixton.SR7 @@ -30,12 +27,6 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,24 +41,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + @@ -103,4 +77,5 @@ + diff --git a/spring-cloud-data-flow/time-processor/pom.xml b/spring-cloud-data-flow/time-processor/pom.xml index 68e970701c..9b190e7250 100644 --- a/spring-cloud-data-flow/time-processor/pom.xml +++ b/spring-cloud-data-flow/time-processor/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Brixton.SR7 @@ -30,12 +27,6 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,25 +41,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -103,4 +75,5 @@ + diff --git a/spring-cloud-data-flow/time-source/pom.xml b/spring-cloud-data-flow/time-source/pom.xml index d847901a23..3112c7ede8 100644 --- a/spring-cloud-data-flow/time-source/pom.xml +++ b/spring-cloud-data-flow/time-source/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Brixton.SR7 @@ -30,12 +27,6 @@ org.springframework.cloud spring-cloud-starter-stream-rabbit - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,25 +41,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -103,4 +75,5 @@ + diff --git a/spring-cloud/spring-cloud-bootstrap/config/pom.xml b/spring-cloud/spring-cloud-bootstrap/config/pom.xml index a16e86b1a2..77ceedab39 100644 --- a/spring-cloud/spring-cloud-bootstrap/config/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/config/pom.xml @@ -7,10 +7,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -22,11 +22,6 @@ org.springframework.cloud spring-cloud-starter-eureka - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-security @@ -45,26 +40,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml index 1d5b496a2a..3156e0f3e6 100644 --- a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml @@ -7,10 +7,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -22,11 +22,6 @@ org.springframework.cloud spring-cloud-starter-eureka-server - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-security @@ -54,26 +49,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml index 887f59d102..7544a44b7a 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml @@ -7,10 +7,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -45,18 +45,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - - - - io.rest-assured - rest-assured - test - 3.0.2 - @@ -71,35 +59,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml index fe200601e2..d35e4f6576 100644 --- a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml @@ -8,10 +8,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -57,11 +57,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - @@ -76,25 +71,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml index 9434c70f99..7879031a2a 100644 --- a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml @@ -8,10 +8,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -57,11 +57,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - @@ -76,25 +71,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml b/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml index 9e5af80644..3b4c984721 100644 --- a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml @@ -7,10 +7,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -34,11 +34,6 @@ runtime - - org.springframework.boot - spring-boot-starter-test - test - @@ -53,35 +48,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index a1aaac5ea8..81693b7e2e 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -15,10 +15,10 @@ - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -33,28 +33,8 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*LiveTest.java - - - - - - - - UTF-8 - UTF-8 - 1.8 - 1.4.2.RELEASE - 2.19.1 Brixton.SR7 + diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml index 183ce53eab..fb84b33876 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml @@ -12,19 +12,12 @@ Simple books API - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 - - UTF-8 - UTF-8 - 1.8 - 3.0.1 - - org.springframework.cloud @@ -63,17 +56,6 @@ spring-boot-starter-data-redis - - org.springframework.boot - spring-boot-starter-test - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - - @@ -88,24 +70,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml index 48984a66c5..f0a563f16f 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml @@ -12,16 +12,13 @@ Spring Cloud REST configuration server - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Camden.SR4 @@ -38,12 +35,6 @@ org.springframework.boot spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-test - test - @@ -58,24 +49,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml index 6dce522f37..0735808eea 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml @@ -12,16 +12,13 @@ Spring Cloud REST server - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Camden.SR4 @@ -46,12 +43,6 @@ org.springframework.boot spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-test - test - @@ -66,26 +57,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml index 1486f42056..2574cae4eb 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml @@ -12,16 +12,13 @@ Simple reviews API - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 3.0.1 @@ -62,18 +59,6 @@ org.springframework.boot spring-boot-starter-data-redis - - - org.springframework.boot - spring-boot-starter-test - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - - @@ -88,24 +73,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml index 53d7de65d3..68f3bd9439 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml @@ -9,15 +9,13 @@ Introduction to Spring Cloud Rest Client with Netflix Ribbon - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - 1.8 Brixton.SR7 @@ -30,12 +28,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,25 +42,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - spring-snapshots diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml index 454992c663..c178fbf454 100644 --- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml @@ -2,13 +2,16 @@ 4.0.0 + com.baeldung.spring.cloud spring-cloud-zookeeper 1.0.0-SNAPSHOT + Greeting jar + org.springframework.boot @@ -41,12 +44,6 @@ spring-cloud-starter-feign 1.2.5.RELEASE - - junit - junit - 4.12 - test - org.hamcrest hamcrest-core @@ -67,13 +64,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - Greeting + \ No newline at end of file diff --git a/spring-cucumber/pom.xml b/spring-cucumber/pom.xml index 0360230cbc..8270fc3ae2 100644 --- a/spring-cucumber/pom.xml +++ b/spring-cucumber/pom.xml @@ -12,15 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 1.2.5 1.3.2 @@ -31,12 +29,6 @@ spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - info.cukes cucumber-core @@ -74,26 +66,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - integration diff --git a/spring-custom-aop/spring-custom-aop/pom.xml b/spring-custom-aop/spring-custom-aop/pom.xml index bab6f1f101..7e9da03b54 100644 --- a/spring-custom-aop/spring-custom-aop/pom.xml +++ b/spring-custom-aop/spring-custom-aop/pom.xml @@ -8,12 +8,11 @@ spring-boot This is simple boot application for Spring boot actuator test - - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 @@ -69,12 +68,6 @@ h2 - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter @@ -106,7 +99,7 @@ ${jquery.version} - + com.google.guava guava 18.0 @@ -132,20 +125,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -157,17 +136,6 @@ ${git-commit-id-plugin.version} - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - @@ -211,8 +179,6 @@ org.baeldung.boot.DemoApplication - UTF-8 - 1.8 4.3.4.RELEASE 2.2.1 3.1.1 diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml index d3d41f3013..11bbbdf40f 100644 --- a/spring-data-dynamodb/pom.xml +++ b/spring-data-dynamodb/pom.xml @@ -9,17 +9,15 @@ This is simple boot application for Spring boot actuator test - spring-boot-starter-parent - org.springframework.boot - 1.5.3.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 com.baeldung.Application - UTF-8 - 1.8 4.3.4.RELEASE 4.5.2 4.4.1 @@ -64,12 +62,6 @@ h2 - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter @@ -124,20 +116,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin diff --git a/spring-data-javaslang/pom.xml b/spring-data-javaslang/pom.xml index a3c2be47b5..02d214344e 100644 --- a/spring-data-javaslang/pom.xml +++ b/spring-data-javaslang/pom.xml @@ -5,26 +5,26 @@ spring-data-javaslang spring-data-javaslang 0.0.1-SNAPSHOT + - UTF-8 - 2.19.1 - 3.1 2.9.1-01 2.3.7-01 2.4.8 2.0.5 - 4.12 1.5.1.RELEASE 4.3.6.RELEASE 4.3.6.RELEASE 4.3.6.RELEASE ${basedir}/src/test/java + - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + test-app @@ -49,38 +49,7 @@ - - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${project.build.testSourceDirectory} - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - org.springframework.boot @@ -136,11 +105,5 @@ ${spring-core.version} - - junit - junit - ${junit.version} - test - \ No newline at end of file diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml index b03cb1a675..2b621ac3a2 100644 --- a/spring-data-rest/pom.xml +++ b/spring-data-rest/pom.xml @@ -12,17 +12,12 @@ Intro to Spring Data REST - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - - UTF-8 - 1.8 - - org.springframework.boot @@ -47,33 +42,10 @@ derby ${derby.version} org.xerial sqlite-jdbc ${sqlite.version} --> - - - org.springframework.boot - spring-boot-starter-test - test - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - diff --git a/spring-hibernate5/pom.xml b/spring-hibernate5/pom.xml index 400ddbd501..bf4360b371 100644 --- a/spring-hibernate5/pom.xml +++ b/spring-hibernate5/pom.xml @@ -1,186 +1,186 @@ - 4.0.0 - com.baeldung - spring-hibernate5 - 0.1-SNAPSHOT + 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-hibernate5 + 0.1-SNAPSHOT - spring-hibernate5 + spring-hibernate5 - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + - + - - org.springframework - spring-context - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-aspects - ${org.springframework.version} - - - org.springframework.security - spring-security-core - ${org.springframework.security.version} - + + org.springframework + spring-context + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-aspects + ${org.springframework.version} + + + org.springframework.security + spring-security-core + ${org.springframework.security.version} + - + - - org.springframework - spring-orm - ${org.springframework.version} - - - org.springframework.data - spring-data-jpa - ${org.springframework.data.version} - - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.hibernate - hibernate-envers - ${hibernate-envers.version} - - - javax.transaction - jta - ${jta.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - + + org.springframework + spring-orm + ${org.springframework.version} + + + org.springframework.data + spring-data-jpa + ${org.springframework.data.version} + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-envers + ${hibernate-envers.version} + + + javax.transaction + jta + ${jta.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + - - org.apache.tomcat - tomcat-dbcp - ${tomcat-dbcp.version} - + + org.apache.tomcat + tomcat-dbcp + ${tomcat-dbcp.version} + - + - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - javax.el - javax.el-api - ${javax.el-api.version} - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + javax.el + javax.el-api + ${javax.el-api.version} + - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - org.springframework.security - spring-security-test - ${org.springframework.security.version} - test - + + org.springframework.security + spring-security-test + ${org.springframework.security.version} + test + - - junit - junit-dep - 4.11 - test - + + junit + junit-dep + 4.11 + test + - - org.hsqldb - hsqldb - ${hsqldb.version} - + + org.hsqldb + hsqldb + ${hsqldb.version} + - + - - spring-hibernate5 - - - src/main/resources - true - - + + spring-hibernate5 + + + src/main/resources + true + + - + - - - 4.3.5.RELEASE - 4.2.1.RELEASE - 1.10.6.RELEASE + + + 4.3.5.RELEASE + 4.2.1.RELEASE + 1.10.6.RELEASE - - 5.2.8.Final - ${hibernate.version} - 6.0.5 - 8.5.11 - 1.1 - 2.3.4 + + 5.2.8.Final + ${hibernate.version} + 6.0.5 + 8.5.11 + 1.1 + 2.3.4 - - 5.4.0.Final - 2.2.5 + + 5.4.0.Final + 2.2.5 - - 21.0 - 3.5 + + 21.0 + 3.5 - 4.4.1 - 4.5 + 4.4.1 + 4.5 - 2.9.0 + 2.9.0 - - 3.6.0 - 2.19.1 - 2.7 - 1.6.1 + + 3.6.0 + 2.19.1 + 2.7 + 1.6.1 - + diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml index 11810a17dd..7160f989be 100644 --- a/spring-kafka/pom.xml +++ b/spring-kafka/pom.xml @@ -10,15 +10,15 @@ Intro to Kafka with Spring - 1.8 1.1.3.RELEASE 2.6.7 - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -40,13 +40,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - \ No newline at end of file diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml index da791fac37..822eac7873 100644 --- a/spring-katharsis/pom.xml +++ b/spring-katharsis/pom.xml @@ -7,9 +7,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -36,59 +37,17 @@ ${katharsis.version} - - - - org.springframework.boot - spring-boot-starter-test - test - - - - com.jayway.restassured - rest-assured - ${restassured.version} - test - - - commons-logging - commons-logging - - - - - 1.8 1.0.1 - 2.9.0 1.6.1 - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -109,9 +68,7 @@ - - @@ -139,7 +96,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -163,7 +119,6 @@ - diff --git a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java index 26a8c42a25..e512202d96 100644 --- a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java +++ b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; +import io.restassured.RestAssured; +import io.restassured.response.Response; public class JsonApiLiveTest { diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml index a62234e63f..8b8618aeee 100644 --- a/spring-mobile/pom.xml +++ b/spring-mobile/pom.xml @@ -3,51 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - com.baeldung - spring-mobile - 1.0-SNAPSHOT - spring-mobile - war - http://maven.apache.org + com.baeldung + spring-mobile + 1.0-SNAPSHOT + spring-mobile + war + http://maven.apache.org - - 1.8 - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.mobile - spring-mobile-device - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - - - src/main/resources - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.mobile + spring-mobile-device + + + org.springframework.boot + spring-boot-starter-freemarker + + diff --git a/spring-mockito/pom.xml b/spring-mockito/pom.xml index 6aea841a3f..d8bcc5682a 100644 --- a/spring-mockito/pom.xml +++ b/spring-mockito/pom.xml @@ -12,10 +12,10 @@ Injecting Mockito Mocks into Spring Beans - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -23,11 +23,6 @@ org.springframework.boot spring-boot-starter - - org.springframework.boot - spring-boot-starter-test - test - org.mockito mockito-all @@ -35,25 +30,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -90,8 +66,6 @@ - UTF-8 - 1.8 1.10.19 diff --git a/spring-mvc-email/pom.xml b/spring-mvc-email/pom.xml index e4f1582494..c40abdb4bf 100644 --- a/spring-mvc-email/pom.xml +++ b/spring-mvc-email/pom.xml @@ -10,10 +10,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -37,17 +37,4 @@ - - 1.8 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/spring-mvc-web-vs-initializer/pom.xml b/spring-mvc-web-vs-initializer/pom.xml index ecb0ac0bf5..2f7b7ea98e 100644 --- a/spring-mvc-web-vs-initializer/pom.xml +++ b/spring-mvc-web-vs-initializer/pom.xml @@ -9,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -63,23 +64,6 @@ ${guava.version} - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -88,12 +72,6 @@ test - - junit - junit - test - - org.assertj assertj-core @@ -158,16 +136,13 @@ - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - + org.springframework.boot + spring-boot-maven-plugin + + true + + + diff --git a/spring-protobuf/pom.xml b/spring-protobuf/pom.xml index 1bdde73b5f..36310e08f1 100644 --- a/spring-protobuf/pom.xml +++ b/spring-protobuf/pom.xml @@ -7,9 +7,10 @@ spring-protobuf - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -33,11 +34,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - org.apache.httpcomponents @@ -47,29 +43,16 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + integration @@ -104,4 +87,5 @@ + diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml index 600273ed5b..eb00911543 100644 --- a/spring-quartz/pom.xml +++ b/spring-quartz/pom.xml @@ -11,17 +11,14 @@ Demo project for Scheduling in Spring with Quartz - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 2.2.3 - 3.6.0 @@ -44,13 +41,6 @@ ${quartz.version} - - - org.springframework.boot - spring-boot-starter-test - test - - @@ -61,24 +51,7 @@ true - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - + \ No newline at end of file diff --git a/spring-reactor/pom.xml b/spring-reactor/pom.xml index a04955eada..759e9f2b58 100644 --- a/spring-reactor/pom.xml +++ b/spring-reactor/pom.xml @@ -9,9 +9,10 @@ http://maven.apache.org - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -27,36 +28,8 @@ io.projectreactor reactor-bus - - org.springframework.boot - spring-boot-starter-test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - 1.8 - - spring-snapshots @@ -67,6 +40,7 @@ + spring-releases diff --git a/spring-remoting/pom.xml b/spring-remoting/pom.xml index 96e808477f..8acb38bd44 100644 --- a/spring-remoting/pom.xml +++ b/spring-remoting/pom.xml @@ -9,28 +9,23 @@ 1.0-SNAPSHOT spring-remoting Parent for all projects related to Spring Remoting. - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - - 1.8 - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - ${project.groupId} api ${project.version} - - diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml index 4d3f4da765..b926fd3d79 100644 --- a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml +++ b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml @@ -32,11 +32,6 @@ api 1.0-SNAPSHOT - - junit - junit - test - com.baeldung spring-remoting-http-server diff --git a/spring-rest-angular/pom.xml b/spring-rest-angular/pom.xml index 7d0f5b22f7..06741bfd0c 100644 --- a/spring-rest-angular/pom.xml +++ b/spring-rest-angular/pom.xml @@ -10,9 +10,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -53,43 +54,17 @@ guava ${guava.version} - - junit - junit - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - test - io.rest-assured spring-mock-mvc ${rest-assured.version} test - - org.springframework.boot - spring-boot-starter-test - test - angular-spring-rest-sample - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -97,17 +72,6 @@ false - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - @@ -149,7 +113,6 @@ 19.0 3.5 - 3.0.1 diff --git a/spring-rest-docs/pom.xml b/spring-rest-docs/pom.xml index 20a22ab20f..4647577629 100644 --- a/spring-rest-docs/pom.xml +++ b/spring-rest-docs/pom.xml @@ -12,15 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 ${project.build.directory}/generated-snippets 1.1.2.RELEASE 2.2.0 @@ -37,11 +35,6 @@ spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.restdocs spring-restdocs-mockmvc @@ -55,20 +48,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - org.asciidoctor asciidoctor-maven-plugin @@ -99,9 +78,7 @@ integration - - org.apache.maven.plugins maven-surefire-plugin @@ -128,8 +105,8 @@ - + diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index 23f9beb9db..c12028149d 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -8,9 +8,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.6.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -106,23 +107,6 @@ ${commons-lang3.version} - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -133,12 +117,6 @@ - - junit - junit - test - - org.hamcrest hamcrest-core @@ -161,12 +139,6 @@ spring-test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - - com.google.protobuf @@ -202,35 +174,18 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + + org.springframework.boot + spring-boot-maven-plugin + + true + + org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -352,7 +307,6 @@ 20.0 - 2.9.0 1.6.0 diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java index e8d5ff9f17..2b57e7049c 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java @@ -1,13 +1,13 @@ package org.baeldung.web.controller.mediatypes; -import com.jayway.restassured.http.ContentType; +import io.restassured.http.ContentType; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class) diff --git a/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java b/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java index 7828df7304..347b683b2d 100644 --- a/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.equalTo; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class RequestMappingLiveTest { private static String BASE_URI = "http://localhost:8082/spring-rest/ex/"; diff --git a/spring-security-cache-control/pom.xml b/spring-security-cache-control/pom.xml index 20adb0270e..e525cd4e8e 100644 --- a/spring-security-cache-control/pom.xml +++ b/spring-security-cache-control/pom.xml @@ -8,9 +8,10 @@ 1.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -34,22 +35,12 @@ org.springframework.security spring-security-web - - org.springframework.boot - spring-boot-starter-test - javax.servlet javax.servlet-api ${javax.servlet-api.version} - - junit - junit - test - - org.hamcrest hamcrest-core @@ -72,35 +63,10 @@ spring-test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - - UTF-8 - 1.8 - 3.1.0 - 2.9.0 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - \ No newline at end of file diff --git a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java index 2c48878917..d6a1a97773 100644 --- a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java +++ b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java @@ -1,6 +1,6 @@ package com.baeldung.cachecontrol; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,7 +8,7 @@ import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.jayway.restassured.http.ContentType; +import io.restassured.http.ContentType; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class) diff --git a/spring-security-client/spring-security-jsp-authentication/pom.xml b/spring-security-client/spring-security-jsp-authentication/pom.xml index 57709f7bcd..6f4095c2d5 100644 --- a/spring-security-client/spring-security-jsp-authentication/pom.xml +++ b/spring-security-client/spring-security-jsp-authentication/pom.xml @@ -12,9 +12,10 @@ Spring Security JSP Authentication tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -51,18 +52,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-jsp-authorize/pom.xml b/spring-security-client/spring-security-jsp-authorize/pom.xml index 4e9863b4c9..2e1a57a468 100644 --- a/spring-security-client/spring-security-jsp-authorize/pom.xml +++ b/spring-security-client/spring-security-jsp-authorize/pom.xml @@ -12,9 +12,10 @@ Spring Security JSP Authorize tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -51,18 +52,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-jsp-config/pom.xml b/spring-security-client/spring-security-jsp-config/pom.xml index 45faeb3f19..4f92e24563 100644 --- a/spring-security-client/spring-security-jsp-config/pom.xml +++ b/spring-security-client/spring-security-jsp-config/pom.xml @@ -12,9 +12,10 @@ Spring Security JSP configuration - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -51,18 +52,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-mvc/pom.xml b/spring-security-client/spring-security-mvc/pom.xml index f9915cb118..a642e8719d 100644 --- a/spring-security-client/spring-security-mvc/pom.xml +++ b/spring-security-client/spring-security-mvc/pom.xml @@ -12,9 +12,10 @@ Spring Security MVC - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -29,18 +30,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml b/spring-security-client/spring-security-thymeleaf-authentication/pom.xml index 9341b529d3..7573d430d3 100644 --- a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-authentication/pom.xml @@ -12,9 +12,10 @@ Spring Security thymeleaf authentication tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -43,21 +44,6 @@ thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml b/spring-security-client/spring-security-thymeleaf-authorize/pom.xml index a27b7a67e8..20d141e70c 100644 --- a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-authorize/pom.xml @@ -12,9 +12,10 @@ Spring Security thymeleaf authorize tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -43,21 +44,6 @@ thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-config/pom.xml b/spring-security-client/spring-security-thymeleaf-config/pom.xml index 475dd5e3c3..ad856c7e20 100644 --- a/spring-security-client/spring-security-thymeleaf-config/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-config/pom.xml @@ -12,9 +12,10 @@ Spring Security thymeleaf configuration sample project - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -43,21 +44,6 @@ thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-core/pom.xml b/spring-security-core/pom.xml index 971f5a9d0f..7deea5deb0 100644 --- a/spring-security-core/pom.xml +++ b/spring-security-core/pom.xml @@ -9,10 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -41,11 +41,6 @@ h2 runtime - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.security spring-security-test @@ -64,36 +59,11 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - true - source - - - org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - **/*ManualTest.java - - - - - - - @@ -132,41 +102,5 @@ - - - 4.3.4.RELEASE - 4.2.0.RELEASE - - 4.4.5 - 4.5.2 - - - 1.7.21 - 1.1.7 - - - 5.3.3.Final - 1.2 - 3.1.0 - 2.8.5 - - - 19.0 - 3.5 - - - 1.3 - 4.12 - 1.10.19 - - 2.9.0 - - - 3.6.0 - 2.6 - 2.19.1 - 1.6.1 - - diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml index fd867a9287..3a8bc1f3aa 100644 --- a/spring-security-mvc-boot/pom.xml +++ b/spring-security-mvc-boot/pom.xml @@ -12,9 +12,10 @@ Spring Security MVC Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -55,18 +56,6 @@ h2 - - org.springframework.boot - spring-boot-starter-test - test - - - - junit - junit - test - - org.hamcrest hamcrest-core @@ -79,19 +68,6 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - - org.springframework spring-test @@ -151,27 +127,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - **/*EntryPointsTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -192,18 +147,14 @@ - - integration - - org.apache.maven.plugins maven-surefire-plugin @@ -230,7 +181,6 @@ - @@ -258,7 +208,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -282,7 +231,6 @@ - @@ -290,9 +238,7 @@ entryPoints - - org.apache.maven.plugins maven-surefire-plugin @@ -320,7 +266,6 @@ - @@ -338,8 +283,6 @@ comment the tag above and uncomment the one below --> - UTF-8 - 1.8 10.13.1.1 1.1.2 4.2.2.RELEASE @@ -347,7 +290,6 @@ 4.2.2.RELEASE 1.2 - 2.4.0 1.6.1 diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java index d237ff2ec5..dc5c265ed8 100644 --- a/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java @@ -7,10 +7,10 @@ import org.baeldung.persistence.model.Foo; import org.junit.Test; import org.springframework.http.MediaType; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.authentication.FormAuthConfig; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.authentication.FormAuthConfig; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; public class LiveTest { diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml index 96d24c5d91..f2b6b766eb 100644 --- a/spring-security-mvc-ldap/pom.xml +++ b/spring-security-mvc-ldap/pom.xml @@ -9,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -53,20 +54,6 @@ true - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - diff --git a/spring-security-openid/pom.xml b/spring-security-openid/pom.xml index 6669a3e3f2..2149334a5c 100644 --- a/spring-security-openid/pom.xml +++ b/spring-security-openid/pom.xml @@ -12,9 +12,10 @@ Spring OpenID sample project - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -43,25 +44,6 @@ spring-security-jwt - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 305fd3dd89..c329bd1cb8 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -9,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -139,12 +140,6 @@ - - junit - junit - test - - org.hamcrest hamcrest-core @@ -162,23 +157,6 @@ test - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -191,18 +169,13 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - true - source - - - + org.springframework.boot + spring-boot-maven-plugin + + true + + org.apache.maven.plugins maven-war-plugin @@ -211,19 +184,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -257,11 +217,8 @@ 4.4.5 4.5.2 - 2.9.0 - 1.6.1 - \ No newline at end of file diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 5de25c3e00..2b559ddefc 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -9,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -211,23 +212,6 @@ ${guava.version} - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -241,12 +225,6 @@ spring-security-test - - junit - junit - test - - @@ -264,19 +242,6 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - - @@ -290,34 +255,11 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -366,9 +308,7 @@ integration - - org.apache.maven.plugins maven-surefire-plugin @@ -395,16 +335,13 @@ - live - - org.apache.maven.plugins maven-surefire-plugin @@ -454,7 +391,6 @@ - @@ -470,10 +406,6 @@ 19.0 3.5 - - 4.12 - 2.9.0 - 1.6.1 1.1.3 diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java index a8cd7f4f30..2cc0aa7b28 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java @@ -18,7 +18,7 @@ import org.junit.Ignore; import org.junit.Test; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.response.Response; +import io.restassured.response.Response; public abstract class AbstractBasicLiveTest extends AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java index ca3f56416d..2d3ad7b13f 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import org.springframework.http.MediaType; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.response.Response; +import io.restassured.response.Response; public abstract class AbstractDiscoverabilityLiveTest extends AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java index a2890d8643..72dbcedc64 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java @@ -9,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.base.Preconditions; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; public abstract class AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java index 70787266d8..07b47dd8b6 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java @@ -1,8 +1,8 @@ package org.baeldung.persistence.query; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; import org.baeldung.persistence.model.User; import org.junit.Before; import org.junit.Test; diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java index 20623eacc6..b598463da0 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java @@ -6,9 +6,9 @@ import org.baeldung.persistence.model.MyUser; import org.junit.Test; import org.springframework.test.context.ActiveProfiles; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; @ActiveProfiles("test") public class MyUserLiveTest { diff --git a/spring-security-stormpath/pom.xml b/spring-security-stormpath/pom.xml index 44c6595e64..982c677bf5 100644 --- a/spring-security-stormpath/pom.xml +++ b/spring-security-stormpath/pom.xml @@ -8,75 +8,68 @@ spring-security-stormpath http://maven.apache.org - - - abhinabkanrar@gmail.com - Abhinab Kanrar - https://github.com/AbhinabKanrar - abhinabkanrar - - + + + abhinabkanrar@gmail.com + Abhinab Kanrar + https://github.com/AbhinabKanrar + abhinabkanrar + + - - UTF-8 - UTF-8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + + + + org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE - + spring-boot-starter-web + + + com.stormpath.spring + stormpath-default-spring-boot-starter + 1.5.4 + + - - - org.springframework.boot - spring-boot-starter-web - - - com.stormpath.spring - stormpath-default-spring-boot-starter - 1.5.4 - - + + + spring-releases + Spring Releases + https://repo.spring.io/libs-release + + - - - spring-releases - Spring Releases - https://repo.spring.io/libs-release - - - - - spring-security-stormpath - - - src/main/resources - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - + + spring-security-stormpath + + + src/main/resources + + + org.springframework.boot spring-boot-maven-plugin - - true - - - - - repackage - - + + true + + + + + repackage + + diff --git a/spring-security-x509/pom.xml b/spring-security-x509/pom.xml index d527913965..77830ebe5a 100644 --- a/spring-security-x509/pom.xml +++ b/spring-security-x509/pom.xml @@ -15,18 +15,12 @@ - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.boot @@ -40,11 +34,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - + diff --git a/spring-session/pom.xml b/spring-session/pom.xml index 015a06a730..bb644c8b2e 100644 --- a/spring-session/pom.xml +++ b/spring-session/pom.xml @@ -8,11 +8,10 @@ jar - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -32,36 +31,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - \ No newline at end of file diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml index bf259a856b..dda5e09a26 100644 --- a/spring-sleuth/pom.xml +++ b/spring-sleuth/pom.xml @@ -9,18 +9,12 @@ jar - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.cloud @@ -30,12 +24,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,14 +38,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-social-login/pom.xml b/spring-social-login/pom.xml index 017316c1c9..0ca04ac298 100644 --- a/spring-social-login/pom.xml +++ b/spring-social-login/pom.xml @@ -7,10 +7,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -25,7 +25,6 @@ spring-boot-starter-thymeleaf - org.springframework.security spring-security-web @@ -63,10 +62,6 @@ - - org.springframework.boot - spring-boot-starter-test - org.springframework @@ -74,12 +69,6 @@ test - - junit - junit - test - - org.apache.commons commons-lang3 @@ -99,30 +88,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - @@ -162,7 +131,6 @@ - 1.8 3.3.2 diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml index c418113b6c..e1a551bc84 100644 --- a/spring-zuul/pom.xml +++ b/spring-zuul/pom.xml @@ -9,9 +9,10 @@ pom - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -24,16 +25,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -43,21 +34,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - @@ -70,13 +46,8 @@ 3.5 - - 2.9.0 - - 3.6.0 2.6 - 2.19.1 diff --git a/spring-zuul/spring-zuul-ui/pom.xml b/spring-zuul/spring-zuul-ui/pom.xml index 712b30f3bb..8bd09cf74f 100644 --- a/spring-zuul/spring-zuul-ui/pom.xml +++ b/spring-zuul/spring-zuul-ui/pom.xml @@ -40,12 +40,6 @@ test - - junit - junit - test - - org.hamcrest hamcrest-core @@ -63,18 +57,6 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - @@ -85,18 +67,5 @@ true - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - \ No newline at end of file diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java index 7ced527778..38563cdbe8 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; +import io.restassured.RestAssured; +import io.restassured.response.Response; public class LiveTest { diff --git a/stripe/pom.xml b/stripe/pom.xml index 5bb3d4207a..7823a1827f 100644 --- a/stripe/pom.xml +++ b/stripe/pom.xml @@ -12,18 +12,12 @@ Demo project for Stripe API - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.boot @@ -47,20 +41,6 @@ stripe-java 4.2.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml index c6bcc6d1d7..853c84a1b8 100644 --- a/video-tutorials/jackson-annotations/pom.xml +++ b/video-tutorials/jackson-annotations/pom.xml @@ -1,243 +1,181 @@ - 4.0.0 - com.baeldung - jackson-annotations - 1.0.0-SNAPSHOT + 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 + jackson-annotations + 1.0.0-SNAPSHOT - jacksonannotation + jacksonannotation - - com.baeldung - video-tutorials - 1.0.0-SNAPSHOT - + + com.baeldung + video-tutorials + 1.0.0-SNAPSHOT + - + - - - com.google.guava - guava - ${guava.version} - + + + com.google.guava + guava + ${guava.version} + - - commons-io - commons-io - ${commons-io.version} - + + commons-io + commons-io + ${commons-io.version} + - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson.version} + - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + - - joda-time - joda-time - ${joda-time.version} - + + joda-time + joda-time + ${joda-time.version} + - - com.google.code.gson - gson - ${gson.version} - + + com.google.code.gson + gson + ${gson.version} + - - - io.rest-assured - rest-assured - 3.0.1 - test - - - commons-logging - commons-logging - - - + + + io.rest-assured + rest-assured + 3.0.1 + test + + + commons-logging + commons-logging + + + - - - io.rest-assured - json-schema-validator - 3.0.0 - test - + + + io.rest-assured + json-schema-validator + 3.0.0 + test + - - io.rest-assured - json-path - ${json-path.version} - test - + + io.rest-assured + json-path + ${json-path.version} + test + - - com.github.fge - json-schema-validator - ${json-schema-validator.version} - test - + + com.github.fge + json-schema-validator + ${json-schema-validator.version} + test + - - junit - junit - ${junit.version} - test - + + org.assertj + assertj-core + ${assertj-core.version} + test + - - org.assertj - assertj-core - ${assertj-core.version} - test - + - - - ch.qos.logback - logback-classic - ${logback.version} - - + + jackson-annotations + + + src/main/resources + true + + - - org.slf4j - slf4j-api - ${org.slf4j.version} - + - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - + - + + 4.3.11.Final + 5.1.38 - - jackson-annotations - - - src/main/resources - true - - + + 2.8.5 - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven-compiler-plugin.source} - ${maven-compiler-plugin.source} - - + + 5.1.3.Final + 2.9.6 + 2.8.0 + 4.1 - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - + + 20.0 + 3.5 + 2.5 - + + 2.2.26 - + 4.4.1 + 4.5 - + 2.9.0 - - 4.3.11.Final - 5.1.38 + 3.6.1 + 2.2.6 + 3.0.1 - - 2.8.5 - - - 1.7.21 - 1.1.7 - - - 5.1.3.Final - 2.9.6 - 2.8.0 - 4.1 - - - 20.0 - 3.5 - 2.5 - - - 1.3 - 4.12 - 2.2.26 - - 4.4.1 - 4.5 - - 2.9.0 - - 3.6.1 - 2.2.6 - 3.0.1 - - - 3.5.1 - 2.6 - 2.19.1 - 2.7 - 1.4.18 - - UTF-8 - 1.8 - - + diff --git a/xml/src/test/resources/example_new.xml b/xml/src/test/resources/example_new.xml index 646d938869..020760fdd3 100644 --- a/xml/src/test/resources/example_new.xml +++ b/xml/src/test/resources/example_new.xml @@ -1,9 +1,10 @@ - - - - Jaxb author - 04/02/2015 - XML Binding with Jaxb - XML with Jaxb - - + + + + + XML with Dom4J + XML handling with Dom4J + 14/06/2016 + Dom4J tech writer + +