From 196f92bd422778aebe5706b84cc8ffe9bc298878 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 4 Jun 2014 17:30:16 +0100 Subject: [PATCH] =?UTF-8?q?Exclude=20commons-logging=20to=20the=20extent?= =?UTF-8?q?=20that=20even=20Gradle=E2=80=99s=20happy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gradle hasn’t different exclusion semantics to Maven. In Maven you can exclude spring-core’s commons-logging dependency once and it’ll be honoured even if you have multiple transitive routes to commons-logging via spring-core. In Gradle you have to exclude commons-logging from everything that has a transitive spring-core dependency. To make matters worse this doesn’t only apply to dependencies and exclusions declared in build.gradle but also to dependencies and exclusions declared in the pom files of the artifacts that a Gradle build depends upon. In short, to make our starters work as intended with Gradle, this commit adds many, many exclusions for commons-logging. It also removes commons-logging exclusions from spring-boot-dependencies’ as they have no effect with Gradle and their presence can cause us to miss required exclusions in a starter Fixes #987 --- spring-boot-dependencies/pom.xml | 34 -------- spring-boot-starters/pom.xml | 2 +- .../spring-boot-starter-actuator/pom.xml | 14 +-- .../spring-boot-starter-amqp/pom.xml | 14 +-- .../spring-boot-starter-aop/pom.xml | 28 +++--- .../spring-boot-starter-batch/pom.xml | 26 ++++-- .../pom.xml | 15 +++- .../spring-boot-starter-data-gemfire/pom.xml | 14 +-- .../spring-boot-starter-data-jpa/pom.xml | 60 +++++++++---- .../spring-boot-starter-data-mongodb/pom.xml | 14 +-- .../spring-boot-starter-data-rest/pom.xml | 26 +++--- .../spring-boot-starter-data-solr/pom.xml | 24 +++--- .../spring-boot-starter-freemarker/pom.xml | 16 ++-- .../spring-boot-starter-hornetq/pom.xml | 10 ++- .../spring-boot-starter-integration/pom.xml | 86 ++++++++++++++++--- .../spring-boot-starter-jdbc/pom.xml | 30 ++++--- .../spring-boot-starter-jetty/pom.xml | 20 ----- .../spring-boot-starter-mobile/pom.xml | 16 +++- .../spring-boot-starter-redis/pom.xml | 10 ++- .../spring-boot-starter-remote-shell/pom.xml | 56 +++++++----- .../spring-boot-starter-security/pom.xml | 58 ++++++++++--- .../pom.xml | 48 ++++++++--- .../pom.xml | 48 ++++++++--- .../pom.xml | 48 ++++++++--- .../spring-boot-starter-test/pom.xml | 6 +- .../spring-boot-starter-thymeleaf/pom.xml | 4 - .../spring-boot-starter-tomcat/pom.xml | 10 --- .../spring-boot-starter-velocity/pom.xml | 24 ++++-- .../spring-boot-starter-web/pom.xml | 24 ++++-- .../spring-boot-starter-websocket/pom.xml | 14 +-- .../spring-boot-starter/pom.xml | 26 +++--- 31 files changed, 522 insertions(+), 303 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 921a946df2..75817688cf 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -480,12 +480,6 @@ org.apache.httpcomponents httpclient ${httpclient.version} - - - commons-logging - commons-logging - - org.apache.httpcomponents @@ -496,12 +490,6 @@ org.apache.httpcomponents httpasyncclient ${httpasyncclient.version} - - - commons-logging - commons-logging - - org.apache.tomcat.embed @@ -547,12 +535,6 @@ org.apache.velocity velocity-tools ${velocity-tools.version} - - - commons-logging - commons-logging - - org.aspectj @@ -673,12 +655,6 @@ org.crashub crash.connectors.ssh ${crashub.version} - - - commons-logging - commons-logging - - org.crashub @@ -977,16 +953,6 @@ org.springframework.integration spring-integration-http ${spring-integration.version} - - - commons-logging - commons-logging - - - commons-logging - commons-logging-api - - org.springframework.mobile diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 1b65ebd2ce..309f13eb05 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -69,7 +69,7 @@ - commons-logging:commons-logging:* + commons-logging:*:* true diff --git a/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml index 4e4efd493b..0e898456e9 100644 --- a/spring-boot-starters/spring-boot-starter-actuator/pom.xml +++ b/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -20,15 +20,17 @@ org.springframework.boot - spring-boot-starter + spring-boot-actuator + + + commons-logging + commons-logging + + org.springframework.boot - spring-boot-actuator - - - org.springframework - spring-core + spring-boot-starter commons-logging diff --git a/spring-boot-starters/spring-boot-starter-amqp/pom.xml b/spring-boot-starters/spring-boot-starter-amqp/pom.xml index 9efffe8c09..64d19f56c1 100644 --- a/spring-boot-starters/spring-boot-starter-amqp/pom.xml +++ b/spring-boot-starters/spring-boot-starter-amqp/pom.xml @@ -18,17 +18,19 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - org.springframework.amqp spring-rabbit + + + commons-logging + commons-logging + + - org.springframework - spring-core + org.springframework.boot + spring-boot-starter commons-logging diff --git a/spring-boot-starters/spring-boot-starter-aop/pom.xml b/spring-boot-starters/spring-boot-starter-aop/pom.xml index 6f958bffad..7801b6e1c0 100644 --- a/spring-boot-starters/spring-boot-starter-aop/pom.xml +++ b/spring-boot-starters/spring-boot-starter-aop/pom.xml @@ -19,12 +19,16 @@ - org.springframework.boot - spring-boot-starter + org.aspectj + aspectjrt + + + org.aspectj + aspectjweaver org.springframework - spring-core + spring-aop commons-logging @@ -33,16 +37,14 @@ - org.springframework - spring-aop - - - org.aspectj - aspectjrt - - - org.aspectj - aspectjweaver + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml index 87189e62e9..7b4692b9d3 100644 --- a/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -18,17 +18,13 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - org.hsqldb hsqldb org.springframework - spring-core + spring-jdbc commons-logging @@ -36,13 +32,25 @@ - - org.springframework - spring-jdbc - org.springframework.batch spring-batch-core + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml index 62a98a2cec..e3d5436af3 100644 --- a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml @@ -20,13 +20,24 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} + + + commons-logging + commons-logging + + org.springframework.data spring-data-elasticsearch + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml index 50cd6e7ce6..ca1293540b 100644 --- a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml @@ -19,17 +19,13 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - com.gemstone.gemfire gemfire - org.springframework - spring-core + org.springframework.boot + spring-boot-starter commons-logging @@ -40,6 +36,12 @@ org.springframework.data spring-data-gemfire + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index b8f358f4b7..f345d7fa8f 100644 --- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -18,25 +18,13 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-jdbc - org.hibernate hibernate-entitymanager org.springframework - spring-core + spring-aspects commons-logging @@ -47,14 +35,52 @@ org.springframework spring-orm + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-aop + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + commons-logging + commons-logging + + org.springframework.data spring-data-jpa - - - org.springframework - spring-aspects + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml index b29363f6cc..443554347e 100644 --- a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml @@ -18,17 +18,13 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - org.mongodb mongo-java-driver - org.springframework - spring-core + org.springframework.boot + spring-boot-starter commons-logging @@ -39,6 +35,12 @@ org.springframework.data spring-data-mongodb + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml index 81e26793ea..c3da8ea146 100644 --- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml @@ -19,12 +19,16 @@ - org.springframework.boot - spring-boot-starter-web + com.fasterxml.jackson.core + jackson-annotations - org.springframework - spring-core + com.fasterxml.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-web commons-logging @@ -35,14 +39,12 @@ org.springframework.data spring-data-rest-webmvc - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml index 96a7cc46b4..36ae5fc969 100644 --- a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml @@ -18,17 +18,19 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - org.apache.solr solr-solrj + + + commons-logging + commons-logging + + - org.springframework - spring-core + org.springframework.boot + spring-boot-starter commons-logging @@ -39,10 +41,12 @@ org.springframework.data spring-data-solr - - - org.apache.httpcomponents - httpmime + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml index 6bb9f98963..0e529bcce6 100644 --- a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml +++ b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml @@ -18,17 +18,13 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter-web - org.freemarker freemarker org.springframework - spring-core + spring-context-support commons-logging @@ -37,8 +33,14 @@ - org.springframework - spring-context-support + org.springframework.boot + spring-boot-starter-web + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-hornetq/pom.xml b/spring-boot-starters/spring-boot-starter-hornetq/pom.xml index cb48ad9608..d18710a2f1 100644 --- a/spring-boot-starters/spring-boot-starter-hornetq/pom.xml +++ b/spring-boot-starters/spring-boot-starter-hornetq/pom.xml @@ -21,10 +21,6 @@ org.springframework.boot spring-boot-starter - - - org.springframework - spring-core commons-logging @@ -35,6 +31,12 @@ org.springframework spring-jms + + + commons-logging + commons-logging + + org.hornetq diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml index b94000c6cd..86bca4f7b8 100644 --- a/spring-boot-starters/spring-boot-starter-integration/pom.xml +++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml @@ -18,17 +18,9 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-aop - org.springframework - spring-core + spring-messaging commons-logging @@ -36,41 +28,109 @@ - - org.springframework - spring-messaging - org.springframework spring-tx + + + commons-logging + commons-logging + + org.springframework spring-web + + + commons-logging + commons-logging + + org.springframework spring-webmvc + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-aop + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-core + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-file + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-http + + + commons-logging + commons-logging + + + commons-logging + commons-logging-api + + org.springframework.integration spring-integration-ip + + + commons-logging + commons-logging + + org.springframework.integration spring-integration-stream + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml index bade0dd6b7..0ab3379e3d 100644 --- a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml @@ -19,12 +19,12 @@ - org.springframework.boot - spring-boot-starter + org.apache.tomcat + tomcat-jdbc org.springframework - spring-core + spring-jdbc commons-logging @@ -32,17 +32,25 @@ - - org.springframework - spring-jdbc - - - org.apache.tomcat - tomcat-jdbc - org.springframework spring-tx + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml index f44f209b7d..96a315dcee 100644 --- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -18,16 +18,6 @@ ${basedir}/../.. - - org.springframework - spring-core - - - commons-logging - commons-logging - - - org.eclipse.jetty jetty-webapp @@ -36,15 +26,5 @@ org.eclipse.jetty jetty-jsp - - org.springframework - spring-core - - - commons-logging - commons-logging - - - diff --git a/spring-boot-starters/spring-boot-starter-mobile/pom.xml b/spring-boot-starters/spring-boot-starter-mobile/pom.xml index e94466fc0a..2e66362463 100644 --- a/spring-boot-starters/spring-boot-starter-mobile/pom.xml +++ b/spring-boot-starters/spring-boot-starter-mobile/pom.xml @@ -21,14 +21,16 @@ org.springframework.boot spring-boot-starter + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-web - - - org.springframework - spring-core commons-logging @@ -39,6 +41,12 @@ org.springframework.mobile spring-mobile-device + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-redis/pom.xml b/spring-boot-starters/spring-boot-starter-redis/pom.xml index cc031e4516..2cd9cf3a0b 100644 --- a/spring-boot-starters/spring-boot-starter-redis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-redis/pom.xml @@ -21,10 +21,6 @@ org.springframework.boot spring-boot-starter - - - org.springframework - spring-core commons-logging @@ -35,6 +31,12 @@ org.springframework.data spring-data-redis + + + commons-logging + commons-logging + + redis.clients diff --git a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml index f725d2a840..aaee33af47 100644 --- a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml +++ b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml @@ -19,22 +19,8 @@ - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework - spring-core - - - commons-logging - commons-logging - - - - - org.springframework - spring-context + org.codehaus.groovy + groovy org.crashub @@ -43,11 +29,21 @@ org.crashub crash.connectors.ssh + + + commons-logging + commons-logging + + org.crashub crash.connectors.telnet + + commons-logging + commons-logging + javax.servlet servlet-api @@ -56,10 +52,6 @@ log4j log4j - - commons-logging - commons-logging - true @@ -67,6 +59,10 @@ org.crashub crash.embed.spring + + commons-logging + commons-logging + spring-web org.springframework @@ -92,8 +88,24 @@ - org.codehaus.groovy - groovy + org.springframework + spring-context + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-actuator + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml index fb9ad3c944..6078afaa76 100644 --- a/spring-boot-starters/spring-boot-starter-security/pom.xml +++ b/spring-boot-starters/spring-boot-starter-security/pom.xml @@ -19,20 +19,28 @@ - org.springframework.boot - spring-boot-starter + org.springframework + spring-aop + + + commons-logging + commons-logging + + org.springframework spring-beans + + + commons-logging + commons-logging + + org.springframework spring-context - - - org.springframework - spring-core commons-logging @@ -43,22 +51,52 @@ org.springframework spring-expression + + + commons-logging + commons-logging + + org.springframework spring-web + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter + + + commons-logging + commons-logging + + org.springframework.security spring-security-config + + + commons-logging + commons-logging + + org.springframework.security spring-security-web - - - org.springframework - spring-aop + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml index fb69f07bdb..38fdbeac92 100644 --- a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml @@ -19,18 +19,18 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} + + + commons-logging + commons-logging + + - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} - - - org.springframework - spring-core commons-logging @@ -41,18 +41,42 @@ org.springframework.social spring-social-config + + + commons-logging + commons-logging + + org.springframework.social spring-social-core - - - org.springframework.social - spring-social-web + + + commons-logging + commons-logging + + org.springframework.social spring-social-facebook + + + commons-logging + commons-logging + + + + + org.springframework.social + spring-social-web + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml index 3396bb55be..2bb6dd0060 100644 --- a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml @@ -19,18 +19,18 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} + + + commons-logging + commons-logging + + - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} - - - org.springframework - spring-core commons-logging @@ -41,18 +41,42 @@ org.springframework.social spring-social-config + + + commons-logging + commons-logging + + org.springframework.social spring-social-core - - - org.springframework.social - spring-social-web + + + commons-logging + commons-logging + + org.springframework.social spring-social-linkedin + + + commons-logging + commons-logging + + + + + org.springframework.social + spring-social-web + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml index db8dc28b82..6bfc4d04f5 100644 --- a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml +++ b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml @@ -19,18 +19,18 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} + + + commons-logging + commons-logging + + - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} - - - org.springframework - spring-core commons-logging @@ -41,18 +41,42 @@ org.springframework.social spring-social-config + + + commons-logging + commons-logging + + org.springframework.social spring-social-core - - - org.springframework.social - spring-social-web + + + commons-logging + commons-logging + + org.springframework.social spring-social-twitter + + + commons-logging + commons-logging + + + + + org.springframework.social + spring-social-web + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-test/pom.xml b/spring-boot-starters/spring-boot-starter-test/pom.xml index 7cc801e9f0..3ce1541898 100644 --- a/spring-boot-starters/spring-boot-starter-test/pom.xml +++ b/spring-boot-starters/spring-boot-starter-test/pom.xml @@ -36,7 +36,7 @@ org.springframework - spring-core + spring-test commons-logging @@ -44,9 +44,5 @@ - - org.springframework - spring-test - diff --git a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml index ee963324a7..3525e818ca 100644 --- a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml +++ b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml @@ -21,10 +21,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework - spring-core commons-logging diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml index de12ace138..2895e024bc 100644 --- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml +++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml @@ -30,15 +30,5 @@ org.apache.tomcat.embed tomcat-embed-logging-juli - - org.springframework - spring-core - - - commons-logging - commons-logging - - - diff --git a/spring-boot-starters/spring-boot-starter-velocity/pom.xml b/spring-boot-starters/spring-boot-starter-velocity/pom.xml index c3f606589d..4db24ae15b 100644 --- a/spring-boot-starters/spring-boot-starter-velocity/pom.xml +++ b/spring-boot-starters/spring-boot-starter-velocity/pom.xml @@ -18,10 +18,6 @@ ${basedir}/../.. - - org.springframework.boot - spring-boot-starter-web - commons-beanutils commons-beanutils @@ -41,10 +37,6 @@ org.apache.velocity velocity-tools - - - org.springframework - spring-core commons-logging @@ -55,6 +47,22 @@ org.springframework spring-context-support + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-web + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml index aa3d9d3eb6..119eadb807 100644 --- a/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -21,10 +21,22 @@ org.springframework.boot spring-boot-starter + + + commons-logging + commons-logging + + org.springframework.boot spring-boot-starter-tomcat + + + commons-logging + commons-logging + + com.fasterxml.jackson.core @@ -36,7 +48,7 @@ org.springframework - spring-core + spring-web commons-logging @@ -44,13 +56,15 @@ - - org.springframework - spring-web - org.springframework spring-webmvc + + + commons-logging + commons-logging + + diff --git a/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-starters/spring-boot-starter-websocket/pom.xml index 96d6e3ca16..6d1d2494c8 100644 --- a/spring-boot-starters/spring-boot-starter-websocket/pom.xml +++ b/spring-boot-starters/spring-boot-starter-websocket/pom.xml @@ -19,8 +19,8 @@ - org.springframework - spring-core + org.springframework.boot + spring-boot-starter-web commons-logging @@ -28,13 +28,15 @@ - - org.springframework.boot - spring-boot-starter-web - org.springframework spring-websocket + + + commons-logging + commons-logging + + org.apache.tomcat.embed diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml index 4917bdf3ce..c50a8e8e71 100644 --- a/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-starters/spring-boot-starter/pom.xml @@ -21,18 +21,6 @@ org.springframework.boot spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework - spring-core commons-logging @@ -40,6 +28,20 @@ + + org.springframework.boot + spring-boot-autoconfigure + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-logging + org.yaml snakeyaml