This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new e66da895fc NIFI-12640 Moved servlet-api and jetty-schemas to
nifi-jetty-bundle (#8272)
e66da895fc is described below
commit e66da895fcf916b46d1f85bde454f1faf511a65e
Author: David Handermann <[email protected]>
AuthorDate: Fri Jan 19 10:29:04 2024 -0600
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
---
nifi-assembly/pom.xml | 10 ----------
nifi-assembly/src/main/assembly/core.xml | 3 ---
.../nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml | 11 -----------
nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml | 11 -----------
.../nifi-resources/src/main/resources/conf/logback.xml | 2 ++
nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 10 ++++++++++
nifi-stateless/nifi-stateless-assembly/pom.xml | 10 ----------
nifi-system-tests/nifi-system-test-suite/pom.xml | 10 ----------
8 files changed, 12 insertions(+), 55 deletions(-)
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 0558a81c93..808b52a41c 100644
--- 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
index d18c9c0c3f..0ab9a38420 100644
--- 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
index 488202b15c..f7bd45370a 100644
--- 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
index 77a70a5f8b..6632c22bfe 100644
--- 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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 241ea0bf79..ae33e0484e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++
b/nifi-nar-bundles/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
index 1d43f3aa1a..91444faeaf 100644
--- 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
index 4d1bb4bf85..9732d4d3de 100644
--- 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
index 8fcc5a76ca..742ed14c9d 100644
--- 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>
