This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 48eb4b8295 Remove deprecated `packages` attribute from test configs
48eb4b8295 is described below
commit 48eb4b8295932b170f58719b024d9e8c9f261574
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Wed Jan 3 14:40:51 2024 +0100
Remove deprecated `packages` attribute from test configs
The attribute is removed from all documentation and test configurations,
except those that tes the `packages` attribute itself.
---
log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml | 2 +-
log4j-1.2-api/src/test/resources/log4j2-config.xml | 2 +-
log4j-1.2-api/src/test/resources/logWithMDC.xml | 2 +-
.../resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml | 1 -
.../src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml | 1 -
log4j-core-test/src/test/resources/log4j-cronRolloverApp.xml | 2 +-
log4j-core-test/src/test/resources/log4j-rolling-3490.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-1482.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-gelf-layout.xml | 2 +-
.../src/test/resources/log4j2-json-layout-timestamp.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-json-layout.xml | 2 +-
.../src/test/resources/log4j2-pattern-layout-with-context.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-pattern-layout.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-random-1833.xml | 2 +-
log4j-core-test/src/test/resources/log4j2-rolling-1833.xml | 2 +-
log4j-core-test/src/test/resources/perf9MMapNoLoc.xml | 2 +-
log4j-iostreams/src/test/resources/log4j2-jdbc-driver-manager.xml | 2 +-
log4j-iostreams/src/test/resources/log4j2-streams-unit-test.xml | 2 +-
log4j-slf4j-impl/src/test/resources/log4j2-1482.xml | 2 +-
log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml | 2 +-
log4j-taglib/src/test/resources/log4j-test1.xml | 2 +-
src/site/asciidoc/manual/json-template-layout.adoc | 2 +-
src/site/xdoc/manual/configuration.xml.vm | 7 +++----
23 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
b/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
index 73b4ff8c96..7de6461c4a 100644
--- a/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
+++ b/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration name="ConfigTest" status="error"
packages="org.apache.logging.log4j.test"
+<Configuration name="ConfigTest" status="error"
monitorInterval="5">
<Appenders>
<Console name="STDOUT">
diff --git a/log4j-1.2-api/src/test/resources/log4j2-config.xml
b/log4j-1.2-api/src/test/resources/log4j2-config.xml
index b520978aa7..8b47ed485e 100644
--- a/log4j-1.2-api/src/test/resources/log4j2-config.xml
+++ b/log4j-1.2-api/src/test/resources/log4j2-config.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration name="ConfigTest" status="error"
packages="org.apache.logging.log4j.test"
+<Configuration name="ConfigTest" status="error"
monitorInterval="5">
<Appenders>
<Console name="STDOUT">
diff --git a/log4j-1.2-api/src/test/resources/logWithMDC.xml
b/log4j-1.2-api/src/test/resources/logWithMDC.xml
index d343fe2f4a..93ad097c59 100644
--- a/log4j-1.2-api/src/test/resources/logWithMDC.xml
+++ b/log4j-1.2-api/src/test/resources/logWithMDC.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration name="ConfigTest" status="error"
packages="org.apache.logging.log4j.test"
+<Configuration name="ConfigTest" status="error"
monitorInterval="5">
<Appenders>
<Console name="STDOUT">
diff --git
a/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml
b/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml
index cec4e16a74..7d1802397b 100644
---
a/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml
+++
b/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigGlobalLoggerTest.xml
@@ -16,7 +16,6 @@
~ limitations under the License.
-->
<Configuration name="asyncwait-global1" >
- <!-- packages="org.apache.logging.log4j.core.async" -->
<AsyncWaitStrategyFactory
class="org.apache.logging.log4j.core.async.AsyncWaitStrategyFactoryConfigTest$YieldingWaitStrategyFactory"
/>
diff --git
a/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml
b/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml
index 31f6a7090b..5f82233848 100644
--- a/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml
+++ b/log4j-core-test/src/test/resources/AsyncWaitStrategyFactoryConfigTest.xml
@@ -16,7 +16,6 @@
~ limitations under the License.
-->
<Configuration name="async-wait-1" >
- <!-- packages="org.apache.logging.log4j.core.async" -->
<AsyncWaitStrategyFactory
class="org.apache.logging.log4j.core.async.AsyncWaitStrategyFactoryConfigTest$YieldingWaitStrategyFactory"
/>
diff --git a/log4j-core-test/src/test/resources/log4j-cronRolloverApp.xml
b/log4j-core-test/src/test/resources/log4j-cronRolloverApp.xml
index 593ba6aff7..a7ad3e0e55 100644
--- a/log4j-core-test/src/test/resources/log4j-cronRolloverApp.xml
+++ b/log4j-core-test/src/test/resources/log4j-cronRolloverApp.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn" name="testlog4j2" packages="">
+<Configuration status="warn" name="testlog4j2">
<Properties>
<Property name="baseDir">target/testlog4</Property>
</Properties>
diff --git a/log4j-core-test/src/test/resources/log4j-rolling-3490.xml
b/log4j-core-test/src/test/resources/log4j-rolling-3490.xml
index ccd40be950..84ade6b576 100644
--- a/log4j-core-test/src/test/resources/log4j-rolling-3490.xml
+++ b/log4j-core-test/src/test/resources/log4j-rolling-3490.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp">
<Appenders>
<RollingFile name="RollingFile"
filePattern="target/rolling-3490/app-%i.log">
<PatternLayout>
diff --git a/log4j-core-test/src/test/resources/log4j2-1482.xml
b/log4j-core-test/src/test/resources/log4j2-1482.xml
index 5e05403367..af7af4a622 100644
--- a/log4j-core-test/src/test/resources/log4j2-1482.xml
+++ b/log4j-core-test/src/test/resources/log4j2-1482.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp">
<Properties>
<Property name="audit-path">target/log4j2-1482</Property>
<Property name="file-name">audit</Property>
diff --git a/log4j-core-test/src/test/resources/log4j2-gelf-layout.xml
b/log4j-core-test/src/test/resources/log4j2-gelf-layout.xml
index 765da54bd4..11ec8c5aab 100644
--- a/log4j-core-test/src/test/resources/log4j2-gelf-layout.xml
+++ b/log4j-core-test/src/test/resources/log4j2-gelf-layout.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="INFO" packages="">
+<Configuration status="INFO">
<Appenders>
<File name="file" ignoreExceptions="false"
fileName="target/test-gelf-layout.log" append="false">
<GelfLayout host="myself" compressionType="OFF"/>
diff --git
a/log4j-core-test/src/test/resources/log4j2-json-layout-timestamp.xml
b/log4j-core-test/src/test/resources/log4j2-json-layout-timestamp.xml
index 9c57c76be6..35190a3669 100644
--- a/log4j-core-test/src/test/resources/log4j2-json-layout-timestamp.xml
+++ b/log4j-core-test/src/test/resources/log4j2-json-layout-timestamp.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="INFO" packages="">
+<Configuration status="INFO">
<Appenders>
<List name="List">
<JsonLayout compact="true" eventEol="true"
includeTimeMillis="true"/>
diff --git a/log4j-core-test/src/test/resources/log4j2-json-layout.xml
b/log4j-core-test/src/test/resources/log4j2-json-layout.xml
index 0205cf279e..c290142b22 100644
--- a/log4j-core-test/src/test/resources/log4j2-json-layout.xml
+++ b/log4j-core-test/src/test/resources/log4j2-json-layout.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="INFO" packages="">
+<Configuration status="INFO">
<Appenders>
<File name="stdout" ignoreExceptions="false"
fileName="target/test-json-layout.log" append="false">
<JsonLayout compact="true" eventEol="true"/>
diff --git
a/log4j-core-test/src/test/resources/log4j2-pattern-layout-with-context.xml
b/log4j-core-test/src/test/resources/log4j2-pattern-layout-with-context.xml
index b2cdcba44d..09314d317a 100644
--- a/log4j-core-test/src/test/resources/log4j2-pattern-layout-with-context.xml
+++ b/log4j-core-test/src/test/resources/log4j2-pattern-layout-with-context.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="DEBUG" packages="">
+<Configuration status="DEBUG">
<Properties>
<Property name="pattern">%p %c $${ctx:user}
$${event:Message}</Property>
</Properties>
diff --git a/log4j-core-test/src/test/resources/log4j2-pattern-layout.xml
b/log4j-core-test/src/test/resources/log4j2-pattern-layout.xml
index 02bcb8b3dd..cf3af008d7 100644
--- a/log4j-core-test/src/test/resources/log4j2-pattern-layout.xml
+++ b/log4j-core-test/src/test/resources/log4j2-pattern-layout.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="DEBUG" packages="">
+<Configuration status="DEBUG">
<Properties>
<Property name="defaultPattern">%d{yyyyMMdd HH:mm:ss} %-5p
%c{20}:%L - %m%n</Property>
</Properties>
diff --git a/log4j-core-test/src/test/resources/log4j2-random-1833.xml
b/log4j-core-test/src/test/resources/log4j2-random-1833.xml
index af461abda1..d3d42350c6 100644
--- a/log4j-core-test/src/test/resources/log4j2-random-1833.xml
+++ b/log4j-core-test/src/test/resources/log4j2-random-1833.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="WARN" name="MyApp" packages="">
+<Configuration status="WARN" name="MyApp">
<Properties>
<Property name="baseDir">target/random-1833</Property>
</Properties>
diff --git a/log4j-core-test/src/test/resources/log4j2-rolling-1833.xml
b/log4j-core-test/src/test/resources/log4j2-rolling-1833.xml
index b4d5dda599..aa70e9ca17 100644
--- a/log4j-core-test/src/test/resources/log4j2-rolling-1833.xml
+++ b/log4j-core-test/src/test/resources/log4j2-rolling-1833.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="WARN" name="MyApp" packages="">
+<Configuration status="WARN" name="MyApp">
<Properties>
<Property name="baseDir">target/rolling-1833</Property>
</Properties>
diff --git a/log4j-core-test/src/test/resources/perf9MMapNoLoc.xml
b/log4j-core-test/src/test/resources/perf9MMapNoLoc.xml
index 3e09b8ad7a..2693e7c8b1 100644
--- a/log4j-core-test/src/test/resources/perf9MMapNoLoc.xml
+++ b/log4j-core-test/src/test/resources/perf9MMapNoLoc.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn"
packages="org.apache.logging.log4j.core.async.perftest">
+<Configuration status="warn">
<Appenders>
<MemoryMappedFile name="MMapFile" fileName="perftest.log"
regionLength="1073741824">
<PatternLayout>
diff --git a/log4j-iostreams/src/test/resources/log4j2-jdbc-driver-manager.xml
b/log4j-iostreams/src/test/resources/log4j2-jdbc-driver-manager.xml
index ceff8158cf..da8f996d45 100644
--- a/log4j-iostreams/src/test/resources/log4j2-jdbc-driver-manager.xml
+++ b/log4j-iostreams/src/test/resources/log4j2-jdbc-driver-manager.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration name="UnitTest" status="info"
packages="org.apache.logging.log4j.test">
+<Configuration name="UnitTest" status="info">
<Appenders>
<List name="List">
<PatternLayout pattern="%level %m%n" />
diff --git a/log4j-iostreams/src/test/resources/log4j2-streams-unit-test.xml
b/log4j-iostreams/src/test/resources/log4j2-streams-unit-test.xml
index 4c84407348..ae13ddb9e5 100644
--- a/log4j-iostreams/src/test/resources/log4j2-streams-unit-test.xml
+++ b/log4j-iostreams/src/test/resources/log4j2-streams-unit-test.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration name="UnitTest" status="error"
packages="org.apache.logging.log4j.test">
+<Configuration name="UnitTest" status="error">
<Appenders>
<List name="UnitTest">
<PatternLayout pattern="%level %m%n"/>
diff --git a/log4j-slf4j-impl/src/test/resources/log4j2-1482.xml
b/log4j-slf4j-impl/src/test/resources/log4j2-1482.xml
index 5e05403367..af7af4a622 100644
--- a/log4j-slf4j-impl/src/test/resources/log4j2-1482.xml
+++ b/log4j-slf4j-impl/src/test/resources/log4j2-1482.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp">
<Properties>
<Property name="audit-path">target/log4j2-1482</Property>
<Property name="file-name">audit</Property>
diff --git a/log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml
b/log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml
index 5e05403367..af7af4a622 100644
--- a/log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml
+++ b/log4j-slf4j2-impl/src/test/resources/log4j2-1482.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration status="warn" name="MyApp" packages="">
+<Configuration status="warn" name="MyApp">
<Properties>
<Property name="audit-path">target/log4j2-1482</Property>
<Property name="file-name">audit</Property>
diff --git a/log4j-taglib/src/test/resources/log4j-test1.xml
b/log4j-taglib/src/test/resources/log4j-test1.xml
index ddbb8ff4d7..31de372033 100644
--- a/log4j-taglib/src/test/resources/log4j-test1.xml
+++ b/log4j-taglib/src/test/resources/log4j-test1.xml
@@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<Configuration packages="org.apache.logging.log4j.test" status="warn"
name="TaglibLoggerTest">
+<Configuration status="warn" name="TaglibLoggerTest">
<properties>
<property name="filename">target/test.log</property>
</properties>
diff --git a/src/site/asciidoc/manual/json-template-layout.adoc
b/src/site/asciidoc/manual/json-template-layout.adoc
index 2301b304c7..217d4ee89d 100644
--- a/src/site/asciidoc/manual/json-template-layout.adoc
+++ b/src/site/asciidoc/manual/json-template-layout.adoc
@@ -1760,7 +1760,7 @@ these custom classes:
.Log4j configuration employing custom `randomNumber` resolver
----
<?xml version="1.0" encoding="UTF-8"?>
-<Configuration packages="com.acme.logging.log4j.layout.template.json">
+<Configuration>
<!-- ... -->
<JsonTemplateLayout>
<EventTemplateAdditionalField
diff --git a/src/site/xdoc/manual/configuration.xml.vm
b/src/site/xdoc/manual/configuration.xml.vm
index 515a15f114..1497a68cea 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -734,8 +734,7 @@ public class Bar {
</p>
<pre class="prettyprint linenums"><