Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
David Handermann 2024-01-19 10:29:04 -06:00 committed by GitHub
parent 806d8d6165
commit e66da895fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 12 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nifi-assembly/pom.xml
View File

@ -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>

3
nifi-assembly/src/main/assembly/core.xml
View File

@ -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>

11
nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
View File

@ -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>

11
nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
View File

@ -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>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
View File

@ -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"/>

10
nifi-nar-bundles/nifi-jetty-bundle/pom.xml
View File

@ -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>

10
nifi-stateless/nifi-stateless-assembly/pom.xml
View File

@ -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>

10
nifi-system-tests/nifi-system-test-suite/pom.xml
View File

@ -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>