Skip to content

Commit fed5162

Browse files
pvillard31exceptionfactory
pvillard31
and
exceptionfactory
committed
NIFI-14910 NIFI-14911 Upgraded Jetty to 12.1.0 and moved to Jakarta EE11
- Upgraded Jersey to 4.0.0-M4 - Replaced sendRedirect() with Location Header and HTTP 302 to avoid URI fragment exceptions - Switched NiFi Registry integration tests to Tomcat to avoid Spring Boot 3.5 conflicts with Jetty 12.1 This closes #10249 Co-authored-by: David Handermann <[email protected]> Signed-off-by: David Handermann <[email protected]>
1 parent 1391928 commit fed5162

File tree

93 files changed

+690
-587
lines changed

Some content is hidden

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

93 files changed

+690
-587
lines changed

‎c2/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ limitations under the License.
3535
<dependencyManagement>
3636
<dependencies>
3737
<dependency>
38-
<groupId>javax.validation</groupId>
39-
<artifactId>validation-api</artifactId>
40-
<version>2.0.1.Final</version>
38+
<groupId>jakarta.validation</groupId>
39+
<artifactId>jakarta.validation-api</artifactId>
40+
<version>3.1.1</version>
4141
</dependency>
4242
</dependencies>
4343
</dependencyManagement>

‎minifi/minifi-assembly/NOTICE‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -602,15 +602,6 @@ The following binary components are provided under the Common Development and Di
602602
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Inject API as OSGi bundle
603603
(CDDL 1.1) (GPL2 w/ CPE) Jakarta WS REST Services API
604604

605-
************************
606-
Common Development and Distribution License 1.0
607-
************************
608-
609-
The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details.
610-
611-
(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - https://java.sun.com/products/javabeans/jaf/index.jsp)
612-
(CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided)
613-
614605
************************
615606
Eclipse Public License 1.0
616607
************************

‎minifi/minifi-assembly/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ limitations under the License.
348348
<artifactId>jetty-server</artifactId>
349349
</dependency>
350350
<dependency>
351-
<groupId>org.eclipse.jetty.ee10</groupId>
352-
<artifactId>jetty-ee10-servlet</artifactId>
351+
<groupId>org.eclipse.jetty.ee11</groupId>
352+
<artifactId>jetty-ee11-servlet</artifactId>
353353
</dependency>
354354
<dependency>
355355
<groupId>org.eclipse.jetty</groupId>

‎minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/src/main/resources/META-INF/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ The following binary components are provided under the Common Development and Di
159159
(CDDL 1.1) (GPL2 w/ CPE) hk2-runlevel (org.glassfish.hk2:hk2-runlevel:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
160160
(CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
161161
(CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
162-
(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)
162+
(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/)
163163

164164
************************
165165
Eclipse Public License 1.0

‎minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,14 @@ The following binary components are provided under the Common Development and Di
154154
(CDDL 1.1) (GPL2 w/ CPE) class-model (org.glassfish.hk2:class-model:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
155155
(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/)
156156
(CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
157-
(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)
158157
(CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
159-
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail)
160-
(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)
161158

162159
************************
163160
Common Development and Distribution License 1.0
164161
************************
165162

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

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

171166
************************
172167
Eclipse Public License 1.0

‎minifi/minifi-nar-bundles/minifi-standard-nar/src/main/resources/META-INF/NOTICE‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,14 @@ The following binary components are provided under the Common Development and Di
133133

134134
(CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.19 - https://jersey.java.net/jersey-core/)
135135
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.19 - https://jersey.java.net/jersey-client/)
136-
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - https://kenai.com/projects/javamail/mail)
137-
(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)
136+
(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/)
138137

139138
*****************
140139
Common Development and Distribution License v1.0:
141140
*****************
142141

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

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

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

164161

162+
************************
163+
Eclipse Public License 2.0
164+
************************
165+
166+
The following binary components are provided under the Eclipse Public License 2.0.
167+
168+
(EPL 2.0) Jakarta Mail API (jakarta.mail:jakarta.mail-api:jar:2.1.4)
169+
(EPL 2.0) Jakarta Mail (com.sun.mail:jakarta.mail:jar:2.0.2)
170+
171+
************************
172+
Eclipse Distribution License 1.0
173+
************************
174+
175+
The following binary components are provided under the Eclipse Distribution License 1.0.
176+
177+
(EDL 1.0) Jakarta Activation API (jakarta.activation:jakarta.activation-api:jar:2.1.3)
178+
(EDL 1.0) Jakarta Activation (com.sun.activation:jakarta.activation:jar:2.0.1)
179+
(EDL 1.0) Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:jar:4.0.2)
180+
165181

‎nifi-assembly/NOTICE‎

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,14 @@ The following binary components are provided under the Apache Software License v
656656
Jetty Web Container
657657
Copyright 1995-2019 Mort Bay Consulting Pty Ltd.
658658

659+
(ASLv2) MortBay Apache EL
660+
The following NOTICE information applies:
661+
org.mortbay.jasper:mortbay-apache-el
662+
663+
(ASLv2) MortBay Apache JSP
664+
The following NOTICE information applies:
665+
org.mortbay.jasper:mortbay-apache-jsp
666+
659667
(ASLv2) Apache Tomcat
660668
The following NOTICE information applies:
661669
Apache Tomcat
@@ -1370,7 +1378,7 @@ The following binary components are provided under the Apache Software License v
13701378

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

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

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

2322-
(ASLv2) atinject (javax.inject:javax.inject)
2330+
(ASLv2) Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api)
23232331
The following NOTICE information applies:
23242332
atinject
23252333
Copyright
@@ -2345,56 +2353,6 @@ Common Development and Distribution License 1.1
23452353

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

2348-
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.26 - https://jersey.github.io/)
2349-
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.26 - https://jersey.github.io/)
2350-
(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/)
2351-
(CDDL 1.1) (GPL2 w/ CPE) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.26 - https://jersey.github.io/)
2352-
(CDDL 1.1) (GPL2 w/ CPE) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:2.26 - https://jersey.github.io/)
2353-
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:2.26 - https://jersey.github.io/)
2354-
(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/)
2355-
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:2.26 - https://jersey.github.io/)
2356-
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (org.glassfish.jersey.core:jersey-server:jar:2.26 - https://jersey.github.io/)
2357-
(CDDL 1.1) (GPL2 w/ CPE) hk2 (org.glassfish.hk2:hk2:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2358-
(CDDL 1.1) (GPL2 w/ CPE) hk2-api (org.glassfish.hk2:hk2-api:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2359-
(CDDL 1.1) (GPL2 w/ CPE) hk2-utils (org.glassfish.hk2:hk2-utils:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2360-
(CDDL 1.1) (GPL2 w/ CPE) hk2-locator (org.glassfish.hk2:hk2-locator:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2361-
(CDDL 1.1) (GPL2 w/ CPE) hk2-config (org.glassfish.hk2:hk2-config:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2362-
(CDDL 1.1) (GPL2 w/ CPE) hk2-core (org.glassfish.hk2:hk2-core:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2363-
(CDDL 1.1) (GPL2 w/ CPE) hk2-runlevel (org.glassfish.hk2:hk2-runlevel:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2364-
(CDDL 1.1) (GPL2 w/ CPE) config-types (org.glassfish.hk2:config-types:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2365-
(CDDL 1.1) (GPL2 w/ CPE) class-model (org.glassfish.hk2:class-model:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2366-
(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/)
2367-
(CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/)
2368-
(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)
2369-
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.19 - https://jersey.github.io/)
2370-
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.19 - https://jersey.github.io/)
2371-
(CDDL 1.1) (GPL2 w/ CPE) jersey-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.19 - https://jersey.github.io/)
2372-
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (org.glassfish.jersey.core:jersey-client:jar:2.22.1 - https://jersey.github.io/)
2373-
(CDDL 1.1) (GPL2 w/ CPE) jersey-common (org.glassfish.jersey.core:jersey-common:jar:2.22.1 - https://jersey.github.io/)
2374-
(CDDL 1.1) (GPL2 w/ CPE) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:2.22.1 - https://jersey.github.io/)
2375-
(CDDL 1.1) (GPL2 w/ CPE) jersey-guava (org.glassfish.jersey.bundles.repackaged:jersey-guava:jar:2.22.1 - https://jersey.github.io/)
2376-
(CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:jar:1.9 - https://jersey.java.net/jersey-client/)
2377-
(CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:jar:1.9 - https://jersey.java.net/jersey-core/)
2378-
(CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:jar:1.9 - https://jersey.java.net/)
2379-
(CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:jar:1.9 - https://jersey.java.net/)
2380-
(CDDL 1.1) (GPL2 w/ CPE) jersey-guice (com.sun.jersey.contribs:jersey-guice:jar:1.9 - https://jersey.java.net/)
2381-
2382-
(CDDL 1.1) (GPL2 w/ CPE) JavaMail API
2383-
(CDDL 1.1) (GPL2 w/ CPE) JSP Implementation
2384-
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages (TM) TagLib Implementation
2385-
(CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0
2386-
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) API
2387-
(CDDL 1.1) (GPL2 w/ CPE) Expression Language 3.0 API
2388-
(CDDL 1.1) (GPL2 w/ CPE) JavaServer Pages(TM) Standard Tag Library API
2389-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Servlet API
2390-
(CDDL 1.1) (GPL2 w/ CPE) JMS API
2391-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta JSON Processing API
2392-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta JSON Processing Default Provider
2393-
(CDDL 1.1) (GPL2 w/ CPE) OSGi resource locator bundle
2394-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Annotation API
2395-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta Inject API as OSGi bundle
2396-
(CDDL 1.1) (GPL2 w/ CPE) Jakarta WS REST Services API
2397-
(CDDL 1.1) JSR 356: Java API for WebSocket
23982356
(CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net)
23992357

24002358
************************
@@ -2403,10 +2361,7 @@ Common Development and Distribution License 1.0
24032361

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

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

24112366
************************
24122367
Creative Commons Attribution-ShareAlike 3.0
@@ -2429,7 +2384,6 @@ The following binary components are provided under the Eclipse Public License 1.
24292384
(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)
24302385
(EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/)
24312386
(EPL 1.0) Common Service Data Objects (org.eclipse.persistence:commonj.sdo:2.1.1 - http://www.eclipse.org/eclipselink/)
2432-
(EPL 1.0) Java Persistence API (org.eclipse.persistence:javax.persistence:2.1.0 - http://www.eclipse.org/eclipselink/)
24332387
(EPL 1.0) JaCoCo Java Code Coverage Library ( org.jacoco ) http://www.eclemma.org/jacoco
24342388
(EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org)
24352389

@@ -2442,14 +2396,31 @@ The following binary components are provided under the Eclipse Public License 2.
24422396
(EPL 2.0) Jakarta Mail API (jakarta.mail:jakarta.mail-api:jar:2.0.1)
24432397
(EPL 2.0) Jakarta Mail (com.sun.mail:jakarta.mail:jar:2.0.1)
24442398
(EPL 2.0) Tyrus Standalone Client (org.glassfish.tyrus.bundles:tyrus-standalone-client:jar:2.1.3)
2399+
(EPL 2.0) Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:jar:3.0.0)
2400+
(EPL 2.0) Jakarta RESTful Web Services (jakarta.ws.rs:jakarta.ws.rs-api:jar:4.0.0)
2401+
(EPL 2.0) OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:jar:1.0.3)
2402+
(EPL 2.0) jersey-client (org.glassfish.jersey.core:jersey-client:jar:4.0.0)
2403+
(EPL 2.0) jersey-common (org.glassfish.jersey.core:jersey-common:jar:4.0.0)
2404+
(EPL 2.0) jersey-container-servlet (org.glassfish.jersey.containers:jersey-container-servlet:jar:4.0.0)
2405+
(EPL 2.0) jersey-container-servlet-core (org.glassfish.jersey.containers:jersey-container-servlet-core:jar:4.0.0)
2406+
(EPL 2.0) jersey-entity-filtering (org.glassfish.jersey.ext:jersey-entity-filtering:jar:4.0.0)
2407+
(EPL 2.0) jersey-hk2 (org.glassfish.jersey.inject:jersey-hk2:jar:4.0.0)
2408+
(EPL 2.0) jersey-media-jaxb (org.glassfish.jersey.media:jersey-media-jaxb:jar:4.0.0)
2409+
(EPL 2.0) jersey-media-json-jackson (org.glassfish.jersey.media:jersey-media-json-jackson:jar:4.0.0)
2410+
(EPL 2.0) jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:jar:4.0.0)
2411+
(EPL 2.0) jersey-server (org.glassfish.jersey.core:jersey-server:jar:4.0.0)
2412+
(EPL 2.0) hk2 (org.glassfish.hk2:hk2:jar:4.0.0)
2413+
(EPL 2.0) hk2-api (org.glassfish.hk2:hk2-api:jar:4.0.0)
2414+
(EPL 2.0) hk2-utils (org.glassfish.hk2:hk2-utils:jar:4.0.0)
2415+
(EPL 2.0) hk2-locator (org.glassfish.hk2:hk2-locator:jar:4.0.0)
24452416

24462417
************************
24472418
Eclipse Distribution License 1.0
24482419
************************
24492420

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

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

25382509
For the binary distribution of nifi-update-attribute-ui see its 3rdpartylicenses.txt
2539-
for additional license and notice information.
2510+
for additional license and notice information.

‎nifi-commons/nifi-web-servlet-shared/src/main/java/org/apache/nifi/web/servlet/filter/QueryStringToFragmentFilter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
4545
final URI redirectUri = requestUriBuilder.build();
4646

4747
final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
48-
httpServletResponse.sendRedirect(redirectUri.toString());
48+
httpServletResponse.setStatus(HttpServletResponse.SC_FOUND);
49+
httpServletResponse.setHeader("Location", redirectUri.toString());
4950
} else {
5051
filterChain.doFilter(request, response);
5152
}

‎nifi-docker/dockerhub/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<id>docker</id>
3232
<dependencies>
3333
<dependency>
34-
<groupId>javax.activation</groupId>
35-
<artifactId>activation</artifactId>
36-
<version>1.1.1</version>
34+
<groupId>jakarta.activation</groupId>
35+
<artifactId>jakarta.activation-api</artifactId>
36+
<version>${jakarta.activation-api.version}</version>
3737
</dependency>
3838
</dependencies>
3939
<build>

‎nifi-docker/dockermaven/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<id>docker</id>
2626
<dependencies>
2727
<dependency>
28-
<groupId>javax.activation</groupId>
29-
<artifactId>activation</artifactId>
30-
<version>1.1.1</version>
28+
<groupId>jakarta.activation</groupId>
29+
<artifactId>jakarta.activation-api</artifactId>
30+
<version>${jakarta.activation-api.version}</version>
3131
</dependency>
3232
</dependencies>
3333
<build>

0 commit comments

Comments
 (0)