You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ki...@apache.org on 2022/02/28 02:18:54 UTC
[incubator-seatunnel] branch dev updated: [Improve][Build]exclude org.glassfish.web:javax.servlet.jsp (#1350)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new e98235d [Improve][Build]exclude org.glassfish.web:javax.servlet.jsp (#1350)
e98235d is described below
commit e98235dd14812fccbb9572dc3b8d09c7d9ec1a63
Author: Kirs <ki...@apache.org>
AuthorDate: Mon Feb 28 10:18:46 2022 +0800
[Improve][Build]exclude org.glassfish.web:javax.servlet.jsp (#1350)
* [Improve][Build]exclude org.glassfish.web:javax.servlet.jsp
`org.glassfish.web:javax.servlet.jsp` doesn't seem needed,
since `hbase-server` is pulled in only for `org.apache.hadoop.hbase.security.token.TokenUtil` class.
* Delete the related license
---
pom.xml | 12 ++++++++++++
seatunnel-dist/release-docs/LICENSE | 2 --
tools/dependencies/known-dependencies.txt | 2 --
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 714d69c..c271d2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,6 +272,12 @@
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-spark</artifactId>
<version>${phoenix-spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -344,6 +350,12 @@
<groupId>org.apache.hbase.connectors.spark</groupId>
<artifactId>hbase-spark</artifactId>
<version>${hbase-spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/seatunnel-dist/release-docs/LICENSE b/seatunnel-dist/release-docs/LICENSE
index dc45443..e07c7bc 100644
--- a/seatunnel-dist/release-docs/LICENSE
+++ b/seatunnel-dist/release-docs/LICENSE
@@ -852,7 +852,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(CDDL/GPLv2+CE) JavaMail API (com.sun.mail:javax.mail:1.5.6 - http://javamail.java.net/javax.mail)
(CDDL + GPLv2 with classpath exception) Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
(CDDL + GPLv2 with classpath exception) Java Servlet API (javax.servlet:servlet-api:2.5 - http://servlet-spec.java.net)
- (CDDL + GPLv2 with classpath exception) JSP implementation (org.glassfish.web:javax.servlet.jsp:2.3.2 - http://jsp.java.net)
(CDDL + GPLv2 with classpath exception) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:2.3.1 - http://jsp.java.net)
(CDDL + GPLv2 with classpath exception) JavaServer Pages(TM) API (javax.servlet.jsp:javax.servlet.jsp-api:2.1 - http://jsp.java.net)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:2.0.1 - http://jax-rs-spec.java.net)
@@ -894,7 +893,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
(CDDL + GPLv2 with classpath exception) ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.5.0-b32 - https://hk2.java.net/hk2-locator)
(CDDL + GPLv2 with classpath exception) HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.4.0-b34 - https://hk2.java.net/hk2-utils)
(CDDL + GPLv2 with classpath exception) HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.5.0-b32 - https://hk2.java.net/hk2-utils)
- (CDDL + GPLv2 with classpath exception) Expression Language 3.0 (org.glassfish:javax.el:3.0.1-b12 - http://uel.java.net)
(CDDL + GPLv2 with classpath exception) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:2.4.0-b34 - https://hk2.java.net/external/javax.inject)
(CDDL + GPLv2 with classpath exception) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:2.5.0-b32 - https://hk2.java.net/external/javax.inject)
(CDDL 1.1) (GPL2 w/ CPE) JAXB RI (com.sun.xml.bind:jaxb-impl:2.2.3-1 - http://jaxb.java.net/)
diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt
index 63c92d3..7761a8f 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -328,14 +328,12 @@ javax.activation-api-1.2.0.jar
javax.annotation-api-1.2.jar
javax.annotation-api-1.3.2.jar
javax.el-3.0.0.jar
-javax.el-3.0.1-b12.jar
javax.el-api-3.0.0.jar
javax.inject-1.jar
javax.inject-2.4.0-b34.jar
javax.inject-2.5.0-b32.jar
javax.mail-1.5.6.jar
javax.servlet-api-3.1.0.jar
-javax.servlet.jsp-2.3.2.jar
javax.servlet.jsp-api-2.3.1.jar
javax.ws.rs-api-2.0.1.jar
jaxb-api-2.2.11.jar