[ofbiz-framework] 02/03: Improved: Remove unnecessary explicit Tomcat dependencies (OFBIZ-11300)

[mthl]

This is an automated email from the ASF dual-hosted git repository.

mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit d78a0963b579d7e5d6866682f9568c41ffcd0c9f
Author: Mathieu Lirzin <mathieu.lir...@nereide.fr>
AuthorDate: Wed Nov 27 16:28:57 2019 +0100

    Improved: Remove unnecessary explicit Tomcat dependencies (OFBIZ-11300)
    
    Tomcat already provides the Servlet and JSP Java EE related interfaces
    so there is no need to explicitly add the ‘javax...’ dependencies.
    
    Additionally ‘tomcat-catalina-ha’ depends on ‘tomcat-catalina’ and
    ‘tomcat-tribes’ so we can make those dependencies implicit.
    
    ‘axis2-kernel’ is now placed after ‘tomcat-qa’ in the dependencies
    block to ensure that we use the Servlet interfaces provided by Tomcat.
---
 build.gradle | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index da4e02e..cb9356b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,12 +170,8 @@ dependencies {
     implementation 'commons-net:commons-net:3.6'
     implementation 'commons-validator:commons-validator:1.6'
     implementation 'de.odysseus.juel:juel-impl:2.2.7'
-    implementation 'javax.el:javax.el-api:3.0.1-b06'
-    implementation 'javax.servlet:javax.servlet-api:4.0.1'
-    implementation 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
     implementation 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
     implementation 'org.apache.ant:ant-junit:1.10.7'
-    implementation 'org.apache.axis2:axis2-kernel:1.7.9'
     implementation 'org.apache.commons:commons-collections4:4.4'
     implementation 'org.apache.commons:commons-csv:1.7'
     implementation 'org.apache.commons:commons-dbcp2:2.7.0'
@@ -190,9 +186,8 @@ dependencies {
     implementation 'org.apache.tika:tika-core:1.22'
     implementation 'org.apache.tika:tika-parsers:1.22'
     implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.27' // Remember 
to change the version number in javadoc.options block
-    implementation 'org.apache.tomcat:tomcat-catalina:9.0.27'
     implementation 'org.apache.tomcat:tomcat-jasper:9.0.27'
-    implementation 'org.apache.tomcat:tomcat-tribes:9.0.27'
+    implementation 'org.apache.axis2:axis2-kernel:1.7.9'
     implementation 'org.apache.xmlgraphics:fop:2.3'
     implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'