Skip to content

Commit 0fc0ce7

Browse files
committed
Drop deprecated dependencies on Log4j, JRuby, JExcel, Burlap, Commons Pool/DBCP
This commit also removes outdated support classes for Oracle, GlassFish, JBoss. Issue: SPR-14429
1 parent fb5a096 commit 0fc0ce7

File tree

46 files changed

+24
-4916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+24
-4916
lines changed

build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,10 @@ configure(allprojects) { project ->
5454
ext.javamailVersion = "1.5.5"
5555
ext.jettyVersion = "9.3.10.v20160621"
5656
ext.jodaVersion = "2.9.4"
57-
ext.jrubyVersion = "1.7.25" // JRuby 9000 only supported through JSR-223 (StandardScriptFactory)
5857
ext.jtaVersion = "1.2"
5958
ext.junitVersion = "4.12"
6059
ext.junitJupiterVersion = '5.0.0-SNAPSHOT'
6160
ext.junitPlatformVersion = '1.0.0-SNAPSHOT'
62-
ext.log4jVersion = "1.2.17"
6361
ext.nettyVersion = "4.1.1.Final"
6462
ext.okhttpVersion = "2.7.5"
6563
ext.okhttp3Version = "3.3.1"
@@ -189,8 +187,6 @@ configure(allprojects) { project ->
189187
"http://glassfish.java.net/nonav/docs/v3/api/",
190188
"http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
191189
"http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
192-
"http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
193-
"http://commons.apache.org/proper/commons-dbcp/apidocs/",
194190
"http://tiles.apache.org/tiles-request/apidocs/",
195191
"http://tiles.apache.org/framework/apidocs/",
196192
"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
@@ -348,7 +344,6 @@ project("spring-core") {
348344
compile("commons-logging:commons-logging:1.2")
349345
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
350346
optional("net.sf.jopt-simple:jopt-simple:5.0.2")
351-
optional("log4j:log4j:${log4jVersion}")
352347
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
353348
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
354349
testCompile("com.fasterxml.woodstox:woodstox-core:5.0.2") {
@@ -379,7 +374,6 @@ project("spring-beans") {
379374
optional("javax.inject:javax.inject:1")
380375
optional("javax.el:javax.el-api:2.2.5")
381376
optional("org.yaml:snakeyaml:${snakeyamlVersion}")
382-
testCompile("log4j:log4j:${log4jVersion}")
383377
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
384378
}
385379
}
@@ -419,7 +413,6 @@ project("spring-aop") {
419413
compile(files(project(":spring-core").cglibRepackJar))
420414
compile(files(project(":spring-core").objenesisRepackJar))
421415
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
422-
optional("commons-pool:commons-pool:1.6")
423416
optional("org.apache.commons:commons-pool2:2.4.2")
424417
optional("com.jamonapi:jamon:2.81")
425418
}
@@ -469,12 +462,10 @@ project("spring-context") {
469462
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
470463
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
471464
optional("org.beanshell:bsh:2.0b4")
472-
optional("org.jruby:jruby:${jrubyVersion}")
473465
testCompile("javax.inject:javax.inject-tck:1")
474466
testCompile("javax.el:javax.el-api:2.2.5")
475467
testCompile("org.glassfish.web:javax.el:2.2.6")
476468
testCompile("org.javamoney:moneta:1.1")
477-
testCompile("commons-dbcp:commons-dbcp:1.4")
478469
testCompile("org.apache.commons:commons-pool2:2.4.2")
479470
testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
480471
}
@@ -513,8 +504,6 @@ project("spring-messaging") {
513504
testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
514505
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
515506
testCompile("io.netty:netty-all:${nettyVersion}")
516-
testCompile("commons-dbcp:commons-dbcp:1.4")
517-
testCompile("log4j:log4j:${log4jVersion}")
518507
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
519508
testCompile("xmlunit:xmlunit:${xmlunitVersion}")
520509
}
@@ -692,7 +681,6 @@ project("spring-web") {
692681
optional("org.eclipse.jetty:jetty-server:${jettyVersion}") {
693682
exclude group: "javax.servlet", module: "javax.servlet-api"
694683
}
695-
optional("log4j:log4j:${log4jVersion}")
696684
optional("com.google.protobuf:protobuf-java:2.6.1")
697685
optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
698686
optional("javax.mail:javax.mail-api:${javamailVersion}")
@@ -727,7 +715,6 @@ project("spring-orm") {
727715
}
728716
optional("org.hibernate:hibernate-core:${hibernate5Version}")
729717
optional("javax.servlet:javax.servlet-api:3.0.1")
730-
testCompile("commons-dbcp:commons-dbcp:1.4")
731718
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
732719
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
733720
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
@@ -750,7 +737,6 @@ project("spring-webmvc") {
750737
optional(project(":spring-oxm")) // for MarshallingView
751738
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
752739
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
753-
optional("net.sourceforge.jexcelapi:jxl:2.6.12")
754740
optional("org.apache.poi:poi:${poiVersion}")
755741
optional("org.apache.poi:poi-ooxml:${poiVersion}")
756742
optional("org.freemarker:freemarker:${freemarkerVersion}")
@@ -808,7 +794,6 @@ project("spring-webmvc") {
808794
testCompile("commons-io:commons-io:1.3")
809795
testCompile("joda-time:joda-time:${jodaVersion}")
810796
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
811-
testCompile("org.jruby:jruby:${jrubyVersion}")
812797
testCompile("org.python:jython-standalone:2.5.3")
813798
testCompile("org.mozilla:rhino:1.7.7.1")
814799
testCompile("org.webjars:underscorejs:1.8.3")
@@ -855,7 +840,6 @@ project("spring-websocket") {
855840
testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
856841
testCompile("io.projectreactor:reactor-net:${reactorVersion}")
857842
testCompile("io.netty:netty-all:${nettyVersion}")
858-
testCompile("log4j:log4j:${log4jVersion}")
859843
testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
860844
}
861845
}
@@ -917,7 +901,6 @@ project("spring-test") {
917901
testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
918902
testCompile("javax.cache:cache-api:1.0.0")
919903
testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
920-
testRuntime("log4j:log4j:${log4jVersion}")
921904

922905
testRuntime("org.ehcache:ehcache:${ehcache3Version}")
923906
testRuntime("org.terracotta:management-model:2.0.0")

0 commit comments

Comments
 (0)