This is an automated email from the ASF dual-hosted git repository. joewitt 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 09f254c NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary dependencyManagement entries in minifi and nifi-registry in favor of root pom Remove unnecessary use of slf4j-simple 09f254c is described below commit 09f254c6113c4c0747201eed67a0e0101424cd12 Author: Bryan Bende <bbe...@gmail.com> AuthorDate: Tue Dec 14 13:48:53 2021 -0500 NIFI-9486 This closes #5604. Upgrade to logback 1.2.8, remove unnecessary dependencyManagement entries in minifi and nifi-registry in favor of root pom Remove unnecessary use of slf4j-simple --- .../minifi-framework-nar/pom.xml | 13 +------ minifi/pom.xml | 44 ---------------------- .../nifi-accumulo-processors/pom.xml | 5 --- .../nifi-smb-bundle/nifi-smb-processors/pom.xml | 5 --- .../nifi-registry-client/pom.xml | 6 --- .../nifi-registry-properties/pom.xml | 6 --- .../nifi-registry-revision-entity-service/pom.xml | 7 ---- .../nifi-registry-ranger-plugin/pom.xml | 7 ---- nifi-registry/pom.xml | 25 ------------ pom.xml | 2 +- 10 files changed, 2 insertions(+), 118 deletions(-) diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml index 628cc1b..e60b752 100644 --- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml +++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml @@ -84,17 +84,6 @@ limitations under the License. <artifactId>cglib-nodep</artifactId> <scope>compile</scope> </dependency> - - <!-- Provided dependencies from NiFi framework --> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <scope>provided</scope> - </dependency> </dependencies> + </project> \ No newline at end of file diff --git a/minifi/pom.xml b/minifi/pom.xml index 70a24932..e01dabc 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -60,11 +60,6 @@ limitations under the License. <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> </dependencies> <dependencyManagement> @@ -160,40 +155,6 @@ limitations under the License. </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${org.slf4j.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${org.slf4j.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>${org.slf4j.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${org.slf4j.version}</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <version>${jetty.version}</version> @@ -517,11 +478,6 @@ limitations under the License. <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp</artifactId> <version>3.12.3</version> diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml index d24a84a..b991fbe 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml @@ -79,11 +79,6 @@ <version>1.16.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-minicluster</artifactId> <version>${accumulo.version}</version> diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml index 5429fec..153f242 100644 --- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml +++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml @@ -46,10 +46,5 @@ <version>1.16.0-SNAPSHOT</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml index 55eadca..cde6260 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml @@ -56,11 +56,5 @@ <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml index 9383004..f1aacd6 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml @@ -63,12 +63,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> diff --git a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml index 471ebfb..f321b44 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml @@ -34,13 +34,6 @@ <artifactId>nifi-registry-revision-common</artifactId> <version>1.16.0-SNAPSHOT</version> </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml index 4aae858..1798355 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml @@ -235,13 +235,6 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${org.slf4j.version}</version> - <scope>test</scope> - </dependency> - </dependencies> <profiles> diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index bdce11e..f61fcdc 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -120,31 +120,6 @@ <artifactId>apache-jstl</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>${org.slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${org.slf4j.version}</version> - </dependency> <!-- lib/shared --> <dependency> <groupId>org.apache.commons</groupId> diff --git a/pom.xml b/pom.xml index 03d2b18..e9b8e10 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <gcs.version>2.1.5</gcs.version> <aspectj.version>1.9.6</aspectj.version> <jersey.version>2.33</jersey.version> - <logback.version>1.2.6</logback.version> + <logback.version>1.2.8</logback.version> <mockito.version>3.11.2</mockito.version> <netty.3.version>3.10.6.Final</netty.3.version> <netty.4.version>4.1.69.Final</netty.4.version>