This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch doc/2.x/versioning
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


    from 61e2e0ddc7 fix: expand package name
     add a6bc86ed2e Group Dependabot PRs and remove `merge-dependabot` (#3990)
     add 5cd888793a Fix Dependabot configuration (#3997)
     add 37a03838eb Use binary names in `GraalVmProcessor` (#3996)
     add 3b93748497 Fix host name verification in `SSLSocketManager` (#4002)
     add 5ee789082f Merge `rel/2.25.3` to `2.x` (#4004)
     add 9c22ca26d8 docs: recommend use of appropriately scoped trust roots 
(#4006)
     add bc170a2637 Merge remote-tracking branch 'origin/2.x' into 
doc/2.x/versioning
     add 45e22da809 Rename `Apache Log4j` to `Log4j`
     add d1d0fdfab2 Shorten content and fix/improve typesetting

No new revisions were added by this update.

Summary of changes:
 .github/dependabot.yaml                            |  90 +++----
 .github/workflows/build.yaml                       |   1 -
 .github/workflows/merge-dependabot.yaml            |  52 ----
 .../org/apache/log4j/helpers/package-info.java     |   2 +-
 .../main/java/org/apache/log4j/package-info.java   |   2 +-
 .../java/org/apache/log4j/xml/package-info.java    |   2 +-
 .../logging/log4j/test/junit/package-info.java     |   2 +-
 .../apache/logging/log4j/test/package-info.java    |   2 +-
 .../apache/logging/log4j/simple/package-info.java  |   2 +-
 .../apache/logging/log4j/status/package-info.java  |   2 +-
 .../apache/logging/log4j/util/package-info.java    |   2 +-
 .../log4j/appserver/jetty/package-info.java        |   2 +-
 .../log4j/appserver/tomcat/package-info.java       |   2 +-
 .../core/test/appender/db/jdbc/package-info.java   |   2 +-
 .../log4j/core/test/junit/package-info.java        |   2 +-
 .../log4j/core/test/net/mock/package-info.java     |   2 +-
 .../log4j/core/test/net/ssl/package-info.java      |   2 +-
 .../logging/log4j/core/test/smtp/package-info.java |   2 +-
 .../plugins/processor/GraalVmProcessorTest.java    |   8 +-
 .../log4j/core/net/SslSocketManagerTest.java       | 131 +++++++++
 .../log4j/core/net/ssl/SslSocketManagerTest.java   |  45 ----
 .../GraalVmProcessorTest/java/FakePlugin.java      |  11 +-
 .../log4j/core/appender/db/jdbc/package-info.java  |   2 +-
 .../core/config/builder/impl/package-info.java     |   2 +-
 .../core/config/plugins/convert/package-info.java  |   2 +-
 .../config/plugins/processor/GraalVmProcessor.java |  32 +--
 .../core/config/plugins/util/package-info.java     |   2 +-
 .../log4j/core/config/status/package-info.java     |   2 +-
 .../logging/log4j/core/filter/package-info.java    |   2 +-
 .../logging/log4j/core/jmx/package-info.java       |   2 +-
 .../logging/log4j/core/net/SslSocketManager.java   |  98 ++++++-
 .../logging/log4j/core/net/package-info.java       |   2 +-
 .../log4j/core/net/ssl/SslConfiguration.java       |  12 +-
 .../logging/log4j/core/net/ssl/package-info.java   |   2 +-
 .../apache/logging/log4j/core/package-info.java    |   2 +-
 .../logging/log4j/core/tools/package-info.java     |   2 +-
 .../logging/log4j/core/util/package-info.java      |   2 +-
 .../org/apache/logging/log4j/jul/package-info.java |   2 +-
 .../layout/template/json/util/package-info.java    |   2 +-
 pom.xml                                            |   2 +-
 ...r_mismatch.xml => 3871_graalvm_binary_name.xml} |   5 +-
 ... 4002_fix_SslSocketAppender_verifyHostName.xml} |   4 +-
 .../{2.25.2 => 2.25.3}/.release-notes.adoc.ftl     |   4 +-
 src/changelog/{2.23.0 => 2.25.3}/.release.xml      |   2 +-
 .../3871_graalvm_binary_name.xml}                  |   5 +-
 ...35_optimize_DefaultThreadContextMap_getCopy.xml |   0
 .../3947_fix_SslSocketManager_null_keystore.xml    |   0
 .../3985_remove_spotbugs_annotations.xml           |   0
 .../4002_fix_SslSocketAppender_verifyHostName.xml} |   4 +-
 src/site/antora/modules/ROOT/pages/download.adoc   | 295 +++++++++++++++++++-
 .../ROOT/pages/manual/appenders/network.adoc       |   5 +
 src/site/antora/modules/ROOT/pages/versioning.adoc |  76 ++----
 .../properties-transport-security.adoc             |   2 +
 .../trust-store-guideline.adoc}                    |   8 +-
 .../modules/ROOT/partials/supported-versions.adoc  | 297 ---------------------
 55 files changed, 644 insertions(+), 603 deletions(-)
 delete mode 100644 .github/workflows/merge-dependabot.yaml
 create mode 100644 
log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/SslSocketManagerTest.java
 delete mode 100644 
log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/ssl/SslSocketManagerTest.java
 copy src/changelog/.2.x.x/{3828_fix_log_placeholder_mismatch.xml => 
3871_graalvm_binary_name.xml} (59%)
 copy src/changelog/.2.x.x/{3920-nested-throwables.xml => 
4002_fix_SslSocketAppender_verifyHostName.xml} (60%)
 copy src/changelog/{2.25.2 => 2.25.3}/.release-notes.adoc.ftl (75%)
 copy src/changelog/{2.23.0 => 2.25.3}/.release.xml (95%)
 copy src/changelog/{.2.x.x/3828_fix_log_placeholder_mismatch.xml => 
2.25.3/3871_graalvm_binary_name.xml} (59%)
 copy src/changelog/{.2.x.x => 
2.25.3}/3935_optimize_DefaultThreadContextMap_getCopy.xml (100%)
 copy src/changelog/{.2.x.x => 
2.25.3}/3947_fix_SslSocketManager_null_keystore.xml (100%)
 copy src/changelog/{.2.x.x => 2.25.3}/3985_remove_spotbugs_annotations.xml 
(100%)
 copy src/changelog/{.2.x.x/3835-default-layout.xml => 
2.25.3/4002_fix_SslSocketAppender_verifyHostName.xml} (51%)
 copy src/site/antora/modules/ROOT/partials/{premature-optimization.adoc => 
manual/trust-store-guideline.adoc} (58%)
 delete mode 100644 
src/site/antora/modules/ROOT/partials/supported-versions.adoc

Reply via email to