This is an automated email from the ASF dual-hosted git repository.
vy 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 cf0087ab60 Revert `MANIFEST.MF` fix, it will be packaged by
`logging-parent` (#1923)
cf0087ab60 is described below
commit cf0087ab60a303fa0c6e04ee7172ba435cc1faf4
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Tue Oct 31 21:34:58 2023 +0100
Revert `MANIFEST.MF` fix, it will be packaged by `logging-parent` (#1923)
---
pom.xml | 20 --------------------
src/changelog/.2.x.x/fix_manifest.xml | 2 +-
src/site/_release-notes/_2.x.x.adoc | 2 +-
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3357962950..90d5e1522c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,26 +306,6 @@
<!-- project version -->
<revision>2.22.0-SNAPSHOT</revision>
- <!-- ===================
- `MANIFEST.MF` fixes
- ===================
-
- Adds certain `Implementation-*` and `Specification-*` entries to the
generated `MANIFEST.MF`.
- Using these properties is known to be a bad practice:
https://github.com/apache/logging-log4j2/issues/1923#issuecomment-1786818254
- Users should use
`META-INF/maven/<groupId>/<artifactId>/pom.properties` instead.
- Yet we support it due to backward compatibility reasons.
- WARNING! These properties should ideally not be ported to Log4j 3!
-
- Defining this as a property works.
- Because `bnd-maven-plugin` automatically includes properties starting
with a capital letter. -->
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
- <Specification-Version>${project.version}</Specification-Version>
-
<!-- =================
Common properties
================= -->
diff --git a/src/changelog/.2.x.x/fix_manifest.xml
b/src/changelog/.2.x.x/fix_manifest.xml
index 5067392a0b..a678850f93 100644
--- a/src/changelog/.2.x.x/fix_manifest.xml
+++ b/src/changelog/.2.x.x/fix_manifest.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
type="fixed">
<issue id="1923"
link="https://github.com/apache/logging-log4j2/issues/1923"/>
- <description format="asciidoc">Add missing `Implementation-` and
`Specification-` entries to `MANIFEST.MF`</description>
+ <description format="asciidoc">Add missing `Implementation-` and
`Specification-` entries to `MANIFEST.MF` (implemented by `logging-parent`
version `10.3.0` update)</description>
</entry>
diff --git a/src/site/_release-notes/_2.x.x.adoc
b/src/site/_release-notes/_2.x.x.adoc
index 6fbbdbc896..de14e2a004 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -68,4 +68,4 @@ The module name of four bridges (`log4j-slf4j-impl`,
`log4j-slf4j2-impl`, `log4j
* Export missing OSGi & JPMS modules in `log4j-layout-template-json` and
`log4j-1.2-api` (https://github.com/apache/logging-log4j2/issues/1895[1895])
* Fix `spring-test` dependency scope change.
(https://issues.apache.org/jira/browse/LOG4J2-3675[LOG4J2-3675])
* Fix JPMS descriptors causing `jlink` issues
(https://github.com/apache/logging-log4j2/issues/1896[1896])
-* Add missing `Implementation-` and `Specification-` entries to `MANIFEST.MF`
(https://github.com/apache/logging-log4j2/issues/1923[1923])
+* Add missing `Implementation-` and `Specification-` entries to `MANIFEST.MF`
(implemented by `logging-parent` version `10.3.0` update)
(https://github.com/apache/logging-log4j2/issues/1923[1923])
