This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 8f7549a438 NIFI-11372 Removed unused javax.el dependency from Registry
8f7549a438 is described below
commit 8f7549a438b575d2735d4ea2283cec70cad4435e
Author: exceptionfactory <[email protected]>
AuthorDate: Sat Apr 1 18:22:01 2023 -0500
NIFI-11372 Removed unused javax.el dependency from Registry
- Removed unnecessary JSTL dependency and reference from Documentation JSP
Signed-off-by: Pierre Villard <[email protected]>
This closes #7110.
---
nifi-registry/nifi-registry-assembly/NOTICE | 2 --
nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml | 4 ----
.../nifi-registry-web-api/src/main/resources/META-INF/NOTICE | 1 -
nifi-registry/nifi-registry-core/nifi-registry-web-docs/pom.xml | 7 -------
.../nifi-registry-web-docs/src/main/resources/META-INF/NOTICE | 1 -
.../src/main/webapp/WEB-INF/jsp/documentation.jsp | 1 -
nifi-registry/nifi-registry-core/pom.xml | 5 -----
.../nifi-registry-toolkit/nifi-registry-toolkit-assembly/NOTICE | 2 --
8 files changed, 23 deletions(-)
diff --git a/nifi-registry/nifi-registry-assembly/NOTICE
b/nifi-registry/nifi-registry-assembly/NOTICE
index 9a3925e883..41a4e721ed 100644
--- a/nifi-registry/nifi-registry-assembly/NOTICE
+++ b/nifi-registry/nifi-registry-assembly/NOTICE
@@ -275,7 +275,6 @@ The following binary components are provided under the
Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7
- https://kenai.com/projects/javamail/mail)
(CDDL 1.1) (GPL2 w/ CPE) Java Servlet API
(javax.servlet:javax.servlet-api:jar:3.1.0 - https://servlet-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages Standard Tag Library
(javax.servlet.jsp.jstl:jstl:jar:1.2 - https://javaee.github.io/jstl-api/)
(CDDL 1.1) (GPL2 w/ CPE) javax.annotation API
(javax.annotation:javax.annotation-api:jar:1.2 -
https://jcp.org/en/jsr/detail?id=250)
(CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged
(org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) asm-all-repackaged
(org.glassfish.hk2.external:asm-all-repackaged:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
@@ -291,7 +290,6 @@ The following binary components are provided under the
Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) spring-bridge
(org.glassfish.hk2:spring-bridge:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle
(org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 -
https://hk2.java.net/external/javax.inject)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api
(javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) javax.el (org.glassfish:javax.el:jar:3.0.1-b08 -
https://github.com/javaee/el-spec)
(CDDL 1.1) (GPL2 w/ CPE) jersey-bean-validation
(org.glassfish.jersey.ext:jersey-bean-validation:jar:2.27 -
https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client
(org.glassfish.jersey.core:jersey-client:jar:2.27 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-common
(org.glassfish.jersey.core:jersey-common:jar:2.27 - https://jersey.github.io/)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index cb0f0ea5ac..1597a1296e 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -274,10 +274,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
<!-- We're using spring-boot-starter-data-jpa to bring in
spring-data-jdbc and a few other dependencies, but
we aren't actually using any JPA dependencies, this also brings in
the standard Spring dependencies for the backend -->
<dependency>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/resources/META-INF/NOTICE
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/resources/META-INF/NOTICE
index e9ac896473..27ab6fc82c 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/resources/META-INF/NOTICE
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/resources/META-INF/NOTICE
@@ -159,7 +159,6 @@ The following binary components are provided under the
Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) spring-bridge
(org.glassfish.hk2:spring-bridge:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle
(org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 -
https://hk2.java.net/external/javax.inject)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api
(javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) javax.el (org.glassfish:javax.el:jar:3.0.1-b08 -
https://github.com/javaee/el-spec)
(CDDL 1.1) (GPL2 w/ CPE) jersey-bean-validation
(org.glassfish.jersey.ext:jersey-bean-validation:jar:2.29.1 -
https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client
(org.glassfish.jersey.core:jersey-client:jar:2.27 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-common
(org.glassfish.jersey.core:jersey-common:jar:2.29.1 - https://jersey.github.io/)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/pom.xml
index 0155980ce9..556717a0ed 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/pom.xml
@@ -57,12 +57,5 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
- <!-- Needed this dependency to resolve the taglib inside
documentation.jsp, otherwise an error is encountered
- "The absolute uri: http://java.sun.com/jsp/jstl/core cannot be
resolved" -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
</dependencies>
</project>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/resources/META-INF/NOTICE
b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/resources/META-INF/NOTICE
index 54829e631c..d11da1f58c 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/resources/META-INF/NOTICE
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/resources/META-INF/NOTICE
@@ -11,4 +11,3 @@ Common Development and Distribution License 1.1
The following binary components are provided under the Common Development and
Distribution License 1.1. See project link for details.
(CDDL 1.1) (GPL2 w/ CPE) Java Servlet API
(javax.servlet:javax.servlet-api:jar:3.1.0 - https://servlet-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages Standard Tag Library
(javax.servlet.jsp.jstl:jstl:jar:1.2 - https://javaee.github.io/jstl-api/)
\ No newline at end of file
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index fbeb9cf840..592039fc6a 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -15,7 +15,6 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<!DOCTYPE html>
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";>
<head>
diff --git a/nifi-registry/nifi-registry-core/pom.xml
b/nifi-registry/nifi-registry-core/pom.xml
index 4b7b50ef4c..5e1842c5bc 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -101,11 +101,6 @@
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.1-b08</version>
- </dependency>
<!-- open id connect - override transitive dependency version
ranges -->
<dependency>
<groupId>com.nimbusds</groupId>
diff --git
a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/NOTICE
b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/NOTICE
index 9a68ec0834..195ca2f03a 100644
--- a/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/NOTICE
+++ b/nifi-registry/nifi-registry-toolkit/nifi-registry-toolkit-assembly/NOTICE
@@ -193,7 +193,6 @@ The following binary components are provided under the
Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7
- https://kenai.com/projects/javamail/mail)
(CDDL 1.1) (GPL2 w/ CPE) Java Servlet API
(javax.servlet:javax.servlet-api:jar:3.1.0 - https://servlet-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages Standard Tag Library
(javax.servlet.jsp.jstl:jstl:jar:1.2 - https://javaee.github.io/jstl-api/)
(CDDL 1.1) (GPL2 w/ CPE) javax.annotation API
(javax.annotation:javax.annotation-api:jar:1.2 -
https://jcp.org/en/jsr/detail?id=250)
(CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged
(org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) asm-all-repackaged
(org.glassfish.hk2.external:asm-all-repackaged:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
@@ -209,7 +208,6 @@ The following binary components are provided under the
Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) spring-bridge
(org.glassfish.hk2:spring-bridge:jar:2.5.0-b42 -
https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle
(org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 -
https://hk2.java.net/external/javax.inject)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api
(javax.ws.rs:javax.ws.rs-api:jar:2.1 - https://jax-rs-spec.java.net)
- (CDDL 1.1) (GPL2 w/ CPE) javax.el (org.glassfish:javax.el:jar:3.0.1-b08 -
https://github.com/javaee/el-spec)
(CDDL 1.1) (GPL2 w/ CPE) jersey-bean-validation
(org.glassfish.jersey.ext:jersey-bean-validation:jar:2.26 -
https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client
(org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-common
(org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/)
