You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/02/19 05:03:52 UTC
logging-log4j2 git commit: LOG4J2-2254 - Incorrect automatics module
name header was being included in manifests.
Repository: logging-log4j2
Updated Branches:
refs/heads/master a9e7cd6ca -> ec3c623a8
LOG4J2-2254 - Incorrect automatics module name header was being included in manifests.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ec3c623a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ec3c623a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ec3c623a
Branch: refs/heads/master
Commit: ec3c623a87d648e134d15ffb711b4067272d86e3
Parents: a9e7cd6
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Feb 18 22:03:46 2018 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Feb 18 22:03:46 2018 -0700
----------------------------------------------------------------------
log4j-api/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
pom.xml | 52 +++++++++++++++++++++++++-------------------
src/changes/changes.xml | 3 +++
4 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec3c623a/log4j-api/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 8d9af24..016b485 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -165,7 +165,7 @@
<goals>
<goal>jar</goal>
</goals>
- <configuration>
+ <configuration combine.self="override">
<archive>
<manifestFile>${manifestfile}</manifestFile>
<manifestEntries>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec3c623a/log4j-core/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index ab47ae6..b791acc 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -406,7 +406,7 @@
<goals>
<goal>jar</goal>
</goals>
- <configuration>
+ <configuration combine.self="override">
<archive>
<manifestFile>${manifestfile}</manifestFile>
<manifestEntries>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec3c623a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d406c9..2c8f327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -990,6 +990,36 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestFile>${manifestfile}</manifestFile>
+ <manifestEntries>
+ <Specification-Title>${project.name}</Specification-Title>
+ <Specification-Version>${project.version}</Specification-Version>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+ <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+ <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -1002,28 +1032,6 @@
<version>3.0.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <configuration>
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Automatic-Module-Name>${module.name}</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec3c623a/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ff63006..d3f9420 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,9 @@
</action>
</release>
<release version="2.11.0" date="2018-xx-xx" description="GA Release 2.11.0">
+ <action issue="LOG4J2-2254" dev="rgoers" type="fix">
+ Incorrect automatics module name header was being included in manifests.
+ </action>
<action issue="LOG4J2-2247" dev="rgoers" type="fix">
NullPointerException would occur when header was provided to a Layout on RollingRandingAccessFileAppender
with DirectWriteRolloverStrategy.