Skip to content

Commit 1ff01bd

Browse files
committed
Merge remote-tracking branch 'apache/2.x' into dependabot/maven/log4j-parent/2.x/co.elastic.logging-log4j2-ecs-layout-1.7.0
2 parents 324fb33 + 4042ec8 commit 1ff01bd

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

.github/FUNDING.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@
1919
# For details see:
2020
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
2121
#
22-
# This list includes in the same order, committers of Log4j listed on:
23-
# https://logging.apache.org/support.html#sponsors
24-
github:
25-
- carterkozak
26-
- garydgregory
27-
- jvz
28-
- ppkarwasz
29-
- rgoers
30-
- vy
22+
# WARNING: the `github` key accepts only 4 GitHub user ids, so we can not use this feature.
23+
#
24+
custom: "https://logging.apache.org/support.html#sponsors"
25+
tidelift: "maven/org.apache.logging.log4j:log4j-core"

log4j-1.2-api/src/main/java/org/apache/log4j/helpers/PatternParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ else if (dateFormatStr.equalsIgnoreCase(AbsoluteTimeDateFormat.DATE_AND_TIME_DAT
316316
currentLiteral.setLength(0);
317317
break;
318318
default:
319-
LogLog.error("Unexpected char [" + c + "] at position " + i + " in conversion patterrn.");
319+
LogLog.error("Unexpected char [" + c + "] at position " + i + " in conversion pattern.");
320320
pc = new LiteralPatternConverter(currentLiteral.toString());
321321
currentLiteral.setLength(0);
322322
}

log4j-mongodb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- OSGi and JPMS options -->
3131
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
3232
<!-- Dependency versions -->
33-
<mongodb.version>5.3.1</mongodb.version>
33+
<mongodb.version>5.4.0</mongodb.version>
3434
<slf4j2.version>2.0.17</slf4j2.version>
3535
</properties>
3636
<dependencyManagement>

0 commit comments

Comments
 (0)