This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch fix/rebase-on-log4j-api-2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 960c287da5b5b0f89c08ce9a1f14cf68c7e3f1fb Author: Piotr P. Karwasz <[email protected]> AuthorDate: Fri Mar 22 16:43:00 2024 +0100 Downgrade to `log4j-api` version `2.24.0-SNAPSHOT` --- .../services/org.apache.logging.log4j.spi.Provider | 1 - .../org.apache.logging.log4j.test.BetterService | 16 ----------- .../services/org.apache.logging.log4j.test.Service | 31 ---------------------- pom.xml | 9 ++++--- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.Provider b/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.Provider deleted file mode 100644 index 5ae649a3f9..0000000000 --- a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.Provider +++ /dev/null @@ -1 +0,0 @@ -org.apache.logging.log4j.TestProvider \ No newline at end of file diff --git a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.BetterService b/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.BetterService deleted file mode 100644 index 590e752c76..0000000000 --- a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.BetterService +++ /dev/null @@ -1,16 +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. - -org.apache.logging.log4j.test.Service2 diff --git a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.Service b/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.Service deleted file mode 100644 index 5b9b8918af..0000000000 --- a/log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.test.Service +++ /dev/null @@ -1,31 +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. - -# A correct entry -org.apache.logging.log4j.test.Service1 - -# Simulates a service retrieved from the server's classloader in a servlet environment. -# The class exists but does not extend org.apache.logging.log4j.test.Service -org.apache.logging.log4j.Logger - -# Simulates a broken service. -# Should cause a ClassNotFoundError -invalid.Service - -# Causes an exception not caught by ServiceLoader -org.apache.logging.log4j.test.ForceLinkageError - -# Another correct service -org.apache.logging.log4j.test.Service2 diff --git a/pom.xml b/pom.xml index e2a6286227..5691973427 100644 --- a/pom.xml +++ b/pom.xml @@ -233,8 +233,6 @@ <!-- Last comes the rest of the modules in alphabetical order. Note that modules here must have a corresponding entry in `dependencyManagement > dependencies` block below! --> <module>log4j-1.2-api</module> - <module>log4j-api</module> - <module>log4j-api-test</module> <module>log4j-async-logger</module> <module>log4j-config-jackson</module> <module>log4j-config-properties</module> @@ -327,6 +325,9 @@ Hence, *DO NOT MANUALLY EDIT THIS VALUE*! --> <project.build.outputTimestamp>2024-02-17T17:58:36Z</project.build.outputTimestamp> + <!-- Version of Log4j API required --> + <log4j-api.version>2.24.0-SNAPSHOT</log4j-api.version> + <!-- ======================== Site-specific properties ======================== --> @@ -359,13 +360,13 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>${project.version}</version> + <version>${log4j-api.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api-test</artifactId> - <version>${project.version}</version> + <version>${log4j-api.version}</version> </dependency> <dependency>
