This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch log4j-2.12
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/log4j-2.12 by this push:
new 2ac1287 Prepare for release
2ac1287 is described below
commit 2ac1287ff9e54f43872f96de9206d23c6480204f
Author: Ralph Goers <[email protected]>
AuthorDate: Mon Dec 20 16:06:41 2021 -0700
Prepare for release
---
doap_log4j2.rdf | 23 ++++++++++
log4j-distribution/pom.xml | 50 ++++++++++++++++++++++
.../pom.xml | 28 ++++++++++++
pom.xml | 4 +-
src/site/xdoc/manual/appenders.xml | 4 ++
src/site/xdoc/manual/configuration.xml.vm | 24 +++++++++++
src/site/xdoc/manual/logsep.xml | 3 ++
src/site/xdoc/manual/lookups.xml | 5 +++
8 files changed, 140 insertions(+), 1 deletion(-)
diff --git a/doap_log4j2.rdf b/doap_log4j2.rdf
index fc2328e..f231bec 100644
--- a/doap_log4j2.rdf
+++ b/doap_log4j2.rdf
@@ -126,6 +126,22 @@
<release>
<Version>
<name>Latest stable release</name>
+ <revision>2.12.3</revision>
+
<file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.12.3/log4j-2.12.3.pom</file-release>
+ <created>2016-10-06</created>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>Latest stable release</name>
+ <revision>2.12.2</revision>
+
<file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.12.2/log4j-2.12.2.pom</file-release>
+ <created>2016-10-06</created>
+ </Version>
+ </release>
+ <release>
+ <Version>
+ <name>Latest stable release</name>
<revision>2.7</revision>
<file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.7/log4j-2.7.pom</file-release>
<created>2016-10-06</created>
@@ -175,6 +191,13 @@
</release>
<release>
<Version>
+ <name>Apache Log4j 2 - 2.3.1</name>
+ <revision>2.3.1</revision>
+
<file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.3.1/log4j-2.3.1.pom</file-release>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>Apache Log4j 2 - 2.3</name>
<revision>2.3</revision>
<file-release>https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j/2.3/log4j-2.3.pom</file-release>
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 29fca74..691bf95 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -476,6 +476,56 @@
</execution> -->
</executions>
</plugin>
+ <!-- calculate checksums of source release for Apache dist area -->
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.11</version>
+ <executions>
+ <execution>
+ <id>calculate-checksums</id>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ <!-- execute prior to maven-gpg-plugin:sign due to
https://github.com/nicoulaj/checksum-maven-plugin/issues/112 -->
+ <phase>post-integration-test</phase>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-256</algorithm>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <!--
https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor
-->
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>apache-log4j-${project.version}-src.zip</include>
+
<include>apache-log4j-${project.version}-src.tar.gz</include>
+ <include>apache-log4j-${project.version}-bin.zip</include>
+
<include>apache-log4j-${project.version}-bin.tar.gz</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <csvSummary>false</csvSummary>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-release-artifacts</id>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <keyname>${Log4jSigningUserName}</keyname>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
diff --git
a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
index 15259de..b01d450 100644
---
a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++
b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
@@ -137,6 +137,34 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-doap-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <doapOptions>
+ <programmingLanguage>Java</programmingLanguage>
+ <category>library</category>
+ </doapOptions>
+ <asfExtOptions>
+ <charter>
+ The Apache Logging Services Project creates and maintains
open-source software related to the logging of
+ application behavior and released at no charge to the public.
+ </charter>
+ <pmc>https://logging.apache.org</pmc>
+ </asfExtOptions>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${site.plugin.version}</version>
<configuration>
diff --git a/pom.xml b/pom.xml
index 85d1e45..9776d6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,9 +181,10 @@
<properties>
<!-- make sure to update these for each release! -->
<log4jParentDir>${basedir}</log4jParentDir>
- <Log4jReleaseVersion>2.12.2</Log4jReleaseVersion>
+ <Log4jReleaseVersion>2.12.3</Log4jReleaseVersion>
<Log4jReleaseManager>Ralph Goers</Log4jReleaseManager>
<Log4jReleaseKey>B3D8E1BA</Log4jReleaseKey>
+ <Log4jSigningUserName>[email protected]</Log4jSigningUserName>
<!--<Log4jReleaseManager>Matt Sicker</Log4jReleaseManager> -->
<!--<Log4jReleaseKey>748F15B2CF9BA8F024155E6ED7C92B70FA1C814D</Log4jReleaseKey>
-->
<!-- note that any properties you want available in velocity templates
must not use periods! -->
@@ -1234,6 +1235,7 @@
</charter>
<pmc>https://logging.apache.org</pmc>
</asfExtOptions>
+ <skip>true</skip>
</configuration>
<executions>
<execution>
diff --git a/src/site/xdoc/manual/appenders.xml
b/src/site/xdoc/manual/appenders.xml
index d1c14fa..ff05509 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -1527,6 +1527,10 @@ public class ConnectionFactory {
<a name="JMSTopicAppender"/>
<subsection name="JMS Appender">
<p>The JMS Appender sends the formatted log event to a JMS
Destination.</p>
+ <p>The JMS Appender requires JNDI support so as of release 2.3.1
this appender will not function unless
+ <code>log4j2.enableJndiJms=true</code> is configured as a system
property or environment
+ variable. See the <a
href="./configuration.html#enableJndiJms">enableJndiJms</a> system property.</p>
+ <p>
<p>
Note that in Log4j 2.0, this appender was split into a
JMSQueueAppender and a JMSTopicAppender. Starting
in Log4j 2.1, these appenders were combined into the JMS Appender
which makes no distinction between queues
diff --git a/src/site/xdoc/manual/configuration.xml.vm
b/src/site/xdoc/manual/configuration.xml.vm
index 727a323..cb02246 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -1794,6 +1794,30 @@ public class AwesomeTest {
</td>
</tr>
<tr>
+ <td><a
name="enableJndiContextSelector"/>log4j2.enableJndiContextSelector</td>
+ <td>LOG4J_ENABLE_JNDI_CONTEXT_SELECTOR</td>
+ <td>false</td>
+ <td>
+ When true, the Log4j context selector that uses the JNDI java protocol
is enabled. When false, the default, they are disabled.
+ </td>
+ </tr>
+ <tr>
+ <td><a name="enableJndiJms"/>log4j2.enableJndiJms</td>
+ <td>LOG4J_ENABLE_JNDI_JMS</td>
+ <td>false</td>
+ <td>
+ When true, the Log4j JMS Appender that uses JNDI's java protocol is
enabled. When false, the default, they are disabled.
+ </td>
+ </tr>
+ <tr>
+ <td><a name="enableJndiLookup"/>log4j2.enableJndiLookup</td>
+ <td>LOG4J_ENABLE_JNDI_LOOKUP</td>
+ <td>false</td>
+ <td>
+ When true, the Log4j lookup that uses JNDI's java protocol is enabled.
When false, the default, they are disabled.
+ </td>
+ </tr>
+ <tr>
<td><a name="level"/>log4j2.level
<br />
(<a
name="org.apache.logging.log4j.level"/>org.apache.logging.log4j.level)
diff --git a/src/site/xdoc/manual/logsep.xml b/src/site/xdoc/manual/logsep.xml
index 55b59eb..17dc7dd 100644
--- a/src/site/xdoc/manual/logsep.xml
+++ b/src/site/xdoc/manual/logsep.xml
@@ -111,6 +111,9 @@
to use JNDI to locate each web application's
<code>LoggerContext</code>. Be sure to set the
<code>isLog4jContextSelectorNamed</code> context parameter
to <kbd>true</kbd> and also set the
<code>log4jContextName</code> and
<code>log4jConfiguration</code> context parameters.
+ Note that the JndiContextSelector will not work unless
<code>log4j2.enableJndiContextSelector=true</code> is set as a
+ system property or environment variable. See the
+ <a
href="./configuration.html#enableJndiContextSelector">enableJndiContextSelector</a>
system property.
</li>
</ol>
<p>
diff --git a/src/site/xdoc/manual/lookups.xml b/src/site/xdoc/manual/lookups.xml
index 051033f..c8e56a7 100644
--- a/src/site/xdoc/manual/lookups.xml
+++ b/src/site/xdoc/manual/lookups.xml
@@ -184,6 +184,11 @@
<a name="JndiLookup"/>
<subsection name="Jndi Lookup">
<p>
+ As of Log4j 2.13.3 JNDI operations require that
<code>log4j2.enableJndiLookup=true</code> be set as a system
+ property or the corresponding environment variable for this lookup
to function. See the
+ <a
href="./configuration.html#enableJndiLookup">enableJndiLookup</a> system
property.
+ </p>
+ <p>
The JndiLookup allows variables to be retrieved via JNDI. By
default the key will be prefixed with
java:comp/env/, however if the key contains a ":" no prefix will
be added.
</p>
