NIFI-12640 Moved servlet-api and jetty-schemas to nifi-jetty-bundle (#…

…8272) - Set Jetty AnnotationConfiguration log level to WARN suppressing informational messages related to Logback ServletContainerInitializer
apache · Jan 19, 2024 · e66da89 · e66da89
1 parent 806d8d6
commit e66da89
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 55 deletions.
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
@@ -98,16 +98,6 @@ language governing permissions and limitations under the License. -->
         </plugins>
     </build>
     <dependencies>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-schemas</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/nifi-assembly/src/main/assembly/core.xml b/nifi-assembly/src/main/assembly/core.xml
@@ -29,9 +29,6 @@
                 <include>org.slf4j:jul-to-slf4j</include>
                 <include>ch.qos.logback:logback-classic</include>
                 <include>ch.qos.logback:logback-core</include>
-                <!-- Servlet API -->
-                <include>jakarta.servlet:jakarta.servlet-api</include>
-                <include>org.eclipse.jetty.toolchain:jetty-schemas</include>
                 <!-- Apache NiFi -->
                 <include>org.apache.nifi:nifi-api</include>
                 <include>org.apache.nifi:nifi-framework-api</include>

diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
@@ -45,17 +45,6 @@
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
-
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-schemas</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
@@ -51,17 +51,6 @@
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
-
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-schemas</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/...s/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml b/...s/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -196,6 +196,8 @@
 
     <!-- Logger for managing logging statements for jetty -->
     <logger name="org.eclipse.jetty" level="INFO"/>
+    <!-- Suppress non-error messages related to Logback ServletContainerInitializer -->
+    <logger name="org.eclipse.jetty.ee10.annotations.AnnotationConfiguration" level="WARN"/>
 
     <!-- Suppress non-error messages due to excessive logging by class or library -->
     <logger name="org.springframework" level="ERROR"/>

diff --git a/nifi-nar-bundles/nifi-jetty-bundle/pom.xml b/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
@@ -34,6 +34,16 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-framework-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-schemas</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>

diff --git a/nifi-stateless/nifi-stateless-assembly/pom.xml b/nifi-stateless/nifi-stateless-assembly/pom.xml
@@ -75,16 +75,6 @@
         </dependency>
 
         <!-- 3rd party dependencies in rootlib directory -->
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-schemas</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/nifi-system-tests/nifi-system-test-suite/pom.xml b/nifi-system-tests/nifi-system-test-suite/pom.xml
@@ -164,16 +164,6 @@
             <artifactId>jersey-hk2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency> <!-- handling this explicitly  Must be in root lib -->
-            <groupId>org.eclipse.jetty.toolchain</groupId>
-            <artifactId>jetty-schemas</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>