Skip to content

Upgrading log4j to 2.12.4 #2378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 30, 2021
Merged

Upgrading log4j to 2.12.4 #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a886057
Upgrading log4j to 2.12.4
jackshirazi Dec 29, 2021
7d612e6
bump log4j2-ecs-layout to 1.3.1
jackshirazi Dec 30, 2021
e9fbf66
bump version.ecs.logging to 1.3.1
jackshirazi Dec 30, 2021
6b3927d
bump log4j2-ecs-layout/version.ecs.logging to 1.3.2
jackshirazi Dec 30, 2021
e90fc89
add 1.26.2 release note to CHANGELOG.asciidoc
jackshirazi Dec 30, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,26 @@ endif::[]

=== Unreleased

[[release-notes-1.28.4]]
==== 1.28.4 - YYYY/MM/DD
[[release-notes-1.28.5]]
==== 1.28.5 - YYYY/MM/DD

[float]
===== Bug fixes
* Fix `@Traced` annotation to return proper outcome instead of `failed` - {pull}2370[#2370]

[[release-notes-1.x]]
=== Java Agent version 1.x

[[release-notes-1.28.4]]
==== 1.28.4 - 2021/12/30

[float]
===== Bug fixes
* Fix `@Traced` annotation to return proper outcome instead of `failed` - {pull}2370[#2370]

[float]
===== Dependency updates
* Update Log4j to 2.12.4 and log4j2-ecs-layout to 1.3.2 - {pull}2378[#2378]

[[release-notes-1.28.3]]
==== 1.28.3 - 2021/12/22

Expand Down Expand Up @@ -173,6 +183,13 @@ discovery - {pull}2205[#2205]
* Replace concurrency plugin maps to `SpanConcurrentHashMap` ones - {pull}2173[#2173]
* Align User-Agent HTTP header with other APM agents - {pull}2177[#2177]

[[release-notes-1.26.2]]
==== 1.26.2 - 2021/12/30

[float]
===== Dependency updates
* Update Log4j to 2.12.4 and log4j2-ecs-layout to 1.3.2 - {pull}2378[#2378]

[[release-notes-1.26.1]]
==== 1.26.1 - 2021/12/22

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-log-shader-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<properties>
<apm-agent-parent.base.dir>${project.basedir}/../..</apm-agent-parent.base.dir>
<version.ecs.logging>1.3.0</version.ecs.logging>
<version.ecs.logging>1.3.2</version.ecs.logging>
</properties>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@
<!-- this is the last version of log4j that is compatible with Java 7. Due to a known vulnerability
(https://nvd.nist.gov/vuln/detail/CVE-2020-9488#vulnCurrentDescriptionTitle), the SMTP appender is
excluded from the build and not packaged into the agent artifacts -->
<version.log4j>2.12.3</version.log4j>
<version.log4j2-ecs-layout>1.3.0</version.log4j2-ecs-layout>
<version.log4j>2.12.4</version.log4j>
<version.log4j2-ecs-layout>1.3.2</version.log4j2-ecs-layout>
<version.spring>5.0.15.RELEASE</version.spring>
<version.spring-boot>2.2.2.RELEASE</version.spring-boot>
<version.jetty-server>9.4.11.v20180605</version.jetty-server>
Expand Down