Skip to content

Commit

Permalink
NIFI-9486 This closes apache#5604. Upgrade to logback 1.2.8, remove u…
Browse files Browse the repository at this point in the history 
…nnecessary dependencyManagement entries in minifi and nifi-registry in favor of root pom

Remove unnecessary use of slf4j-simple
  • Loading branch information
@bbende @joewitt
bbende authored and joewitt committed Dec 14, 2021
1 parent 1321b25 commit 09f254c
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 118 deletions.
13 changes: 1 addition & 12 deletions minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
44 changes: 0 additions & 44 deletions minifi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -159,40 +154,6 @@ limitations under the License.
<version>1.16.0-SNAPSHOT</version>
</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>
Expand Down Expand Up @@ -516,11 +477,6 @@ limitations under the License.
<version>1.10.19</version>
<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>
Expand Down
5 changes: 0 additions & 5 deletions nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@
<artifactId>nifi-record-path</artifactId>
<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>
Expand Down
5 changes: 0 additions & 5 deletions nifi-nar-bundles/nifi-smb-bundle/nifi-smb-processors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 0 additions & 6 deletions nifi-registry/nifi-registry-core/nifi-registry-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 0 additions & 6 deletions nifi-registry/nifi-registry-core/nifi-registry-properties/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@
<version>2.2.2</version>
<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>
Expand Down
7 changes: 0 additions & 7 deletions ...y/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions ...egistry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 0 additions & 25 deletions nifi-registry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 09f254c

Please sign in to comment.