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
commit 275890a22696fa3ddc3b4d4cb445d98c9b6dd8d9
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Tue Jun 25 21:40:47 2024 -0500
NIFI-13444 Removed unused test logging configuration
This closes #9004
Signed-off-by: Joseph Witt <joew...@apache.org>
---
nifi-api/src/test/resources/logback-test.xml | 27 ---------
.../nifi-utils/src/test/resources/logback-test.xml | 32 -----------
.../src/test/resources/log4j.properties | 20 -------
.../src/test/resources/log4j.properties | 30 ----------
.../src/test/resources/logback-test.xml | 32 -----------
.../src/test/resources/log4j.properties | 23 --------
.../src/test/resources/logback-test.xml | 65 ----------------------
.../src/test/resources/logback-test.xml | 30 ----------
.../src/test/resources/logback-test.xml | 28 ----------
9 files changed, 287 deletions(-)
diff --git a/nifi-api/src/test/resources/logback-test.xml
b/nifi-api/src/test/resources/logback-test.xml
deleted file mode 100644
index 162b71b998..0000000000
--- a/nifi-api/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
- <logger name="org.apache.nifi.processor" level="DEBUG"/>
- <root level ="DEBUG">
- <appender-ref ref="CONSOLE"/>
- </root>
-</configuration>
diff --git a/nifi-commons/nifi-utils/src/test/resources/logback-test.xml
b/nifi-commons/nifi-utils/src/test/resources/logback-test.xml
deleted file mode 100644
index 8651d47d8c..0000000000
--- a/nifi-commons/nifi-utils/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
-
- <!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->
- <logger name="org.apache.nifi" level="DEBUG"/>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
-
diff --git
a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/resources/log4j.properties
b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/resources/log4j.properties
deleted file mode 100644
index 8c502ec918..0000000000
---
a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x \u2013
%m%n
\ No newline at end of file
diff --git
a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/resources/log4j.properties
b/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/resources/log4j.properties
deleted file mode 100644
index cdebe467d3..0000000000
---
a/nifi-extension-bundles/nifi-extension-utils/nifi-hadoop-utils/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Root logger option
-log4j.rootLogger=WARN, stdout
-
-log4j.logger.org.apache.nifi=INFO
-log4j.logger.org.apache.hadoop.security=INFO
-log4j.logger.org.apache.hadoop.minikdc=WARN
-log4j.logger.org.apache.nifi.hadoop.SecurityUtilITSpec=DEBUG
-log4j.logger.org.apache.nifi.processors.hadoop.AbstractHadoopProcessorSpec=DEBUG
-
-# log messages to console
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] %40.40c - %m%n
diff --git
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/resources/logback-test.xml
b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/resources/logback-test.xml
deleted file mode 100644
index 80b8b49c70..0000000000
---
a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
-
- <!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->
- <logger name="org.apache.nifi" level="INFO"/>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
-
diff --git
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/resources/log4j.properties
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/resources/log4j.properties
deleted file mode 100644
index 35778d8baa..0000000000
---
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootCategory=WARN, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L -
%m%n
-
-log4j.category.org.apache.nifi.processors.kafka=INFO
-log4j.category.kafka=ERROR
-#log4j.category.org.apache.nifi.startup=INFO
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/logback-test.xml
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/logback-test.xml
deleted file mode 100644
index e937f522af..0000000000
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- <immediateFlush>false</immediateFlush>
- </encoder>
- </appender>
-
- <appender name="TARGET_FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>target/log.txt</file>
- <rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-
<fileNamePattern>target/log_%d{yyyy-MM-dd_HH}.%i.txt</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10KB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!-- keep 30 log files worth of history -->
- <maxHistory>30</maxHistory>
- </rollingPolicy>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
- <immediateFlush>true</immediateFlush>
- </encoder>
- </appender>
- <!-- valid logging levels: TRACE, DEBUG, INFO, WARN, ERROR -->
- <logger name="org.apache.nifi" level="INFO"/>
- <logger name="org.apache.nifi.crypto" level="DEBUG"/>
-
- <!-- Logger for managing logging statements for nifi clusters. -->
- <logger name="org.apache.nifi.cluster" level="INFO"/>
-
- <!--
- Logger for logging HTTP requests received by the web server. Setting
- log level to 'debug' activates HTTP request logging.
- -->
- <logger name="org.apache.nifi.server.JettyServer" level="INFO"/>
-
- <!-- Logger for managing logging statements for jetty -->
- <logger name="org.mortbay" level="INFO"/>
-
- <logger name="org.apache.nifi.processors.standard" level="DEBUG"/>
- <logger name="target.file" level="DEBUG" additivity="true">
- <appender-ref ref="TARGET_FILE"/>
- </logger>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/logback-test.xml
b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/logback-test.xml
deleted file mode 100644
index bbc49c1d42..0000000000
---
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration scan="true" scanPeriod="30 seconds">
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
- </encoder>
- </appender>
-
- <logger name="nifi" level="DEBUG"/>
-
- <root level="DEBUG">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
deleted file mode 100644
index 86408f1b41..0000000000
---
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<configuration>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%-4r [%t] %-5p %c{3} - %m%n</pattern>
- </encoder>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</configuration>
