From 5e1e320cee3643668bc1ae154412f128ca4b0c28 Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Wed, 19 Apr 2017 16:14:10 +0200 Subject: [PATCH] exclude commons-logging dependency (#1686) * 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 --- apache-cxf/cxf-jaxrs-implementation/pom.xml | 6 +++++ apache-cxf/cxf-spring/pom.xml | 6 +++++ apache-fop/pom.xml | 10 ++++++++ apache-poi/pom.xml | 6 +++++ apache-thrift/pom.xml | 6 +++++ apache-velocity/pom.xml | 8 ++++++- aspectj/pom.xml | 2 +- aws/pom.xml | 12 ++++++++++ cdi/pom.xml | 6 +++++ core-java/pom.xml | 6 +++++ couchbase-sdk/pom.xml | 12 ++++++++++ hbase/pom.xml | 6 +++++ httpclient/pom.xml | 12 ++++++++++ hystrix/pom.xml | 6 +++++ image-processing/pom.xml | 12 ++++++++++ javax-servlets/pom.xml | 6 +++++ jsf/pom.xml | 6 +++++ json/pom.xml | 6 +++++ libraries/pom.xml | 24 +++++++++++++++++++ log-mdc/pom.xml | 2 +- log4j2/pom.xml | 6 +++++ mapstruct/pom.xml | 6 +++++ pdf/pom.xml | 12 ++++++++++ querydsl/pom.xml | 6 +++++ rest-assured/pom.xml | 19 +++++++++------ rest-testing/pom.xml | 6 +++++ resteasy/pom.xml | 6 +++++ selenium-junit-testng/pom.xml | 6 +++++ spring-akka/pom.xml | 6 +++++ spring-all/pom.xml | 12 ++++++++++ .../springamqpsimple/MessageConsumer.java | 2 +- spring-amqp/pom.xml | 6 +++++ spring-apache-camel/pom.xml | 6 +++++ spring-batch/pom.xml | 6 +++++ .../spring-cloud-zookeeper/Greeting/pom.xml | 6 +++++ .../spring-cloud-zookeeper/HelloWorld/pom.xml | 6 +++++ spring-core/pom.xml | 6 +++++ spring-data-cassandra/pom.xml | 12 ++++++++++ spring-data-couchbase-2/pom.xml | 6 +++++ spring-data-dynamodb/pom.xml | 6 +++++ spring-data-elasticsearch/pom.xml | 6 +++++ spring-data-gemfire/pom.xml | 6 +++++ spring-data-mongodb/pom.xml | 6 +++++ spring-data-neo4j/pom.xml | 18 ++++++++++++++ spring-data-redis/pom.xml | 6 +++++ spring-data-solr/pom.xml | 6 +++++ spring-dispatcher-servlet/pom.xml | 6 +++++ spring-exceptions/pom.xml | 12 ++++++++++ spring-hibernate3/pom.xml | 6 +++++ spring-hibernate4/pom.xml | 6 +++++ spring-hibernate5/pom.xml | 6 +++++ spring-integration/pom.xml | 6 +++++ spring-jersey/pom.xml | 6 +++++ spring-jms/pom.xml | 6 +++++ spring-jooq/pom.xml | 6 +++++ spring-jpa/pom.xml | 6 +++++ spring-ldap/pom.xml | 6 +++++ spring-mvc-forms/pom.xml | 6 +++++ spring-mvc-java/pom.xml | 6 +++++ spring-mvc-simple/pom.xml | 11 +++++---- spring-mvc-tiles/pom.xml | 6 +++++ spring-mvc-velocity/pom.xml | 12 ++++++++++ spring-mvc-web-vs-initializer/pom.xml | 6 +++++ spring-mvc-xml/pom.xml | 12 +++++++++- spring-spel/pom.xml | 6 +++++ spring-state-machine/pom.xml | 6 +++++ spring-userservice/pom.xml | 6 +++++ struts2/pom.xml | 6 +++++ video-tutorials/jackson-annotations/pom.xml | 6 +++++ 69 files changed, 499 insertions(+), 17 deletions(-) diff --git a/apache-cxf/cxf-jaxrs-implementation/pom.xml b/apache-cxf/cxf-jaxrs-implementation/pom.xml index c3095be5a5..61a5132f19 100644 --- a/apache-cxf/cxf-jaxrs-implementation/pom.xml +++ b/apache-cxf/cxf-jaxrs-implementation/pom.xml @@ -54,6 +54,12 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + commons-logging + commons-logging + + diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml index 79a7650ced..dffcc3ee1b 100644 --- a/apache-cxf/cxf-spring/pom.xml +++ b/apache-cxf/cxf-spring/pom.xml @@ -24,6 +24,12 @@ org.springframework spring-context ${spring.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml index 635e5c6a0b..2de9611ad1 100644 --- a/apache-fop/pom.xml +++ b/apache-fop/pom.xml @@ -73,6 +73,10 @@ org.apache.avalon.framework avalon-framework-impl + + commons-logging + commons-logging + @@ -85,6 +89,12 @@ avalon-framework avalon-framework-impl ${avalon-framework.version} + + + commons-logging + commons-logging + + diff --git a/apache-poi/pom.xml b/apache-poi/pom.xml index d8a2cc72e0..b619d3adcb 100644 --- a/apache-poi/pom.xml +++ b/apache-poi/pom.xml @@ -42,6 +42,12 @@ org.jxls jxls-jexcel ${jexcel.version} + + + commons-logging + commons-logging + + diff --git a/apache-thrift/pom.xml b/apache-thrift/pom.xml index 66cfb2bb41..e275dc0636 100644 --- a/apache-thrift/pom.xml +++ b/apache-thrift/pom.xml @@ -19,6 +19,12 @@ org.apache.thrift libthrift ${thrift.version} + + + commons-logging + commons-logging + + diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml index 08f0e96a58..06cfeabfa8 100644 --- a/apache-velocity/pom.xml +++ b/apache-velocity/pom.xml @@ -38,7 +38,7 @@ org.apache.velocity velocity-tools - ${velocity-tools-version} + ${velocity-tools-version} org.slf4j @@ -55,6 +55,12 @@ httpclient ${org.apache.httpcomponents.version} test + + + commons-logging + commons-logging + + diff --git a/aspectj/pom.xml b/aspectj/pom.xml index cbc98dac81..2ef2ae9df7 100644 --- a/aspectj/pom.xml +++ b/aspectj/pom.xml @@ -58,7 +58,7 @@ org.springframework spring-core - 4.3.4.RELEASE + 4.3.4.RELEASE cglib diff --git a/aws/pom.xml b/aws/pom.xml index 681b76cfd4..b493dc58e8 100644 --- a/aws/pom.xml +++ b/aws/pom.xml @@ -19,12 +19,24 @@ com.amazonaws aws-lambda-java-core ${aws-lambda-java-core.version} + + + commons-logging + commons-logging + + com.amazonaws aws-lambda-java-events ${aws-lambda-java-events.version} + + + commons-logging + commons-logging + + diff --git a/cdi/pom.xml b/cdi/pom.xml index e5aaeb2c7b..d2fcec59d7 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -12,6 +12,12 @@ org.springframework spring-core ${spring.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/core-java/pom.xml b/core-java/pom.xml index 44e7df722c..b4741d5b80 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -171,6 +171,12 @@ org.owasp.esapi esapi 2.1.0.1 + + + commons-logging + commons-logging + + diff --git a/couchbase-sdk/pom.xml b/couchbase-sdk/pom.xml index c8ac9c8743..d592a15745 100644 --- a/couchbase-sdk/pom.xml +++ b/couchbase-sdk/pom.xml @@ -22,11 +22,23 @@ org.springframework spring-context ${spring-framework.version} + + + commons-logging + commons-logging + + org.springframework spring-context-support ${spring-framework.version} + + + commons-logging + commons-logging + + diff --git a/hbase/pom.xml b/hbase/pom.xml index 9d523abf1a..c692054f0f 100644 --- a/hbase/pom.xml +++ b/hbase/pom.xml @@ -28,6 +28,12 @@ org.apache.hbase hbase-client ${hbase.version} + + + commons-logging + commons-logging + + org.apache.hbase diff --git a/httpclient/pom.xml b/httpclient/pom.xml index 8f499d4a74..976f04c9c2 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -41,6 +41,12 @@ org.apache.httpcomponents fluent-hc ${httpclient.version} + + + commons-logging + commons-logging + + @@ -59,6 +65,12 @@ org.apache.httpcomponents httpasyncclient ${httpasyncclient.version} + + + commons-logging + commons-logging + + diff --git a/hystrix/pom.xml b/hystrix/pom.xml index ba1a596631..5ccc66709f 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -56,6 +56,12 @@ com.netflix.hystrix hystrix-core ${hystrix-core.version} + + + commons-logging + commons-logging + + com.netflix.hystrix diff --git a/image-processing/pom.xml b/image-processing/pom.xml index 8766da571e..1e19686be2 100644 --- a/image-processing/pom.xml +++ b/image-processing/pom.xml @@ -17,11 +17,23 @@ net.imagej ij ${ij.version} + + + commons-logging + commons-logging + + org.openimaj core-image ${core-image.version} + + + commons-logging + commons-logging + + diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 68a1b9c441..c5eeafbab3 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -49,6 +49,12 @@ httpclient ${org.apache.httpcomponents.version} test + + + commons-logging + commons-logging + + diff --git a/jsf/pom.xml b/jsf/pom.xml index 41c90824b6..a206870f89 100644 --- a/jsf/pom.xml +++ b/jsf/pom.xml @@ -65,6 +65,12 @@ org.springframework spring-web ${org.springframework.version} + + + commons-logging + commons-logging + + javax.servlet diff --git a/json/pom.xml b/json/pom.xml index 2b2f80e987..f22626ce70 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -11,6 +11,12 @@ org.everit.json org.everit.json.schema ${everit.json.schema.version} + + + commons-logging + commons-logging + + diff --git a/libraries/pom.xml b/libraries/pom.xml index 939d674d97..ba16995d8f 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -111,6 +111,12 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + commons-logging + commons-logging + + commons-io @@ -131,6 +137,12 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + commons-logging + commons-logging + + commons-io @@ -141,11 +153,23 @@ org.apache.flink flink-core ${flink.version} + + + commons-logging + commons-logging + + org.apache.flink flink-java ${flink.version} + + + commons-logging + commons-logging + + org.apache.flink diff --git a/log-mdc/pom.xml b/log-mdc/pom.xml index 931e68a178..10dcb3eaf0 100644 --- a/log-mdc/pom.xml +++ b/log-mdc/pom.xml @@ -13,7 +13,7 @@ org.springframework spring-core - ${springframework.version} + ${springframework.version} org.springframework diff --git a/log4j2/pom.xml b/log4j2/pom.xml index a4c8f19f69..1267caeb08 100644 --- a/log4j2/pom.xml +++ b/log4j2/pom.xml @@ -44,6 +44,12 @@ org.apache.commons commons-dbcp2 ${commons-dbcp2.version} + + + commons-logging + commons-logging + + diff --git a/mapstruct/pom.xml b/mapstruct/pom.xml index 72a67d19db..81bcdb4cb9 100644 --- a/mapstruct/pom.xml +++ b/mapstruct/pom.xml @@ -32,6 +32,12 @@ org.springframework spring-context ${springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/pdf/pom.xml b/pdf/pom.xml index 332e1f5244..53232377b5 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -37,11 +37,23 @@ org.apache.pdfbox pdfbox-tools ${pdfbox-tools.version} + + + commons-logging + commons-logging + + net.sf.cssbox pdf2dom ${pdf2dom.version} + + + commons-logging + commons-logging + + com.itextpdf diff --git a/querydsl/pom.xml b/querydsl/pom.xml index 1335d0f1fd..d6fe7f4191 100644 --- a/querydsl/pom.xml +++ b/querydsl/pom.xml @@ -91,6 +91,12 @@ org.springframework spring-context ${spring.version} + + + commons-logging + commons-logging + + diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml index 2c8039401e..0c3bf38dc5 100644 --- a/rest-assured/pom.xml +++ b/rest-assured/pom.xml @@ -71,12 +71,6 @@ ${logback.version} - - commons-logging - commons-logging - ${commons-logging.version} - - org.apache.httpcomponents httpcore @@ -151,6 +145,12 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + commons-logging + commons-logging + + @@ -184,6 +184,12 @@ com.github.fge json-schema-core ${json-schema-core.version} + + + commons-logging + commons-logging + + junit @@ -282,7 +288,6 @@ 3.5 - 1.2 3.2.2 4.4.5 diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml index e3231c4fb4..a6a9bb39b3 100644 --- a/rest-testing/pom.xml +++ b/rest-testing/pom.xml @@ -35,6 +35,12 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + commons-logging + commons-logging + + org.apache.httpcomponents diff --git a/resteasy/pom.xml b/resteasy/pom.xml index f0bd8298f5..eacde92353 100644 --- a/resteasy/pom.xml +++ b/resteasy/pom.xml @@ -67,6 +67,12 @@ org.jboss.resteasy resteasy-servlet-initializer ${resteasy.version} + + + commons-logging + commons-logging + + diff --git a/selenium-junit-testng/pom.xml b/selenium-junit-testng/pom.xml index b4490f779b..fceeb6eec6 100644 --- a/selenium-junit-testng/pom.xml +++ b/selenium-junit-testng/pom.xml @@ -56,6 +56,12 @@ org.seleniumhq.selenium selenium-java ${selenium-java.version} + + + commons-logging + commons-logging + + junit diff --git a/spring-akka/pom.xml b/spring-akka/pom.xml index 5965213e65..497022064c 100644 --- a/spring-akka/pom.xml +++ b/spring-akka/pom.xml @@ -12,6 +12,12 @@ org.springframework spring-context + + + commons-logging + commons-logging + + diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 076465f2f6..7fbb6acced 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -25,6 +25,12 @@ org.springframework spring-web + + + commons-logging + commons-logging + + org.springframework @@ -111,6 +117,12 @@ net.sf.jasperreports jasperreports ${jasperreports.version} + + + commons-logging + commons-logging + + diff --git a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java index 086492e15b..6eb13c18f6 100644 --- a/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java +++ b/spring-amqp-simple/src/main/java/com/baeldung/springamqpsimple/MessageConsumer.java @@ -14,4 +14,4 @@ public class MessageConsumer { public void receiveMessage(String message) { logger.info("Received Message: " + message); } -} +} \ No newline at end of file diff --git a/spring-amqp/pom.xml b/spring-amqp/pom.xml index bb26b2d15d..4eef6070c7 100755 --- a/spring-amqp/pom.xml +++ b/spring-amqp/pom.xml @@ -20,6 +20,12 @@ org.springframework.amqp spring-rabbit 1.6.6.RELEASE + + + commons-logging + commons-logging + + diff --git a/spring-apache-camel/pom.xml b/spring-apache-camel/pom.xml index 04d07426d3..0b1b10a730 100644 --- a/spring-apache-camel/pom.xml +++ b/spring-apache-camel/pom.xml @@ -35,6 +35,12 @@ org.apache.camel camel-spring ${env.camel.version} + + + commons-logging + commons-logging + + diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml index a92a0e8323..8885bd452c 100644 --- a/spring-batch/pom.xml +++ b/spring-batch/pom.xml @@ -27,6 +27,12 @@ org.springframework spring-oxm ${spring.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml index de76c86a24..78a0e05b77 100644 --- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml @@ -24,6 +24,12 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery 1.0.3.RELEASE + + + commons-logging + commons-logging + + org.springframework.boot diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml b/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml index 1c829a50df..00af49eaa8 100644 --- a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml @@ -24,6 +24,12 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery 1.0.3.RELEASE + + + commons-logging + commons-logging + + diff --git a/spring-core/pom.xml b/spring-core/pom.xml index 3b423104d7..b04f434481 100644 --- a/spring-core/pom.xml +++ b/spring-core/pom.xml @@ -25,6 +25,12 @@ org.springframework spring-core ${spring.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 316eb2f58b..49a222e93d 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -37,6 +37,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + junit @@ -72,6 +78,12 @@ org.hectorclient hector-core ${hector-core.version} + + + commons-logging + commons-logging + + com.datastax.cassandra diff --git a/spring-data-couchbase-2/pom.xml b/spring-data-couchbase-2/pom.xml index b3933d9fcd..26a9ffcf2d 100644 --- a/spring-data-couchbase-2/pom.xml +++ b/spring-data-couchbase-2/pom.xml @@ -14,6 +14,12 @@ org.springframework spring-context ${spring-framework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml index 8b06c0b36f..3216318665 100644 --- a/spring-data-dynamodb/pom.xml +++ b/spring-data-dynamodb/pom.xml @@ -94,6 +94,12 @@ com.amazonaws aws-java-sdk-dynamodb ${aws-java-sdk-dynamodb.version} + + + commons-logging + commons-logging + + com.github.derjust diff --git a/spring-data-elasticsearch/pom.xml b/spring-data-elasticsearch/pom.xml index f4a43fac09..513a0a591b 100644 --- a/spring-data-elasticsearch/pom.xml +++ b/spring-data-elasticsearch/pom.xml @@ -30,6 +30,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework.data diff --git a/spring-data-gemfire/pom.xml b/spring-data-gemfire/pom.xml index eb450ebc81..ab510bc2bc 100644 --- a/spring-data-gemfire/pom.xml +++ b/spring-data-gemfire/pom.xml @@ -60,6 +60,12 @@ org.springframework spring-context ${spring-context-version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 3352baa6aa..f5d7cf9eff 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -20,6 +20,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 7df48498e5..6f08fe293b 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -35,6 +35,12 @@ org.springframework.data spring-data-neo4j ${spring-data-neo4j.version} + + + commons-logging + commons-logging + + @@ -70,6 +76,12 @@ neo4j-server ${neo4j.version} test-jar + + + commons-logging + commons-logging + + @@ -95,6 +107,12 @@ org.springframework spring-test ${spring-test.version} + + + commons-logging + commons-logging + + diff --git a/spring-data-redis/pom.xml b/spring-data-redis/pom.xml index 720526932e..f006026c81 100644 --- a/spring-data-redis/pom.xml +++ b/spring-data-redis/pom.xml @@ -42,6 +42,12 @@ org.springframework spring-core ${spring.version} + + + commons-logging + commons-logging + + diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml index 0019c7ff9c..54fc0d3294 100644 --- a/spring-data-solr/pom.xml +++ b/spring-data-solr/pom.xml @@ -22,6 +22,12 @@ org.springframework spring-core ${spring.version} + + + commons-logging + commons-logging + + org.springframework.data diff --git a/spring-dispatcher-servlet/pom.xml b/spring-dispatcher-servlet/pom.xml index e4812485c1..b6210971ae 100644 --- a/spring-dispatcher-servlet/pom.xml +++ b/spring-dispatcher-servlet/pom.xml @@ -25,6 +25,12 @@ org.springframework spring-webmvc ${org.springframework.version} + + + commons-logging + commons-logging + + org.thymeleaf diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index a8254151aa..8733f8f2f4 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -15,11 +15,23 @@ org.springframework spring-web ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework spring-webmvc ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index f7b198a2b1..c45c9bb15e 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -14,6 +14,12 @@ org.springframework spring-context ${org.springframework.version} + + + commons-logging + commons-logging + + diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index dbacb3a60a..8ba0a3700c 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -14,6 +14,12 @@ org.springframework spring-context ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-hibernate5/pom.xml b/spring-hibernate5/pom.xml index 752cbdba1d..ed127c34c1 100644 --- a/spring-hibernate5/pom.xml +++ b/spring-hibernate5/pom.xml @@ -14,6 +14,12 @@ org.springframework spring-context ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml index a243f55507..34c40cb00f 100644 --- a/spring-integration/pom.xml +++ b/spring-integration/pom.xml @@ -96,6 +96,12 @@ org.springframework.integration spring-integration-core ${spring.integration.version} + + + commons-logging + commons-logging + + javax.activation diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml index e6c8ea6ef5..8d39da9733 100644 --- a/spring-jersey/pom.xml +++ b/spring-jersey/pom.xml @@ -134,6 +134,12 @@ httpclient ${httpclient.version} test + + + commons-logging + commons-logging + + diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml index de7c734316..da71725d8f 100644 --- a/spring-jms/pom.xml +++ b/spring-jms/pom.xml @@ -23,6 +23,12 @@ org.springframework spring-jms ${springframework.version} + + + commons-logging + commons-logging + + diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml index e067e9b47f..4dce21116f 100644 --- a/spring-jooq/pom.xml +++ b/spring-jooq/pom.xml @@ -35,6 +35,12 @@ org.springframework spring-context + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 3ca373acea..9ecbddb34d 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -16,6 +16,12 @@ org.springframework spring-orm ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-ldap/pom.xml b/spring-ldap/pom.xml index 55014897c4..123e72672a 100644 --- a/spring-ldap/pom.xml +++ b/spring-ldap/pom.xml @@ -107,6 +107,12 @@ spring-ldap-test ${spring-ldap.version} test + + + commons-logging + commons-logging + + diff --git a/spring-mvc-forms/pom.xml b/spring-mvc-forms/pom.xml index e5ffb52801..12b0ba7e7c 100644 --- a/spring-mvc-forms/pom.xml +++ b/spring-mvc-forms/pom.xml @@ -15,6 +15,12 @@ org.springframework spring-webmvc ${springframework.version} + + + commons-logging + commons-logging + + diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 5c8f6be6fa..f47b723beb 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -84,6 +84,12 @@ net.sourceforge.htmlunit htmlunit ${net.sourceforge.htmlunit} + + + commons-logging + commons-logging + + diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml index a004eae4d9..6e96775f26 100644 --- a/spring-mvc-simple/pom.xml +++ b/spring-mvc-simple/pom.xml @@ -27,11 +27,6 @@ javax.servlet-api 3.1.0 - - commons-logging - commons-logging - 1.2 - org.springframework spring-webmvc @@ -46,6 +41,12 @@ org.springframework spring-core ${springframework.version} + + + commons-logging + commons-logging + + javax.servlet.jsp diff --git a/spring-mvc-tiles/pom.xml b/spring-mvc-tiles/pom.xml index 400f79fbe1..684c3abec7 100644 --- a/spring-mvc-tiles/pom.xml +++ b/spring-mvc-tiles/pom.xml @@ -25,6 +25,12 @@ org.springframework spring-core ${springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-mvc-velocity/pom.xml b/spring-mvc-velocity/pom.xml index 0a9b3a016e..51348acd4a 100644 --- a/spring-mvc-velocity/pom.xml +++ b/spring-mvc-velocity/pom.xml @@ -26,6 +26,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework @@ -52,6 +58,12 @@ org.apache.velocity velocity-tools ${velocity-tools.version} + + + commons-logging + commons-logging + + diff --git a/spring-mvc-web-vs-initializer/pom.xml b/spring-mvc-web-vs-initializer/pom.xml index 45ead333f4..1d02039ead 100644 --- a/spring-mvc-web-vs-initializer/pom.xml +++ b/spring-mvc-web-vs-initializer/pom.xml @@ -24,6 +24,12 @@ org.springframework spring-web + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 60da3404c9..142b400e5f 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -16,6 +16,12 @@ org.springframework spring-web ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework @@ -116,7 +122,11 @@ com.fasterxml.jackson.core jackson-databind - + + commons-logging + commons-logging + + diff --git a/spring-spel/pom.xml b/spring-spel/pom.xml index c3817ce2bd..5bb8480715 100644 --- a/spring-spel/pom.xml +++ b/spring-spel/pom.xml @@ -31,6 +31,12 @@ org.springframework spring-context ${springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml index f04d706d47..d7e7027023 100644 --- a/spring-state-machine/pom.xml +++ b/spring-state-machine/pom.xml @@ -25,6 +25,12 @@ org.springframework spring-test 4.3.7.RELEASE + + + commons-logging + commons-logging + + junit diff --git a/spring-userservice/pom.xml b/spring-userservice/pom.xml index 0f3ed96c4e..58a7cf748f 100644 --- a/spring-userservice/pom.xml +++ b/spring-userservice/pom.xml @@ -127,6 +127,12 @@ org.springframework spring-core ${org.springframework.version} + + + commons-logging + commons-logging + + org.springframework diff --git a/struts2/pom.xml b/struts2/pom.xml index ca5a682f9d..e9c321f908 100644 --- a/struts2/pom.xml +++ b/struts2/pom.xml @@ -63,6 +63,12 @@ org.springframework spring-core 4.3.6.RELEASE + + + commons-logging + commons-logging + + \ No newline at end of file diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml index 07c5d9e863..c4c66ddb44 100644 --- a/video-tutorials/jackson-annotations/pom.xml +++ b/video-tutorials/jackson-annotations/pom.xml @@ -93,6 +93,12 @@ rest-assured 3.0.1 test + + + commons-logging + commons-logging + +