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. --> - - jakarta.servlet - jakarta.servlet-api - compile - - - org.eclipse.jetty.toolchain - jetty-schemas - compile - ch.qos.logback logback-classic 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 @@ org.slf4j:jul-to-slf4j ch.qos.logback:logback-classic ch.qos.logback:logback-core - - jakarta.servlet:jakarta.servlet-api - org.eclipse.jetty.toolchain:jetty-schemas org.apache.nifi:nifi-api org.apache.nifi:nifi-framework-api 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 @@ 2.0.0-SNAPSHOT - - - jakarta.servlet - jakarta.servlet-api - compile - - - org.eclipse.jetty.toolchain - jetty-schemas - compile - org.slf4j slf4j-api 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 @@ 2.0.0-SNAPSHOT - - - jakarta.servlet - jakarta.servlet-api - compile - - - org.eclipse.jetty.toolchain - jetty-schemas - compile - org.slf4j slf4j-api 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 @@ + + 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 @@ org.apache.nifi nifi-framework-api + + jakarta.servlet + jakarta.servlet-api + compile + + + org.eclipse.jetty.toolchain + jetty-schemas + compile + org.eclipse.jetty jetty-server 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 @@ - - jakarta.servlet - jakarta.servlet-api - compile - - - org.eclipse.jetty.toolchain - jetty-schemas - compile - ch.qos.logback logback-classic 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 @@ jersey-hk2 test - - jakarta.servlet - jakarta.servlet-api - compile - - - org.eclipse.jetty.toolchain - jetty-schemas - compile - org.slf4j jcl-over-slf4j