Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions c2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ limitations under the License.
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
9 changes: 0 additions & 9 deletions minifi/minifi-assembly/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -602,15 +602,6 @@ The following binary components are provided under the Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Inject API as OSGi bundle
(CDDL 1.1) (GPL2 w/ CPE) Jakarta WS REST Services API

************************
Common Development and Distribution License 1.0
************************

The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details.

(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp)
(CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided)

************************
Eclipse Public License 1.0
************************
Expand Down
4 changes: 2 additions & 2 deletions minifi/minifi-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ limitations under the License.
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ The following binary components are provided under the Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) hk2-runlevel (org.glassfish.hk2:hk2-runlevel:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(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) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net)
(CDDL 1.1) (GPL2 w/ CPE) Jakarta RESTful Web Services (jakarta.ws.rs:jakarta.ws.rs-api:jar:4.0.0 - https://jakarta.ee/specifications/restful-ws/)

************************
Eclipse Public License 1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,14 @@ The following binary components are provided under the Common Development and Di
(CDDL 1.1) (GPL2 w/ CPE) class-model (org.glassfish.hk2:class-model: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/)
(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) 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) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail)
(CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net)

************************
Common Development and Distribution License 1.0
************************

The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details.

(CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided)
(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)

************************
Eclipse Public License 1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,14 @@ The following binary components are provided under the Common Development and Di

(CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.19 - https://jersey.java.net/jersey-core/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/)
(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) Javax JMS Api (javax.jms:javax.jms-api:jar:2.0.1 - https://java.net/projects/jms-spec/pages/Home)
(CDDL 1.1) (GPL2 w/ CPE) Jakarta RESTful Web Services (jakarta.ws.rs:jakarta.ws.rs-api:jar:4.0.0 - https://jakarta.ee/specifications/restful-ws/)

*****************
Common Development and Distribution License v1.0:
*****************

The following binary components are provided under the Common Development and Distribution License v1.0. See project link for details.

(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp)
(CDDL 1.0) JSR311 API (javax.ws.rs:jsr311-api:jar:1.1.1 - https://jsr311.dev.java.net)

*****************
Mozilla Public License v2.0
Expand All @@ -162,4 +159,23 @@ The following binary components are provided to the 'Public Domain'. See projec
(Public Domain) XZ for Java (org.tukaani:xz:jar:1.5 - https://tukaani.org/xz/java.html


************************
Eclipse Public License 2.0
************************

The following binary components are provided under the Eclipse Public License 2.0.

(EPL 2.0) Jakarta Mail API (jakarta.mail:jakarta.mail-api:jar:2.1.4)
(EPL 2.0) Jakarta Mail (com.sun.mail:jakarta.mail:jar:2.0.2)

************************
Eclipse Distribution License 1.0
************************

The following binary components are provided under the Eclipse Distribution License 1.0.

(EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.1.3)
(EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:2.0.1)
(EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:4.0.2)


87 changes: 29 additions & 58 deletions nifi-assembly/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,14 @@ The following binary components are provided under the Apache Software License v
Jetty Web Container
Copyright 1995-2019 Mort Bay Consulting Pty Ltd.

(ASLv2) MortBay Apache EL
The following NOTICE information applies:
org.mortbay.jasper:mortbay-apache-el

(ASLv2) MortBay Apache JSP
The following NOTICE information applies:
org.mortbay.jasper:mortbay-apache-jsp

(ASLv2) Apache Tomcat
The following NOTICE information applies:
Apache Tomcat
Expand Down Expand Up @@ -1370,7 +1378,7 @@ The following binary components are provided under the Apache Software License v

This product includes software developed by The Apache Software Foundation (http://www.apache.org/).

This product includes Jersey (https://jersey.java.net/)
This product includes Jersey (https://jersey.github.io/)
Copyright (c) 2010-2014 Oracle and/or its affiliates.

This project includes software copyrighted by Microsoft Corporation and
Expand Down Expand Up @@ -2319,7 +2327,7 @@ The following binary components are provided under the Apache Software License v
google/dagger
Copyright 2012 The Dagger Authors

(ASLv2) atinject (javax.inject:javax.inject)
(ASLv2) Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api)
The following NOTICE information applies:
atinject
Copyright
Expand All @@ -2345,56 +2353,6 @@ 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) 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/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (org.glassfish.jersey.core:jersey-server:jar:2.26 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) hk2 (org.glassfish.hk2:hk2:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-config (org.glassfish.hk2:hk2-config:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-core (org.glassfish.hk2:hk2-core:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) hk2-runlevel (org.glassfish.hk2:hk2-runlevel:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) config-types (org.glassfish.hk2:config-types:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
(CDDL 1.1) (GPL2 w/ CPE) class-model (org.glassfish.hk2:class-model: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/)
(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) 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) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.19 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.19 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.19 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.22.1 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.22.1 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:2.22.1 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.22.1 - https://jersey.github.io/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.9 - https://jersey.java.net/jersey-client/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.9 - https://jersey.java.net/jersey-core/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.9 - https://jersey.java.net/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:jar:1.9 - https://jersey.java.net/)
(CDDL 1.1) (GPL2 w/ CPE) jersey-guice (com.sun.jersey.contribs:jersey-guice:jar:1.9 - https://jersey.java.net/)

(CDDL 1.1) (GPL2 w/ CPE) JavaMail API
(CDDL 1.1) (GPL2 w/ CPE) JSP Implementation
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation
(CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API
(CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Servlet API
(CDDL 1.1) (GPL2 w/ CPE) JMS API
(CDDL 1.1) (GPL2 w/ CPE) Jakarta JSON Processing API
(CDDL 1.1) (GPL2 w/ CPE) Jakarta JSON Processing Default Provider
(CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Annotation API
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Inject API as OSGi bundle
(CDDL 1.1) (GPL2 w/ CPE) Jakarta WS REST Services API
(CDDL 1.1) JSR 356: Java API for WebSocket
(CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)

************************
Expand All @@ -2403,10 +2361,7 @@ Common Development and Distribution License 1.0

The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details.

(CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided)
(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
(CDDL 1.0) JHighlight (org.codelibs:jhighlight:1.0.2 - https://github.com/codelibs/jhighlight)
(CDDL 1.0) Javax Transaction API (javax.transaction:transaction-api:jar:1.1 - no url available)

************************
Creative Commons Attribution-ShareAlike 3.0
Expand All @@ -2429,7 +2384,6 @@ The following binary components are provided under the Eclipse Public License 1.
(EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0 - https://github.com/eclipse/paho.mqtt.java)
(EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/)
(EPL 1.0) Common Service Data Objects (org.eclipse.persistence:commonj.sdo:2.1.1 - http://www.eclipse.org/eclipselink/)
(EPL 1.0) Java Persistence API (org.eclipse.persistence:javax.persistence:2.1.0 - http://www.eclipse.org/eclipselink/)
(EPL 1.0) JaCoCo Java Code Coverage Library ( org.jacoco ) http://www.eclemma.org/jacoco
(EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org)

Expand All @@ -2442,14 +2396,31 @@ The following binary components are provided under the Eclipse Public License 2.
(EPL 2.0) Jakarta Mail API (jakarta.mail:jakarta.mail-api:jar:2.0.1)
(EPL 2.0) Jakarta Mail (com.sun.mail:jakarta.mail:jar:2.0.1)
(EPL 2.0) Tyrus Standalone Client (org.glassfish.tyrus.bundles:tyrus-standalone-client:jar:2.1.3)
(EPL 2.0) Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:jar:3.0.0)
(EPL 2.0) Jakarta RESTful Web Services (jakarta.ws.rs:jakarta.ws.rs-api:jar:4.0.0)
(EPL 2.0) OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:jar:1.0.3)
(EPL 2.0) jersey-client (org.glassfish.jersey.core:jersey-client:jar:4.0.0)
(EPL 2.0) jersey-common (org.glassfish.jersey.core:jersey-common:jar:4.0.0)
(EPL 2.0) jersey-container-servlet (org.glassfish.jersey.containers:jersey-container-servlet:jar:4.0.0)
(EPL 2.0) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:jar:4.0.0)
(EPL 2.0) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:4.0.0)
(EPL 2.0) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:4.0.0)
(EPL 2.0) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:4.0.0)
(EPL 2.0) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:4.0.0)
(EPL 2.0) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:4.0.0)
(EPL 2.0) jersey-server (org.glassfish.jersey.core:jersey-server:jar:4.0.0)
(EPL 2.0) hk2 (org.glassfish.hk2:hk2:jar:4.0.0)
(EPL 2.0) hk2-api (org.glassfish.hk2:hk2-api:jar:4.0.0)
(EPL 2.0) hk2-utils (org.glassfish.hk2:hk2-utils:jar:4.0.0)
(EPL 2.0) hk2-locator (org.glassfish.hk2:hk2-locator:jar:4.0.0)

************************
Eclipse Distribution License 1.0
************************

The following binary components are provided under the Eclipse Distribution License 1.0.

(EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.0.1)
(EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.1.3)
(EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:2.0.1)
(EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3)
(EDL 1.0) JAXB (JSR 222) Reference Implementation (org.glassfish.jaxb:jaxb-runtime:jar:2.3.5)
Expand Down Expand Up @@ -2536,4 +2507,4 @@ For the binary distribution of nifi-standard-content-viewer see its 3rdpartylice
for additional license and notice information.

For the binary distribution of nifi-update-attribute-ui see its 3rdpartylicenses.txt
for additional license and notice information.
for additional license and notice information.
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
final URI redirectUri = requestUriBuilder.build();

final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
httpServletResponse.sendRedirect(redirectUri.toString());
httpServletResponse.setStatus(HttpServletResponse.SC_FOUND);
httpServletResponse.setHeader("Location", redirectUri.toString());
} else {
filterChain.doFilter(request, response);
}
Expand Down
6 changes: 3 additions & 3 deletions nifi-docker/dockerhub/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<id>docker</id>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions nifi-docker/dockermaven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<id>docker</id>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation-api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
Loading