This is an automated email from the ASF dual-hosted git repository.
github-bot 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 7e6ad920f6 Update
`com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to
version `3.3.4` (#2103)
7e6ad920f6 is described below
commit 7e6ad920f62e99d04a2c23e26cd11aef65f58432
Author: ASF Logging Services RM <[email protected]>
AuthorDate: Wed Dec 27 23:01:58 2023 +0000
Update
`com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to
version `3.3.4` (#2103)
---
log4j-parent/pom.xml | 2 +-
...location_instrumenter_java_allocation_instrumenter.xml | 8 ++++++++
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 1 +
src/site/_release-notes/_2.x.x.adoc | 15 +++++++++++++++
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 9355b67f48..705f3bb507 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -108,7 +108,7 @@
<javax-servlet.version>4.0.1</javax-servlet.version>
<javax-servlet-jsp.version>2.3.3</javax-servlet-jsp.version>
<jansi.version>2.4.1</jansi.version>
-
<java-allocation-instrumenter.version>3.3.3</java-allocation-instrumenter.version>
+
<java-allocation-instrumenter.version>3.3.4</java-allocation-instrumenter.version>
<jconsole.version>1.7.0</jconsole.version>
<jctools.version>4.0.2</jctools.version>
<je.version>18.3.12</je.version>
diff --git
a/src/changelog/.2.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml
b/src/changelog/.2.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml
new file mode 100644
index 0000000000..4f1b55551b
--- /dev/null
+++
b/src/changelog/.2.x.x/update_com_google_code_java_allocation_instrumenter_java_allocation_instrumenter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://logging.apache.org/log4j/changelog";
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ type="changed">
+ <issue id="2103" link="https://github.com/apache/logging-log4j2/pull/2103"/>
+ <description format="asciidoc">Update
`com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to
version `3.3.4`</description>
+</entry>
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index eedb75eb7e..d321d39568 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
////
:project-github-url: https://github.com/apache/logging-log4j2
-:project-version: 2.22.1
+:project-version: 2.23.0-SNAPSHOT
:project-name: Log4j
:project-id: log4j
:java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index cabc0cb275..a8faebbe2a 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,6 +36,7 @@
[#release-notes]
= Release Notes
+include::_release-notes/_2.x.x.adoc[]
include::_release-notes/_2.22.1.adoc[]
include::_release-notes/_2.22.0.adoc[]
include::_release-notes/_2.21.1.adoc[]
diff --git a/src/site/_release-notes/_2.x.x.adoc
b/src/site/_release-notes/_2.x.x.adoc
index 59651dcc33..c0876de315 100644
--- a/src/site/_release-notes/_2.x.x.adoc
+++ b/src/site/_release-notes/_2.x.x.adoc
@@ -22,3 +22,18 @@
This releases contains ...
+
+[#release-notes-2-x-x-added]
+=== Added
+
+* Added support for LMAX Disruptor 4.x.
(https://github.com/apache/logging-log4j2/issues/1821[1821])
+
+[#release-notes-2-x-x-changed]
+=== Changed
+
+* Update
`com.google.code.java-allocation-instrumenter:java-allocation-instrumenter` to
version `3.3.4` (https://github.com/apache/logging-log4j2/pull/2103[2103])
+
+[#release-notes-2-x-x-deprecated]
+=== Deprecated
+
+* Deprecated the `RingBufferLogEventHandler` class for removal from the public
API in 3.x.
