From 5b49805e3c8bfdd659c0bd98f4427b1e3f0c4bf9 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 17 May 2021 20:23:25 +0530 Subject: [PATCH] JAVA-5223: Fix formatting of POMs (Spring Web Modules) --- spring-web-modules/pom.xml | 9 ++-- spring-web-modules/spring-5-mvc/pom.xml | 6 +-- spring-web-modules/spring-boot-jsp/pom.xml | 20 ++++----- .../spring-mvc-basics-2/pom.xml | 12 ++--- .../spring-mvc-basics-3/pom.xml | 19 ++------ .../spring-mvc-basics-4/pom.xml | 4 +- spring-web-modules/spring-mvc-basics/pom.xml | 9 ++-- spring-web-modules/spring-mvc-crash/pom.xml | 27 +---------- .../spring-mvc-forms-jsp/pom.xml | 10 ++--- .../spring-mvc-forms-thymeleaf/pom.xml | 8 ++-- spring-web-modules/spring-mvc-java-2/pom.xml | 7 ++- spring-web-modules/spring-mvc-java/pom.xml | 26 ++--------- .../spring-mvc-velocity/pom.xml | 16 ++----- spring-web-modules/spring-mvc-views/pom.xml | 11 +---- spring-web-modules/spring-mvc-webflow/pom.xml | 16 +++---- spring-web-modules/spring-mvc-xml/pom.xml | 25 +---------- .../spring-rest-angular/pom.xml | 7 +-- spring-web-modules/spring-rest-http-2/pom.xml | 7 +-- spring-web-modules/spring-rest-http/pom.xml | 10 ++--- .../spring-rest-query-language/pom.xml | 45 ++----------------- spring-web-modules/spring-rest-shell/pom.xml | 8 ++-- spring-web-modules/spring-rest-simple/pom.xml | 27 ++--------- .../spring-rest-testing/pom.xml | 28 ++---------- .../spring-resttemplate-2/pom.xml | 14 ++---- .../spring-resttemplate-3/pom.xml | 7 +-- .../spring-resttemplate/pom.xml | 29 ++---------- spring-web-modules/spring-thymeleaf-2/pom.xml | 9 ++-- spring-web-modules/spring-thymeleaf-3/pom.xml | 8 ++-- spring-web-modules/spring-thymeleaf/pom.xml | 18 ++------ 29 files changed, 112 insertions(+), 330 deletions(-) diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index ca96dcff35..e498185c5e 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-web-modules 0.0.1-SNAPSHOT @@ -18,7 +19,7 @@ spring-mvc-basics spring-mvc-basics-2 spring-mvc-basics-3 - spring-mvc-basics-4 + spring-mvc-basics-4 spring-mvc-crash spring-mvc-forms-jsp spring-mvc-forms-thymeleaf @@ -44,4 +45,4 @@ spring-boot-jsp - + \ No newline at end of file diff --git a/spring-web-modules/spring-5-mvc/pom.xml b/spring-web-modules/spring-5-mvc/pom.xml index ddcce8207b..79a4f73ace 100644 --- a/spring-web-modules/spring-5-mvc/pom.xml +++ b/spring-web-modules/spring-5-mvc/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-5-mvc spring-5-mvc @@ -96,4 +96,4 @@ 0.18 - + \ No newline at end of file diff --git a/spring-web-modules/spring-boot-jsp/pom.xml b/spring-web-modules/spring-boot-jsp/pom.xml index d646b6058a..30335fcc65 100644 --- a/spring-web-modules/spring-boot-jsp/pom.xml +++ b/spring-web-modules/spring-boot-jsp/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-boot-jsp 0.0.1-SNAPSHOT @@ -35,8 +35,8 @@ org.apache.tomcat.embed tomcat-embed-jasper - - + + org.projectlombok @@ -48,12 +48,12 @@ org.springframework.boot spring-boot-starter-web - - - - - - + + + + + + org.springframework.boot spring-boot-starter-test diff --git a/spring-web-modules/spring-mvc-basics-2/pom.xml b/spring-web-modules/spring-mvc-basics-2/pom.xml index adc42d8db8..9136676d20 100644 --- a/spring-web-modules/spring-mvc-basics-2/pom.xml +++ b/spring-web-modules/spring-mvc-basics-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-basics-2 0.0.1-SNAPSHOT @@ -60,7 +61,6 @@ spring-tx ${spring.version} - org.thymeleaf @@ -72,7 +72,6 @@ thymeleaf-spring5 ${org.thymeleaf-version} - org.freemarker @@ -89,21 +88,18 @@ spring-boot-starter-freemarker ${spring-boot.version} - org.codehaus.groovy groovy-templates ${groovy.version} - de.neuland-bfi spring-jade4j ${jade.version} - org.springframework @@ -171,4 +167,4 @@ 2.3.4.RELEASE - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-basics-3/pom.xml b/spring-web-modules/spring-mvc-basics-3/pom.xml index a9245814a8..f9710ff2d1 100644 --- a/spring-web-modules/spring-mvc-basics-3/pom.xml +++ b/spring-web-modules/spring-mvc-basics-3/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-basics-3 spring-mvc-basics-3 @@ -15,69 +16,57 @@ - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-validation - org.springframework.boot spring-boot-starter-test test - org.springframework.boot spring-boot-starter-thymeleaf provided - org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-mail - org.springframework.boot spring-boot-starter-actuator - com.h2database h2 runtime - javax.persistence javax.persistence-api ${jpa.version} - com.google.guava guava ${guava.version} - org.subethamail subethasmtp ${subethasmtp.version} test - org.apache.httpcomponents httpclient @@ -146,4 +135,4 @@ 4.5.8 - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-basics-4/pom.xml b/spring-web-modules/spring-mvc-basics-4/pom.xml index 07dddcde0c..067d1ed3b1 100644 --- a/spring-web-modules/spring-mvc-basics-4/pom.xml +++ b/spring-web-modules/spring-mvc-basics-4/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-mvc-basics-4 spring-mvc-basics-4 diff --git a/spring-web-modules/spring-mvc-basics/pom.xml b/spring-web-modules/spring-mvc-basics/pom.xml index ac92c7bfe5..9fe4494393 100644 --- a/spring-web-modules/spring-mvc-basics/pom.xml +++ b/spring-web-modules/spring-mvc-basics/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-mvc-basics 0.1-SNAPSHOT @@ -28,7 +28,7 @@ commons-fileupload commons-fileupload ${commons-fileupload.version} - + org.apache.tomcat.embed @@ -60,5 +60,4 @@ - - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-crash/pom.xml b/spring-web-modules/spring-mvc-crash/pom.xml index 9a0d97bae9..9574eff2a4 100644 --- a/spring-web-modules/spring-mvc-crash/pom.xml +++ b/spring-web-modules/spring-mvc-crash/pom.xml @@ -15,9 +15,7 @@ - - org.springframework spring-web @@ -28,37 +26,30 @@ spring-webmvc ${org.springframework.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - org.hibernate.validator hibernate-validator ${hibernate-validator.version} - - com.fasterxml.jackson.core jackson-databind ${jackson.version} - commons-io @@ -85,14 +76,12 @@ javax.el ${javax.el.version} - org.springframework.boot spring-boot-starter-test ${spring-boot.version} test - org.crashub @@ -115,7 +104,6 @@ - org.codehaus.groovy @@ -125,52 +113,41 @@ - spring-mvc-xml + spring-mvc-crash src/main/resources true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - - 5.0.2.RELEASE 1.5.10.RELEASE - 5.1.40 - 4.4.5 4.5.2 - 6.0.10.Final 3.0.1-b08 - 19.0 2.8.0 - 1.6.1 - 1.3.2 3.0.0-rc-3 - - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-forms-jsp/pom.xml b/spring-web-modules/spring-mvc-forms-jsp/pom.xml index 0ca23bd6cb..94eb51a32d 100644 --- a/spring-web-modules/spring-mvc-forms-jsp/pom.xml +++ b/spring-web-modules/spring-mvc-forms-jsp/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 0.1-SNAPSHOT spring-mvc-forms-jsp @@ -91,7 +92,7 @@ - spring-mvc-forms + spring-mvc-forms-jsp @@ -102,5 +103,4 @@ 6.0.6 - - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-forms-thymeleaf/pom.xml b/spring-web-modules/spring-mvc-forms-thymeleaf/pom.xml index 641f64b93c..fdd569d144 100644 --- a/spring-web-modules/spring-mvc-forms-thymeleaf/pom.xml +++ b/spring-web-modules/spring-mvc-forms-thymeleaf/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-forms-thymeleaf spring-mvc-forms-thymeleaf @@ -23,7 +24,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - org.springframework.boot @@ -42,4 +42,4 @@ com.baeldung.sessionattrs.SessionAttrsApplication - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-java-2/pom.xml b/spring-web-modules/spring-mvc-java-2/pom.xml index 8a025defac..1bbb066786 100644 --- a/spring-web-modules/spring-mvc-java-2/pom.xml +++ b/spring-web-modules/spring-mvc-java-2/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-mvc-java-2 0.1-SNAPSHOT @@ -53,5 +53,4 @@ 5.2.2.RELEASE - - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-java/pom.xml b/spring-web-modules/spring-mvc-java/pom.xml index 1324511215..b8f5ec7910 100644 --- a/spring-web-modules/spring-mvc-java/pom.xml +++ b/spring-web-modules/spring-mvc-java/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-java 0.1-SNAPSHOT @@ -68,8 +69,6 @@ commons-fileupload ${commons-fileupload.version} - - org.thymeleaf @@ -81,7 +80,6 @@ thymeleaf ${thymeleaf.version} - com.jayway.jsonpath json-path @@ -93,14 +91,12 @@ spring-boot-starter-test test - org.apache.poi poi-ooxml ${poi.version} - org.hibernate.validator @@ -122,14 +118,11 @@ true - - maven-resources-plugin ${maven-resources-plugin.version} - org.apache.maven.plugins maven-war-plugin @@ -138,7 +131,6 @@ false - org.codehaus.cargo cargo-maven2-plugin @@ -217,43 +209,34 @@ - 3.0.9.RELEASE - 6.0.10.Final 5.1.40 - 6.0.10.Final - 19.0 2.2.0 - 4.4.5 4.5.2 3.0.7 2.23 - 3.2.2 2.7 1.6.1 3.1.0 - 1.9.1 - 3.16-beta1 - 3.0.1-b09 4.0.1 2.3.3 @@ -262,5 +245,4 @@ com.baeldung.SpringMVCApplication - - + \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-velocity/pom.xml b/spring-web-modules/spring-mvc-velocity/pom.xml index 05016962a5..1b1e8b1ea4 100644 --- a/spring-web-modules/spring-mvc-velocity/pom.xml +++ b/spring-web-modules/spring-mvc-velocity/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-velocity 0.1-SNAPSHOT @@ -15,9 +16,7 @@ - - org.springframework spring-web @@ -33,22 +32,18 @@ spring-context-support ${spring.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - org.apache.velocity velocity ${velocity.version} - org.apache.velocity velocity-tools @@ -60,7 +55,6 @@ - org.powermock @@ -80,7 +74,6 @@ ${spring.version} test - @@ -91,7 +84,6 @@ true - org.apache.maven.plugins @@ -107,13 +99,11 @@ 1.6.6 - 4.4.5 4.5.2 1.7 2.0 2.9.0 - 2.7 1.6.1 diff --git a/spring-web-modules/spring-mvc-views/pom.xml b/spring-web-modules/spring-mvc-views/pom.xml index 649814263c..7e48175ff2 100644 --- a/spring-web-modules/spring-mvc-views/pom.xml +++ b/spring-web-modules/spring-mvc-views/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-mvc-views war @@ -50,37 +50,31 @@ hibernate-core ${hibernate.version} - org.hsqldb hsqldb ${hsqldb.version} - org.springframework.security spring-security-web ${spring.security.version} - org.springframework.security spring-security-config ${spring.security.version} - org.springframework.security spring-security-taglibs ${spring.security.version} - org.apache.tiles tiles-jsp ${apache-tiles.version} - @@ -95,7 +89,6 @@ ${java.version} - org.apache.maven.plugins maven-war-plugin diff --git a/spring-web-modules/spring-mvc-webflow/pom.xml b/spring-web-modules/spring-mvc-webflow/pom.xml index ab0f86394a..2e150e2d01 100644 --- a/spring-web-modules/spring-mvc-webflow/pom.xml +++ b/spring-web-modules/spring-mvc-webflow/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mvc-webflow 0.1-SNAPSHOT @@ -14,7 +15,6 @@ - org.springframework @@ -26,14 +26,12 @@ spring-webmvc ${org.springframework.version} - org.springframework.webflow spring-webflow ${spring.webflow} - javax.servlet @@ -52,7 +50,6 @@ log4j-over-slf4j ${org.slf4j.version} - org.springframework.boot @@ -60,7 +57,6 @@ ${spring-boot-starter-test.version} test - @@ -86,7 +82,8 @@ .class - -Xmx2048m -XX:PermSize=256m -Dtomee.serialization.class.blacklist=- -Dtomee.serialization.class.whitelist=* + -Xmx2048m -XX:PermSize=256m -Dtomee.serialization.class.blacklist=- + -Dtomee.serialization.class.whitelist=* true @@ -104,13 +101,10 @@ 5.0.1.RELEASE - 2.5.0.RELEASE - 4.4.5 4.5.2 - 2.7 1.6.1 diff --git a/spring-web-modules/spring-mvc-xml/pom.xml b/spring-web-modules/spring-mvc-xml/pom.xml index 4812d5c979..354d652095 100644 --- a/spring-web-modules/spring-mvc-xml/pom.xml +++ b/spring-web-modules/spring-mvc-xml/pom.xml @@ -15,9 +15,7 @@ - - org.springframework spring-web @@ -28,37 +26,30 @@ spring-webmvc ${org.springframework.version} - - javax.servlet javax.servlet-api ${javax.servlet-api.version} provided - javax.servlet jstl ${jstl.version} runtime - org.hibernate.validator hibernate-validator ${hibernate-validator.version} - - com.fasterxml.jackson.core jackson-databind ${jackson.version} - commons-io @@ -85,14 +76,12 @@ javax.el ${javax.el.version} - org.springframework.boot spring-boot-starter-test ${spring-boot.version} test - org.crashub @@ -115,7 +104,6 @@ - org.codehaus.groovy @@ -132,45 +120,34 @@ true - - org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} - - 5.0.2.RELEASE 1.5.10.RELEASE - 5.1.40 - 4.4.5 4.5.2 - 6.0.10.Final 3.0.1-b08 - 19.0 2.8.0 - 1.6.1 - 1.3.2 3.0.0-rc-3 - - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-angular/pom.xml b/spring-web-modules/spring-rest-angular/pom.xml index eb1ec8696c..ef14e78198 100644 --- a/spring-web-modules/spring-rest-angular/pom.xml +++ b/spring-web-modules/spring-rest-angular/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-angular 1.0 @@ -77,4 +78,4 @@ com.baeldung.web.main.Application - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-http-2/pom.xml b/spring-web-modules/spring-rest-http-2/pom.xml index a349ac1116..10d904e302 100644 --- a/spring-web-modules/spring-rest-http-2/pom.xml +++ b/spring-web-modules/spring-rest-http-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-http-2 0.1-SNAPSHOT @@ -53,4 +54,4 @@ 1.6.1 - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-http/pom.xml b/spring-web-modules/spring-rest-http/pom.xml index 94d1be7814..5a92b585e3 100644 --- a/spring-web-modules/spring-rest-http/pom.xml +++ b/spring-web-modules/spring-rest-http/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-http 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot spring-boot-starter-web @@ -54,13 +54,11 @@ json-patch ${jsonpatch.version} - - 1.4.9 1.12 - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-query-language/pom.xml b/spring-web-modules/spring-rest-query-language/pom.xml index 5e7ca023dd..c5a8c172f3 100644 --- a/spring-web-modules/spring-rest-query-language/pom.xml +++ b/spring-web-modules/spring-rest-query-language/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-query-language 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -25,7 +25,6 @@ org.springframework.boot spring-boot-starter-actuator - org.aspectj aspectjweaver @@ -35,9 +34,7 @@ tomcat-embed-jasper provided - - org.springframework spring-core @@ -84,16 +81,12 @@ org.springframework.data spring-data-commons - - org.springframework.boot spring-boot-starter-tomcat - - com.querydsl querydsl-apt @@ -102,17 +95,13 @@ com.querydsl querydsl-jpa - - cz.jirutka.rsql rsql-parser ${rsql.version} - - org.apache.httpcomponents httpclient @@ -127,9 +116,7 @@ org.apache.httpcomponents httpcore - - org.springframework spring-orm @@ -157,67 +144,53 @@ mysql-connector-java runtime - com.h2database h2 - - javax.servlet javax.servlet-api provided - javax.servlet jstl runtime - - com.fasterxml.jackson.core jackson-databind - com.thoughtworks.xstream xstream ${xstream.version} - - com.google.guava guava ${guava.version} - - org.springframework spring-test test - org.hamcrest hamcrest test - org.mockito mockito-core test - @@ -228,14 +201,11 @@ true - - org.apache.maven.plugins maven-war-plugin - org.codehaus.cargo cargo-maven2-plugin @@ -256,9 +226,7 @@ - - com.mysema.maven apt-maven-plugin @@ -275,9 +243,7 @@ - - @@ -342,18 +308,15 @@ 2.1.0 - 1.4.9 3.21.0-GA 1.4.01 - 19.0 - 1.7.0 1.1.3 - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-shell/pom.xml b/spring-web-modules/spring-rest-shell/pom.xml index f5792fd6ca..b83a0b6002 100644 --- a/spring-web-modules/spring-rest-shell/pom.xml +++ b/spring-web-modules/spring-rest-shell/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-shell spring-rest-shell @@ -28,7 +29,6 @@ org.springframework.boot spring-boot-starter-data-rest - com.h2database @@ -46,4 +46,4 @@ - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-simple/pom.xml b/spring-web-modules/spring-rest-simple/pom.xml index b9d5100fbf..e7671e0af0 100644 --- a/spring-web-modules/spring-rest-simple/pom.xml +++ b/spring-web-modules/spring-rest-simple/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-simple 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -38,7 +38,6 @@ org.springframework.boot spring-boot-starter-web - org.springframework @@ -64,7 +63,6 @@ ${commons-fileupload.version} - javax.servlet javax.servlet-api @@ -75,9 +73,7 @@ jstl runtime - - com.fasterxml.jackson.core jackson-databind @@ -91,9 +87,7 @@ xstream ${xstream.version} - - com.google.guava guava @@ -104,9 +98,7 @@ commons-lang3 ${commons-lang3.version} - - org.slf4j slf4j-api @@ -121,17 +113,13 @@ jcl-over-slf4j - - com.squareup.okhttp3 okhttp ${com.squareup.okhttp3.version} - - junit junit @@ -258,7 +246,6 @@ - live @@ -283,7 +270,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -307,7 +293,6 @@ - @@ -318,19 +303,15 @@ 1.4 3.1.0 1.4.9 - 20.0 2.9.0 - 1.6.0 3.0.4 - 3.4.1 - 2.2.0 - + \ No newline at end of file diff --git a/spring-web-modules/spring-rest-testing/pom.xml b/spring-web-modules/spring-rest-testing/pom.xml index fea8d25e4d..dc5fdcd323 100644 --- a/spring-web-modules/spring-rest-testing/pom.xml +++ b/spring-web-modules/spring-rest-testing/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-testing 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -34,9 +34,7 @@ tomcat-embed-jasper provided - - org.springframework spring-core @@ -83,16 +81,12 @@ org.springframework.data spring-data-commons - - org.springframework.boot spring-boot-starter-tomcat - - org.apache.httpcomponents httpclient @@ -107,9 +101,7 @@ org.apache.httpcomponents httpcore - - org.springframework spring-orm @@ -145,9 +137,7 @@ net.bytebuddy byte-buddy - - javax.servlet javax.servlet-api @@ -158,41 +148,33 @@ jstl runtime - com.fasterxml.jackson.core jackson-databind - - com.google.guava guava ${guava.version} - - org.springframework spring-test test - org.hamcrest hamcrest test - org.mockito mockito-core test - @@ -285,14 +267,12 @@ 1.4.9 1.4.01 - 19.0 3.25.0-GA - 1.6.1 1.1.3 - + \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate-2/pom.xml b/spring-web-modules/spring-resttemplate-2/pom.xml index 158380b403..d0191b970e 100644 --- a/spring-web-modules/spring-resttemplate-2/pom.xml +++ b/spring-web-modules/spring-resttemplate-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-resttemplate-2 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -27,29 +27,23 @@ - org.springframework.boot spring-boot-starter-jetty - org.apache.httpcomponents httpclient - commons-io commons-io ${commons-io.version} - org.springframework.boot spring-boot-starter-test - - org.springframework @@ -61,7 +55,6 @@ - org.slf4j @@ -71,7 +64,6 @@ ch.qos.logback logback-classic - diff --git a/spring-web-modules/spring-resttemplate-3/pom.xml b/spring-web-modules/spring-resttemplate-3/pom.xml index b1c26e002f..8e313ccf39 100644 --- a/spring-web-modules/spring-resttemplate-3/pom.xml +++ b/spring-web-modules/spring-resttemplate-3/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-resttemplate-3 0.1-SNAPSHOT @@ -26,4 +27,4 @@ - + \ No newline at end of file diff --git a/spring-web-modules/spring-resttemplate/pom.xml b/spring-web-modules/spring-resttemplate/pom.xml index 1db6b5db57..221efd77ee 100644 --- a/spring-web-modules/spring-resttemplate/pom.xml +++ b/spring-web-modules/spring-resttemplate/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-resttemplate 0.1-SNAPSHOT @@ -15,7 +16,6 @@ - org.springframework.boot @@ -37,14 +37,11 @@ org.springframework.boot spring-boot-starter-test - - au.com.dius pact-jvm-provider-junit_2.11 ${pact.version} - org.springframework @@ -64,9 +61,7 @@ org.springframework spring-oxm - - com.fasterxml.jackson.core jackson-databind @@ -80,9 +75,7 @@ xstream ${xstream.version} - - com.google.guava guava @@ -93,9 +86,7 @@ commons-lang3 ${commons-lang3.version} - - org.slf4j slf4j-api @@ -110,24 +101,19 @@ jcl-over-slf4j - - com.squareup.okhttp3 okhttp ${com.squareup.okhttp3.version} - - junit junit ${junit.version} - org.hamcrest hamcrest @@ -153,7 +139,6 @@ - org.apache.maven.plugins maven-compiler-plugin @@ -232,7 +217,6 @@ - @@ -260,7 +244,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -284,7 +267,6 @@ - @@ -292,14 +274,11 @@ 1.4.9 - 20.0 - 1.6.1 3.0.4 - 3.4.1 3.5.11 @@ -309,4 +288,4 @@ 3.7.0 - + \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf-2/pom.xml b/spring-web-modules/spring-thymeleaf-2/pom.xml index ddcd1e1005..b2b893ecd5 100644 --- a/spring-web-modules/spring-thymeleaf-2/pom.xml +++ b/spring-web-modules/spring-thymeleaf-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-thymeleaf-2 spring-thymeleaf-2 @@ -26,7 +27,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - org.springframework.boot spring-boot-starter-test @@ -40,7 +40,6 @@ org.apache.maven.plugins maven-war-plugin - org.apache.tomcat.maven tomcat7-maven-plugin @@ -71,4 +70,4 @@ 2.2 - + \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf-3/pom.xml b/spring-web-modules/spring-thymeleaf-3/pom.xml index 6a46dca117..8f39c17d8c 100644 --- a/spring-web-modules/spring-thymeleaf-3/pom.xml +++ b/spring-web-modules/spring-thymeleaf-3/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-thymeleaf-3 spring-thymeleaf-3 @@ -56,7 +57,6 @@ org.apache.maven.plugins maven-war-plugin - org.apache.tomcat.maven tomcat7-maven-plugin @@ -87,4 +87,4 @@ 2.2 - + \ No newline at end of file diff --git a/spring-web-modules/spring-thymeleaf/pom.xml b/spring-web-modules/spring-thymeleaf/pom.xml index 7b0cd2c510..8201cb5c5b 100644 --- a/spring-web-modules/spring-thymeleaf/pom.xml +++ b/spring-web-modules/spring-thymeleaf/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-thymeleaf 0.1-SNAPSHOT @@ -33,13 +34,11 @@ spring-webmvc ${spring.version} - org.springframework.data spring-data-commons ${spring-data.version} - javax.validation validation-api @@ -50,7 +49,6 @@ hibernate-validator ${hibernate-validator.version} - org.springframework.security @@ -62,7 +60,6 @@ spring-security-config ${spring-security.version} - org.thymeleaf @@ -84,7 +81,6 @@ thymeleaf-extras-java8time ${org.thymeleaf.extras-version} - javax.servlet @@ -92,7 +88,6 @@ ${javax.servlet-api.version} provided - org.springframework @@ -100,14 +95,12 @@ ${spring.version} test - org.springframework.security spring-security-test ${spring-security.version} test - @@ -120,7 +113,6 @@ false - org.codehaus.cargo cargo-maven2-plugin @@ -140,7 +132,6 @@ - @@ -151,9 +142,8 @@ 2.4.1 2.0.1.Final 6.0.11.Final - 1.6.1 - + \ No newline at end of file