From 2a4d1de6c1cc899b8275772333ba8d8b1d85733d Mon Sep 17 00:00:00 2001
From: David Handermann <exceptionfactory@apache.org>
Date: Tue, 21 May 2024 12:42:21 -0500
Subject: [PATCH] NIFI-13275 Removed web.xml from nifi-web-frontend (#8858)

This closes #8858
---
 .../nifi-web/nifi-web-frontend/pom.xml        |  8 ----
 .../src/main/webapp/WEB-INF/web.xml           | 41 -------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/webapp/WEB-INF/web.xml

diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
index 81d37298c1..f72330fd2a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml
@@ -219,12 +219,4 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-web-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>provided</scope> <!-- expected to be provided by parent classloader -->
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/webapp/WEB-INF/web.xml b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f4d7a0c0ed..0000000000
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-      http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
-         version="6.0">
-    <display-name>nifi-web-frontend</display-name>
-
-    <filter>
-        <filter-name>SanitizeContextPathFilter</filter-name>
-        <filter-class>org.apache.nifi.web.filter.SanitizeContextPathFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>SanitizeContextPathFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-        <dispatcher>REQUEST</dispatcher>
-        <dispatcher>FORWARD</dispatcher>
-        <dispatcher>INCLUDE</dispatcher>
-        <dispatcher>ERROR</dispatcher>
-        <dispatcher>ASYNC</dispatcher>
-    </filter-mapping>
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
-