From 62e802d6d9a127c065a4bc0fa3158729e68df455 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Fri, 13 Jun 2025 18:25:52 +0200 Subject: [PATCH 1/5] Prepare release notes for `2.25.0` --- pom.xml | 10 +-- src/changelog/.2.x.x/.release-notes.adoc.ftl | 34 +--------- ..._co_elastic_clients_elasticsearch_java.xml | 8 --- ...e_co_elastic_logging_log4j2_ecs_layout.xml | 8 --- .../update_com_code_intelligence_jazzer.xml | 8 --- .../.2.x.x/update_com_github_jnr_jnr_ffi.xml | 8 --- .../update_com_github_luben_zstd_jni.xml | 8 --- .../.2.x.x/update_com_google_guava_guava.xml | 8 --- .../update_commons_codec_commons_codec.xml | 8 --- .../.2.x.x/update_commons_io_commons_io.xml | 8 --- .../.2.x.x/update_fast_xml_parser.xml | 8 --- .../update_gradle_develocity_actions.xml | 8 --- .../.2.x.x/update_net_java_dev_jna_jna.xml | 8 --- ...te_org_apache_activemq_activemq_broker.xml | 8 --- .../update_org_apache_groovy_groovy_bom.xml | 8 --- ...ransform_maven_shade_plugin_extensions.xml | 8 --- .../update_org_apache_maven_maven_core.xml | 8 --- ...apache_maven_surefire_surefire_junit47.xml | 8 --- .../update_org_assertj_assertj_core.xml | 8 --- .../update_org_awaitility_awaitility.xml | 8 --- ...pdate_org_codehaus_plexus_plexus_utils.xml | 8 --- ..._org_eclipse_platform_org_eclipse_osgi.xml | 8 --- .../.2.x.x/update_org_hsqldb_hsqldb.xml | 8 --- src/changelog/.2.x.x/update_org_json_json.xml | 8 --- .../.2.x.x/update_org_junit_junit_bom.xml | 8 --- ...pdate_org_openjdk_nashorn_nashorn_core.xml | 8 --- ...openrewrite_maven_rewrite_maven_plugin.xml | 8 --- ...rite_recipe_rewrite_logging_frameworks.xml | 8 --- ...penrewrite_recipe_rewrite_migrate_java.xml | 8 --- ...e_org_ops4j_pax_exam_exam_maven_plugin.xml | 8 --- .../update_org_ops4j_pax_exam_pax_exam.xml | 8 --- .../.2.x.x/update_org_slf4j_slf4j_nop.xml | 8 --- .../update_org_xmlunit_xmlunit_core.xml | 8 --- src/changelog/2.25.0/.release-notes.adoc.ftl | 68 +++++++++++++++++++ src/changelog/2.25.0/.release.xml | 21 ++++++ .../1736_split_jansi_support.xml | 0 .../2229_mongodb_docker.xml | 0 .../2295_add_JMS_Jakarta_Appender.xml | 0 ...llingFileManager_unsuccessful_rollover.xml | 0 ...ange_PatternLayout_exception_rendering.xml | 0 .../2691_deprecate_ThrowableProxy.xml | 0 ..._fix_PatternLayout_exception_rendering.xml | 0 .../2767_reload_key_stores.xml | 0 .../2767_simplify_SSL_config_logic.xml | 0 ...69_pluginAttribute_publicSetterWarning.xml | 0 .../2916_rewrite_jansi_renderer.xml | 0 ...ate_AbstractLogger_checkMessageFactory.xml | 0 .../{.2.x.x => 2.25.0}/2937-http-watcher.xml | 0 .../2942_fix_ThreadContext_putAll.xml | 0 .../{.2.x.x => 2.25.0}/2949_add_fuzzing.xml | 0 .../3011_http_appender_validation.xml | 0 .../3030_fix_log4j1_getLogger.xml | 0 .../3045_change_PatternLayout_prefix.xml | 0 .../3045_fix_PatternLayout_rEx_property.xml | 0 .../3045_remove_PatternLayout_ex_ansi.xml | 0 .../3048_fix_ThreadContext_remove.xml | 0 .../3053_graalvm_processor.xml | 0 .../3056_android_support.xml | 0 .../{.2.x.x => 2.25.0}/3066_fix_bom.xml | 0 .../3074_monitor_additional_files.xml | 0 .../3085_fix_log4j_1_priority.xml | 0 .../3118_default_layout.xml | 0 .../3119_set_level_call_parent.xml | 0 .../3121_deprecate_FixedDateFormat.xml | 0 .../3121_instant_format.xml | 0 ...hange_PatternLayout_exception_renderer.xml | 0 ...DBC_appender_IOException_stream_closed.xml | 0 .../3143_logger_registry.xml | 0 .../3149_change_StatusData_prefix.xml | 0 ...x_mongodb_appender_deprecation_warning.xml | 0 .../3153_fix_StringMatchFilter_guardNPE.xml | 0 ...syncWaitStrategyFactoryConfig_guardNPE.xml | 0 .../3206_fix_rootLogger_shorthand_npe.xml | 0 .../3212_fix_JTL_StackTraceStringResolver.xml | 0 .../3215_fix-RegexReplacement.xml | 0 .../{.2.x.x => 2.25.0}/3217_precise_clock.xml | 0 ...257_fix_AsyncAppender_requiresLocation.xml | 0 ..._fix_FailoverAppender_requiresLocation.xml | 0 .../{.2.x.x => 2.25.0}/3300_fix-javadoc.xml | 0 .../{.2.x.x => 2.25.0}/3359_fix-javadoc.xml | 0 ..._fix_typo_in_RootLogger_Builder_method.xml | 0 .../3398_fix_JTL_RecyclerFactoryConverter.xml | 0 .../3399_logger_registry.xml | 0 ...rnalLoggerRegistry_stale_entry_expunge.xml | 0 .../3431_default_config_name.xml | 0 ...37_transtive_compile_only_dependencies.xml | 0 .../3467_add_mongodb_conn_db_name.xml | 0 .../3508_LoggerContext_shutdownDisable.xml | 0 .../3562_StatusData_ArrayIndexOutOfBounds.xml | 0 .../3586_improve_GcpLayout.xml | 0 ...601_deprecate_or_remove_hiding_methods.xml | 0 ...timization_for_filling_the_stack_trace.xml | 0 .../3645_speedup_array_logging.xml | 0 ...ck_traces_in_ExtendedThreadInformation.xml | 0 ...665_fix_StatusLogger_writing_to_stdout.xml | 0 ..._generalize_ReadOnlyStringMap_equality.xml | 0 ...ase64_directly_instead_of_reflectively.xml | 0 .../3706_osgi-disruptor.xml | 0 .../fix_JsonWriter_surrogate_handling.xml | 0 .../throwable-proxy-clean-up.xml | 0 .../update_actions_stale.xml | 0 .../update_ch_qos_logback_logback_core.xml | 0 ...date_com_fasterxml_jackson_jackson_bom.xml | 0 ...m_github_spotbugs_spotbugs_annotations.xml | 0 .../update_io_fabric8_docker_maven_plugin.xml | 0 ...ate_org_apache_cassandra_cassandra_all.xml | 0 .../update_org_apache_commons_commons_csv.xml | 0 ...pdate_org_apache_commons_commons_dbcp2.xml | 0 ...pdate_org_apache_commons_commons_pool2.xml | 0 .../update_org_apache_kafka_kafka_clients.xml | 0 ...date_org_apache_logging_logging_parent.xml | 2 +- .../update_org_apache_tomcat_tomcat_juli.xml | 0 .../update_org_eclipse_jetty_jetty_util.xml | 0 .../update_org_jmdns_jmdns.xml | 0 .../update_org_mongodb_bson.xml | 0 .../update_org_slf4j_slf4j_api.xml | 0 ...ngframework_cloud_spring_cloud_context.xml | 0 117 files changed, 96 insertions(+), 287 deletions(-) delete mode 100644 src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml delete mode 100644 src/changelog/.2.x.x/update_co_elastic_logging_log4j2_ecs_layout.xml delete mode 100644 src/changelog/.2.x.x/update_com_code_intelligence_jazzer.xml delete mode 100644 src/changelog/.2.x.x/update_com_github_jnr_jnr_ffi.xml delete mode 100644 src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml delete mode 100644 src/changelog/.2.x.x/update_com_google_guava_guava.xml delete mode 100644 src/changelog/.2.x.x/update_commons_codec_commons_codec.xml delete mode 100644 src/changelog/.2.x.x/update_commons_io_commons_io.xml delete mode 100644 src/changelog/.2.x.x/update_fast_xml_parser.xml delete mode 100644 src/changelog/.2.x.x/update_gradle_develocity_actions.xml delete mode 100644 src/changelog/.2.x.x/update_net_java_dev_jna_jna.xml delete mode 100644 src/changelog/.2.x.x/update_org_apache_activemq_activemq_broker.xml delete mode 100644 src/changelog/.2.x.x/update_org_apache_groovy_groovy_bom.xml delete mode 100644 src/changelog/.2.x.x/update_org_apache_logging_log4j_log4j_transform_maven_shade_plugin_extensions.xml delete mode 100644 src/changelog/.2.x.x/update_org_apache_maven_maven_core.xml delete mode 100644 src/changelog/.2.x.x/update_org_apache_maven_surefire_surefire_junit47.xml delete mode 100644 src/changelog/.2.x.x/update_org_assertj_assertj_core.xml delete mode 100644 src/changelog/.2.x.x/update_org_awaitility_awaitility.xml delete mode 100644 src/changelog/.2.x.x/update_org_codehaus_plexus_plexus_utils.xml delete mode 100644 src/changelog/.2.x.x/update_org_eclipse_platform_org_eclipse_osgi.xml delete mode 100644 src/changelog/.2.x.x/update_org_hsqldb_hsqldb.xml delete mode 100644 src/changelog/.2.x.x/update_org_json_json.xml delete mode 100644 src/changelog/.2.x.x/update_org_junit_junit_bom.xml delete mode 100644 src/changelog/.2.x.x/update_org_openjdk_nashorn_nashorn_core.xml delete mode 100644 src/changelog/.2.x.x/update_org_openrewrite_maven_rewrite_maven_plugin.xml delete mode 100644 src/changelog/.2.x.x/update_org_openrewrite_recipe_rewrite_logging_frameworks.xml delete mode 100644 src/changelog/.2.x.x/update_org_openrewrite_recipe_rewrite_migrate_java.xml delete mode 100644 src/changelog/.2.x.x/update_org_ops4j_pax_exam_exam_maven_plugin.xml delete mode 100644 src/changelog/.2.x.x/update_org_ops4j_pax_exam_pax_exam.xml delete mode 100644 src/changelog/.2.x.x/update_org_slf4j_slf4j_nop.xml delete mode 100644 src/changelog/.2.x.x/update_org_xmlunit_xmlunit_core.xml create mode 100644 src/changelog/2.25.0/.release-notes.adoc.ftl create mode 100644 src/changelog/2.25.0/.release.xml rename src/changelog/{.2.x.x => 2.25.0}/1736_split_jansi_support.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2229_mongodb_docker.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2295_add_JMS_Jakarta_Appender.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2592_fix_RollingFileManager_unsuccessful_rollover.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2691_change_PatternLayout_exception_rendering.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2691_deprecate_ThrowableProxy.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2691_fix_PatternLayout_exception_rendering.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2767_reload_key_stores.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2767_simplify_SSL_config_logic.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2769_pluginAttribute_publicSetterWarning.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2916_rewrite_jansi_renderer.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2936_deprecate_AbstractLogger_checkMessageFactory.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2937-http-watcher.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2942_fix_ThreadContext_putAll.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/2949_add_fuzzing.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3011_http_appender_validation.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3030_fix_log4j1_getLogger.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3045_change_PatternLayout_prefix.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3045_fix_PatternLayout_rEx_property.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3045_remove_PatternLayout_ex_ansi.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3048_fix_ThreadContext_remove.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3053_graalvm_processor.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3056_android_support.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3066_fix_bom.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3074_monitor_additional_files.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3085_fix_log4j_1_priority.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3118_default_layout.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3119_set_level_call_parent.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3121_deprecate_FixedDateFormat.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3121_instant_format.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3123_change_PatternLayout_exception_renderer.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3127_JDBC_appender_IOException_stream_closed.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3143_logger_registry.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3149_change_StatusData_prefix.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3151_fix_mongodb_appender_deprecation_warning.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3153_fix_StringMatchFilter_guardNPE.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3159_fix_AsyncWaitStrategyFactoryConfig_guardNPE.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3206_fix_rootLogger_shorthand_npe.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3212_fix_JTL_StackTraceStringResolver.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3215_fix-RegexReplacement.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3217_precise_clock.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3257_fix_AsyncAppender_requiresLocation.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3257_fix_FailoverAppender_requiresLocation.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3300_fix-javadoc.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3359_fix-javadoc.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3369_fix_typo_in_RootLogger_Builder_method.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3398_fix_JTL_RecyclerFactoryConverter.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3399_logger_registry.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3430_InternalLoggerRegistry_stale_entry_expunge.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3431_default_config_name.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3437_transtive_compile_only_dependencies.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3467_add_mongodb_conn_db_name.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3508_LoggerContext_shutdownDisable.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3562_StatusData_ArrayIndexOutOfBounds.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3586_improve_GcpLayout.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3601_deprecate_or_remove_hiding_methods.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3639_disable_optimization_for_filling_the_stack_trace.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3645_speedup_array_logging.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3655_handle_missing_stack_traces_in_ExtendedThreadInformation.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3665_fix_StatusLogger_writing_to_stdout.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3669_generalize_ReadOnlyStringMap_equality.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3686_invoke_java_util_base64_directly_instead_of_reflectively.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/3706_osgi-disruptor.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/fix_JsonWriter_surrogate_handling.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/throwable-proxy-clean-up.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_actions_stale.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_ch_qos_logback_logback_core.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_com_fasterxml_jackson_jackson_bom.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_com_github_spotbugs_spotbugs_annotations.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_io_fabric8_docker_maven_plugin.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_cassandra_cassandra_all.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_commons_commons_csv.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_commons_commons_dbcp2.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_commons_commons_pool2.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_kafka_kafka_clients.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_logging_logging_parent.xml (88%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_apache_tomcat_tomcat_juli.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_eclipse_jetty_jetty_util.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_jmdns_jmdns.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_mongodb_bson.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_slf4j_slf4j_api.xml (100%) rename src/changelog/{.2.x.x => 2.25.0}/update_org_springframework_cloud_spring_cloud_context.xml (100%) diff --git a/pom.xml b/pom.xml index 3de3452381d..a336379dcb5 100644 --- a/pom.xml +++ b/pom.xml @@ -279,7 +279,7 @@ scm:git:https://github.com/apache/logging-log4j2.git scm:git:https://github.com/apache/logging-log4j2.git - 2.x + rel/2.25.0 https://github.com/apache/logging-log4j2 @@ -307,11 +307,11 @@ - 2.25.0-SNAPSHOT + 2.25.0 - 2.24.3 - 2.24.3 - 2.24.3 + 2.25.0 + 2.25.0 + 2.25.0 + diff --git a/src/changelog/.2.x.x/1736_split_jansi_support.xml b/src/changelog/2.25.0/1736_split_jansi_support.xml similarity index 100% rename from src/changelog/.2.x.x/1736_split_jansi_support.xml rename to src/changelog/2.25.0/1736_split_jansi_support.xml diff --git a/src/changelog/.2.x.x/2229_mongodb_docker.xml b/src/changelog/2.25.0/2229_mongodb_docker.xml similarity index 100% rename from src/changelog/.2.x.x/2229_mongodb_docker.xml rename to src/changelog/2.25.0/2229_mongodb_docker.xml diff --git a/src/changelog/.2.x.x/2295_add_JMS_Jakarta_Appender.xml b/src/changelog/2.25.0/2295_add_JMS_Jakarta_Appender.xml similarity index 100% rename from src/changelog/.2.x.x/2295_add_JMS_Jakarta_Appender.xml rename to src/changelog/2.25.0/2295_add_JMS_Jakarta_Appender.xml diff --git a/src/changelog/.2.x.x/2592_fix_RollingFileManager_unsuccessful_rollover.xml b/src/changelog/2.25.0/2592_fix_RollingFileManager_unsuccessful_rollover.xml similarity index 100% rename from src/changelog/.2.x.x/2592_fix_RollingFileManager_unsuccessful_rollover.xml rename to src/changelog/2.25.0/2592_fix_RollingFileManager_unsuccessful_rollover.xml diff --git a/src/changelog/.2.x.x/2691_change_PatternLayout_exception_rendering.xml b/src/changelog/2.25.0/2691_change_PatternLayout_exception_rendering.xml similarity index 100% rename from src/changelog/.2.x.x/2691_change_PatternLayout_exception_rendering.xml rename to src/changelog/2.25.0/2691_change_PatternLayout_exception_rendering.xml diff --git a/src/changelog/.2.x.x/2691_deprecate_ThrowableProxy.xml b/src/changelog/2.25.0/2691_deprecate_ThrowableProxy.xml similarity index 100% rename from src/changelog/.2.x.x/2691_deprecate_ThrowableProxy.xml rename to src/changelog/2.25.0/2691_deprecate_ThrowableProxy.xml diff --git a/src/changelog/.2.x.x/2691_fix_PatternLayout_exception_rendering.xml b/src/changelog/2.25.0/2691_fix_PatternLayout_exception_rendering.xml similarity index 100% rename from src/changelog/.2.x.x/2691_fix_PatternLayout_exception_rendering.xml rename to src/changelog/2.25.0/2691_fix_PatternLayout_exception_rendering.xml diff --git a/src/changelog/.2.x.x/2767_reload_key_stores.xml b/src/changelog/2.25.0/2767_reload_key_stores.xml similarity index 100% rename from src/changelog/.2.x.x/2767_reload_key_stores.xml rename to src/changelog/2.25.0/2767_reload_key_stores.xml diff --git a/src/changelog/.2.x.x/2767_simplify_SSL_config_logic.xml b/src/changelog/2.25.0/2767_simplify_SSL_config_logic.xml similarity index 100% rename from src/changelog/.2.x.x/2767_simplify_SSL_config_logic.xml rename to src/changelog/2.25.0/2767_simplify_SSL_config_logic.xml diff --git a/src/changelog/.2.x.x/2769_pluginAttribute_publicSetterWarning.xml b/src/changelog/2.25.0/2769_pluginAttribute_publicSetterWarning.xml similarity index 100% rename from src/changelog/.2.x.x/2769_pluginAttribute_publicSetterWarning.xml rename to src/changelog/2.25.0/2769_pluginAttribute_publicSetterWarning.xml diff --git a/src/changelog/.2.x.x/2916_rewrite_jansi_renderer.xml b/src/changelog/2.25.0/2916_rewrite_jansi_renderer.xml similarity index 100% rename from src/changelog/.2.x.x/2916_rewrite_jansi_renderer.xml rename to src/changelog/2.25.0/2916_rewrite_jansi_renderer.xml diff --git a/src/changelog/.2.x.x/2936_deprecate_AbstractLogger_checkMessageFactory.xml b/src/changelog/2.25.0/2936_deprecate_AbstractLogger_checkMessageFactory.xml similarity index 100% rename from src/changelog/.2.x.x/2936_deprecate_AbstractLogger_checkMessageFactory.xml rename to src/changelog/2.25.0/2936_deprecate_AbstractLogger_checkMessageFactory.xml diff --git a/src/changelog/.2.x.x/2937-http-watcher.xml b/src/changelog/2.25.0/2937-http-watcher.xml similarity index 100% rename from src/changelog/.2.x.x/2937-http-watcher.xml rename to src/changelog/2.25.0/2937-http-watcher.xml diff --git a/src/changelog/.2.x.x/2942_fix_ThreadContext_putAll.xml b/src/changelog/2.25.0/2942_fix_ThreadContext_putAll.xml similarity index 100% rename from src/changelog/.2.x.x/2942_fix_ThreadContext_putAll.xml rename to src/changelog/2.25.0/2942_fix_ThreadContext_putAll.xml diff --git a/src/changelog/.2.x.x/2949_add_fuzzing.xml b/src/changelog/2.25.0/2949_add_fuzzing.xml similarity index 100% rename from src/changelog/.2.x.x/2949_add_fuzzing.xml rename to src/changelog/2.25.0/2949_add_fuzzing.xml diff --git a/src/changelog/.2.x.x/3011_http_appender_validation.xml b/src/changelog/2.25.0/3011_http_appender_validation.xml similarity index 100% rename from src/changelog/.2.x.x/3011_http_appender_validation.xml rename to src/changelog/2.25.0/3011_http_appender_validation.xml diff --git a/src/changelog/.2.x.x/3030_fix_log4j1_getLogger.xml b/src/changelog/2.25.0/3030_fix_log4j1_getLogger.xml similarity index 100% rename from src/changelog/.2.x.x/3030_fix_log4j1_getLogger.xml rename to src/changelog/2.25.0/3030_fix_log4j1_getLogger.xml diff --git a/src/changelog/.2.x.x/3045_change_PatternLayout_prefix.xml b/src/changelog/2.25.0/3045_change_PatternLayout_prefix.xml similarity index 100% rename from src/changelog/.2.x.x/3045_change_PatternLayout_prefix.xml rename to src/changelog/2.25.0/3045_change_PatternLayout_prefix.xml diff --git a/src/changelog/.2.x.x/3045_fix_PatternLayout_rEx_property.xml b/src/changelog/2.25.0/3045_fix_PatternLayout_rEx_property.xml similarity index 100% rename from src/changelog/.2.x.x/3045_fix_PatternLayout_rEx_property.xml rename to src/changelog/2.25.0/3045_fix_PatternLayout_rEx_property.xml diff --git a/src/changelog/.2.x.x/3045_remove_PatternLayout_ex_ansi.xml b/src/changelog/2.25.0/3045_remove_PatternLayout_ex_ansi.xml similarity index 100% rename from src/changelog/.2.x.x/3045_remove_PatternLayout_ex_ansi.xml rename to src/changelog/2.25.0/3045_remove_PatternLayout_ex_ansi.xml diff --git a/src/changelog/.2.x.x/3048_fix_ThreadContext_remove.xml b/src/changelog/2.25.0/3048_fix_ThreadContext_remove.xml similarity index 100% rename from src/changelog/.2.x.x/3048_fix_ThreadContext_remove.xml rename to src/changelog/2.25.0/3048_fix_ThreadContext_remove.xml diff --git a/src/changelog/.2.x.x/3053_graalvm_processor.xml b/src/changelog/2.25.0/3053_graalvm_processor.xml similarity index 100% rename from src/changelog/.2.x.x/3053_graalvm_processor.xml rename to src/changelog/2.25.0/3053_graalvm_processor.xml diff --git a/src/changelog/.2.x.x/3056_android_support.xml b/src/changelog/2.25.0/3056_android_support.xml similarity index 100% rename from src/changelog/.2.x.x/3056_android_support.xml rename to src/changelog/2.25.0/3056_android_support.xml diff --git a/src/changelog/.2.x.x/3066_fix_bom.xml b/src/changelog/2.25.0/3066_fix_bom.xml similarity index 100% rename from src/changelog/.2.x.x/3066_fix_bom.xml rename to src/changelog/2.25.0/3066_fix_bom.xml diff --git a/src/changelog/.2.x.x/3074_monitor_additional_files.xml b/src/changelog/2.25.0/3074_monitor_additional_files.xml similarity index 100% rename from src/changelog/.2.x.x/3074_monitor_additional_files.xml rename to src/changelog/2.25.0/3074_monitor_additional_files.xml diff --git a/src/changelog/.2.x.x/3085_fix_log4j_1_priority.xml b/src/changelog/2.25.0/3085_fix_log4j_1_priority.xml similarity index 100% rename from src/changelog/.2.x.x/3085_fix_log4j_1_priority.xml rename to src/changelog/2.25.0/3085_fix_log4j_1_priority.xml diff --git a/src/changelog/.2.x.x/3118_default_layout.xml b/src/changelog/2.25.0/3118_default_layout.xml similarity index 100% rename from src/changelog/.2.x.x/3118_default_layout.xml rename to src/changelog/2.25.0/3118_default_layout.xml diff --git a/src/changelog/.2.x.x/3119_set_level_call_parent.xml b/src/changelog/2.25.0/3119_set_level_call_parent.xml similarity index 100% rename from src/changelog/.2.x.x/3119_set_level_call_parent.xml rename to src/changelog/2.25.0/3119_set_level_call_parent.xml diff --git a/src/changelog/.2.x.x/3121_deprecate_FixedDateFormat.xml b/src/changelog/2.25.0/3121_deprecate_FixedDateFormat.xml similarity index 100% rename from src/changelog/.2.x.x/3121_deprecate_FixedDateFormat.xml rename to src/changelog/2.25.0/3121_deprecate_FixedDateFormat.xml diff --git a/src/changelog/.2.x.x/3121_instant_format.xml b/src/changelog/2.25.0/3121_instant_format.xml similarity index 100% rename from src/changelog/.2.x.x/3121_instant_format.xml rename to src/changelog/2.25.0/3121_instant_format.xml diff --git a/src/changelog/.2.x.x/3123_change_PatternLayout_exception_renderer.xml b/src/changelog/2.25.0/3123_change_PatternLayout_exception_renderer.xml similarity index 100% rename from src/changelog/.2.x.x/3123_change_PatternLayout_exception_renderer.xml rename to src/changelog/2.25.0/3123_change_PatternLayout_exception_renderer.xml diff --git a/src/changelog/.2.x.x/3127_JDBC_appender_IOException_stream_closed.xml b/src/changelog/2.25.0/3127_JDBC_appender_IOException_stream_closed.xml similarity index 100% rename from src/changelog/.2.x.x/3127_JDBC_appender_IOException_stream_closed.xml rename to src/changelog/2.25.0/3127_JDBC_appender_IOException_stream_closed.xml diff --git a/src/changelog/.2.x.x/3143_logger_registry.xml b/src/changelog/2.25.0/3143_logger_registry.xml similarity index 100% rename from src/changelog/.2.x.x/3143_logger_registry.xml rename to src/changelog/2.25.0/3143_logger_registry.xml diff --git a/src/changelog/.2.x.x/3149_change_StatusData_prefix.xml b/src/changelog/2.25.0/3149_change_StatusData_prefix.xml similarity index 100% rename from src/changelog/.2.x.x/3149_change_StatusData_prefix.xml rename to src/changelog/2.25.0/3149_change_StatusData_prefix.xml diff --git a/src/changelog/.2.x.x/3151_fix_mongodb_appender_deprecation_warning.xml b/src/changelog/2.25.0/3151_fix_mongodb_appender_deprecation_warning.xml similarity index 100% rename from src/changelog/.2.x.x/3151_fix_mongodb_appender_deprecation_warning.xml rename to src/changelog/2.25.0/3151_fix_mongodb_appender_deprecation_warning.xml diff --git a/src/changelog/.2.x.x/3153_fix_StringMatchFilter_guardNPE.xml b/src/changelog/2.25.0/3153_fix_StringMatchFilter_guardNPE.xml similarity index 100% rename from src/changelog/.2.x.x/3153_fix_StringMatchFilter_guardNPE.xml rename to src/changelog/2.25.0/3153_fix_StringMatchFilter_guardNPE.xml diff --git a/src/changelog/.2.x.x/3159_fix_AsyncWaitStrategyFactoryConfig_guardNPE.xml b/src/changelog/2.25.0/3159_fix_AsyncWaitStrategyFactoryConfig_guardNPE.xml similarity index 100% rename from src/changelog/.2.x.x/3159_fix_AsyncWaitStrategyFactoryConfig_guardNPE.xml rename to src/changelog/2.25.0/3159_fix_AsyncWaitStrategyFactoryConfig_guardNPE.xml diff --git a/src/changelog/.2.x.x/3206_fix_rootLogger_shorthand_npe.xml b/src/changelog/2.25.0/3206_fix_rootLogger_shorthand_npe.xml similarity index 100% rename from src/changelog/.2.x.x/3206_fix_rootLogger_shorthand_npe.xml rename to src/changelog/2.25.0/3206_fix_rootLogger_shorthand_npe.xml diff --git a/src/changelog/.2.x.x/3212_fix_JTL_StackTraceStringResolver.xml b/src/changelog/2.25.0/3212_fix_JTL_StackTraceStringResolver.xml similarity index 100% rename from src/changelog/.2.x.x/3212_fix_JTL_StackTraceStringResolver.xml rename to src/changelog/2.25.0/3212_fix_JTL_StackTraceStringResolver.xml diff --git a/src/changelog/.2.x.x/3215_fix-RegexReplacement.xml b/src/changelog/2.25.0/3215_fix-RegexReplacement.xml similarity index 100% rename from src/changelog/.2.x.x/3215_fix-RegexReplacement.xml rename to src/changelog/2.25.0/3215_fix-RegexReplacement.xml diff --git a/src/changelog/.2.x.x/3217_precise_clock.xml b/src/changelog/2.25.0/3217_precise_clock.xml similarity index 100% rename from src/changelog/.2.x.x/3217_precise_clock.xml rename to src/changelog/2.25.0/3217_precise_clock.xml diff --git a/src/changelog/.2.x.x/3257_fix_AsyncAppender_requiresLocation.xml b/src/changelog/2.25.0/3257_fix_AsyncAppender_requiresLocation.xml similarity index 100% rename from src/changelog/.2.x.x/3257_fix_AsyncAppender_requiresLocation.xml rename to src/changelog/2.25.0/3257_fix_AsyncAppender_requiresLocation.xml diff --git a/src/changelog/.2.x.x/3257_fix_FailoverAppender_requiresLocation.xml b/src/changelog/2.25.0/3257_fix_FailoverAppender_requiresLocation.xml similarity index 100% rename from src/changelog/.2.x.x/3257_fix_FailoverAppender_requiresLocation.xml rename to src/changelog/2.25.0/3257_fix_FailoverAppender_requiresLocation.xml diff --git a/src/changelog/.2.x.x/3300_fix-javadoc.xml b/src/changelog/2.25.0/3300_fix-javadoc.xml similarity index 100% rename from src/changelog/.2.x.x/3300_fix-javadoc.xml rename to src/changelog/2.25.0/3300_fix-javadoc.xml diff --git a/src/changelog/.2.x.x/3359_fix-javadoc.xml b/src/changelog/2.25.0/3359_fix-javadoc.xml similarity index 100% rename from src/changelog/.2.x.x/3359_fix-javadoc.xml rename to src/changelog/2.25.0/3359_fix-javadoc.xml diff --git a/src/changelog/.2.x.x/3369_fix_typo_in_RootLogger_Builder_method.xml b/src/changelog/2.25.0/3369_fix_typo_in_RootLogger_Builder_method.xml similarity index 100% rename from src/changelog/.2.x.x/3369_fix_typo_in_RootLogger_Builder_method.xml rename to src/changelog/2.25.0/3369_fix_typo_in_RootLogger_Builder_method.xml diff --git a/src/changelog/.2.x.x/3398_fix_JTL_RecyclerFactoryConverter.xml b/src/changelog/2.25.0/3398_fix_JTL_RecyclerFactoryConverter.xml similarity index 100% rename from src/changelog/.2.x.x/3398_fix_JTL_RecyclerFactoryConverter.xml rename to src/changelog/2.25.0/3398_fix_JTL_RecyclerFactoryConverter.xml diff --git a/src/changelog/.2.x.x/3399_logger_registry.xml b/src/changelog/2.25.0/3399_logger_registry.xml similarity index 100% rename from src/changelog/.2.x.x/3399_logger_registry.xml rename to src/changelog/2.25.0/3399_logger_registry.xml diff --git a/src/changelog/.2.x.x/3430_InternalLoggerRegistry_stale_entry_expunge.xml b/src/changelog/2.25.0/3430_InternalLoggerRegistry_stale_entry_expunge.xml similarity index 100% rename from src/changelog/.2.x.x/3430_InternalLoggerRegistry_stale_entry_expunge.xml rename to src/changelog/2.25.0/3430_InternalLoggerRegistry_stale_entry_expunge.xml diff --git a/src/changelog/.2.x.x/3431_default_config_name.xml b/src/changelog/2.25.0/3431_default_config_name.xml similarity index 100% rename from src/changelog/.2.x.x/3431_default_config_name.xml rename to src/changelog/2.25.0/3431_default_config_name.xml diff --git a/src/changelog/.2.x.x/3437_transtive_compile_only_dependencies.xml b/src/changelog/2.25.0/3437_transtive_compile_only_dependencies.xml similarity index 100% rename from src/changelog/.2.x.x/3437_transtive_compile_only_dependencies.xml rename to src/changelog/2.25.0/3437_transtive_compile_only_dependencies.xml diff --git a/src/changelog/.2.x.x/3467_add_mongodb_conn_db_name.xml b/src/changelog/2.25.0/3467_add_mongodb_conn_db_name.xml similarity index 100% rename from src/changelog/.2.x.x/3467_add_mongodb_conn_db_name.xml rename to src/changelog/2.25.0/3467_add_mongodb_conn_db_name.xml diff --git a/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml b/src/changelog/2.25.0/3508_LoggerContext_shutdownDisable.xml similarity index 100% rename from src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml rename to src/changelog/2.25.0/3508_LoggerContext_shutdownDisable.xml diff --git a/src/changelog/.2.x.x/3562_StatusData_ArrayIndexOutOfBounds.xml b/src/changelog/2.25.0/3562_StatusData_ArrayIndexOutOfBounds.xml similarity index 100% rename from src/changelog/.2.x.x/3562_StatusData_ArrayIndexOutOfBounds.xml rename to src/changelog/2.25.0/3562_StatusData_ArrayIndexOutOfBounds.xml diff --git a/src/changelog/.2.x.x/3586_improve_GcpLayout.xml b/src/changelog/2.25.0/3586_improve_GcpLayout.xml similarity index 100% rename from src/changelog/.2.x.x/3586_improve_GcpLayout.xml rename to src/changelog/2.25.0/3586_improve_GcpLayout.xml diff --git a/src/changelog/.2.x.x/3601_deprecate_or_remove_hiding_methods.xml b/src/changelog/2.25.0/3601_deprecate_or_remove_hiding_methods.xml similarity index 100% rename from src/changelog/.2.x.x/3601_deprecate_or_remove_hiding_methods.xml rename to src/changelog/2.25.0/3601_deprecate_or_remove_hiding_methods.xml diff --git a/src/changelog/.2.x.x/3639_disable_optimization_for_filling_the_stack_trace.xml b/src/changelog/2.25.0/3639_disable_optimization_for_filling_the_stack_trace.xml similarity index 100% rename from src/changelog/.2.x.x/3639_disable_optimization_for_filling_the_stack_trace.xml rename to src/changelog/2.25.0/3639_disable_optimization_for_filling_the_stack_trace.xml diff --git a/src/changelog/.2.x.x/3645_speedup_array_logging.xml b/src/changelog/2.25.0/3645_speedup_array_logging.xml similarity index 100% rename from src/changelog/.2.x.x/3645_speedup_array_logging.xml rename to src/changelog/2.25.0/3645_speedup_array_logging.xml diff --git a/src/changelog/.2.x.x/3655_handle_missing_stack_traces_in_ExtendedThreadInformation.xml b/src/changelog/2.25.0/3655_handle_missing_stack_traces_in_ExtendedThreadInformation.xml similarity index 100% rename from src/changelog/.2.x.x/3655_handle_missing_stack_traces_in_ExtendedThreadInformation.xml rename to src/changelog/2.25.0/3655_handle_missing_stack_traces_in_ExtendedThreadInformation.xml diff --git a/src/changelog/.2.x.x/3665_fix_StatusLogger_writing_to_stdout.xml b/src/changelog/2.25.0/3665_fix_StatusLogger_writing_to_stdout.xml similarity index 100% rename from src/changelog/.2.x.x/3665_fix_StatusLogger_writing_to_stdout.xml rename to src/changelog/2.25.0/3665_fix_StatusLogger_writing_to_stdout.xml diff --git a/src/changelog/.2.x.x/3669_generalize_ReadOnlyStringMap_equality.xml b/src/changelog/2.25.0/3669_generalize_ReadOnlyStringMap_equality.xml similarity index 100% rename from src/changelog/.2.x.x/3669_generalize_ReadOnlyStringMap_equality.xml rename to src/changelog/2.25.0/3669_generalize_ReadOnlyStringMap_equality.xml diff --git a/src/changelog/.2.x.x/3686_invoke_java_util_base64_directly_instead_of_reflectively.xml b/src/changelog/2.25.0/3686_invoke_java_util_base64_directly_instead_of_reflectively.xml similarity index 100% rename from src/changelog/.2.x.x/3686_invoke_java_util_base64_directly_instead_of_reflectively.xml rename to src/changelog/2.25.0/3686_invoke_java_util_base64_directly_instead_of_reflectively.xml diff --git a/src/changelog/.2.x.x/3706_osgi-disruptor.xml b/src/changelog/2.25.0/3706_osgi-disruptor.xml similarity index 100% rename from src/changelog/.2.x.x/3706_osgi-disruptor.xml rename to src/changelog/2.25.0/3706_osgi-disruptor.xml diff --git a/src/changelog/.2.x.x/fix_JsonWriter_surrogate_handling.xml b/src/changelog/2.25.0/fix_JsonWriter_surrogate_handling.xml similarity index 100% rename from src/changelog/.2.x.x/fix_JsonWriter_surrogate_handling.xml rename to src/changelog/2.25.0/fix_JsonWriter_surrogate_handling.xml diff --git a/src/changelog/.2.x.x/throwable-proxy-clean-up.xml b/src/changelog/2.25.0/throwable-proxy-clean-up.xml similarity index 100% rename from src/changelog/.2.x.x/throwable-proxy-clean-up.xml rename to src/changelog/2.25.0/throwable-proxy-clean-up.xml diff --git a/src/changelog/.2.x.x/update_actions_stale.xml b/src/changelog/2.25.0/update_actions_stale.xml similarity index 100% rename from src/changelog/.2.x.x/update_actions_stale.xml rename to src/changelog/2.25.0/update_actions_stale.xml diff --git a/src/changelog/.2.x.x/update_ch_qos_logback_logback_core.xml b/src/changelog/2.25.0/update_ch_qos_logback_logback_core.xml similarity index 100% rename from src/changelog/.2.x.x/update_ch_qos_logback_logback_core.xml rename to src/changelog/2.25.0/update_ch_qos_logback_logback_core.xml diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml b/src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml similarity index 100% rename from src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml rename to src/changelog/2.25.0/update_com_fasterxml_jackson_jackson_bom.xml diff --git a/src/changelog/.2.x.x/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/2.25.0/update_com_github_spotbugs_spotbugs_annotations.xml similarity index 100% rename from src/changelog/.2.x.x/update_com_github_spotbugs_spotbugs_annotations.xml rename to src/changelog/2.25.0/update_com_github_spotbugs_spotbugs_annotations.xml diff --git a/src/changelog/.2.x.x/update_io_fabric8_docker_maven_plugin.xml b/src/changelog/2.25.0/update_io_fabric8_docker_maven_plugin.xml similarity index 100% rename from src/changelog/.2.x.x/update_io_fabric8_docker_maven_plugin.xml rename to src/changelog/2.25.0/update_io_fabric8_docker_maven_plugin.xml diff --git a/src/changelog/.2.x.x/update_org_apache_cassandra_cassandra_all.xml b/src/changelog/2.25.0/update_org_apache_cassandra_cassandra_all.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_cassandra_cassandra_all.xml rename to src/changelog/2.25.0/update_org_apache_cassandra_cassandra_all.xml diff --git a/src/changelog/.2.x.x/update_org_apache_commons_commons_csv.xml b/src/changelog/2.25.0/update_org_apache_commons_commons_csv.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_commons_commons_csv.xml rename to src/changelog/2.25.0/update_org_apache_commons_commons_csv.xml diff --git a/src/changelog/.2.x.x/update_org_apache_commons_commons_dbcp2.xml b/src/changelog/2.25.0/update_org_apache_commons_commons_dbcp2.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_commons_commons_dbcp2.xml rename to src/changelog/2.25.0/update_org_apache_commons_commons_dbcp2.xml diff --git a/src/changelog/.2.x.x/update_org_apache_commons_commons_pool2.xml b/src/changelog/2.25.0/update_org_apache_commons_commons_pool2.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_commons_commons_pool2.xml rename to src/changelog/2.25.0/update_org_apache_commons_commons_pool2.xml diff --git a/src/changelog/.2.x.x/update_org_apache_kafka_kafka_clients.xml b/src/changelog/2.25.0/update_org_apache_kafka_kafka_clients.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_kafka_kafka_clients.xml rename to src/changelog/2.25.0/update_org_apache_kafka_kafka_clients.xml diff --git a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml b/src/changelog/2.25.0/update_org_apache_logging_logging_parent.xml similarity index 88% rename from src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml rename to src/changelog/2.25.0/update_org_apache_logging_logging_parent.xml index 0ea7b563939..3dc20db50d0 100644 --- a/src/changelog/.2.x.x/update_org_apache_logging_logging_parent.xml +++ b/src/changelog/2.25.0/update_org_apache_logging_logging_parent.xml @@ -3,5 +3,5 @@ xmlns="https://logging.apache.org/xml/ns" xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd" type="updated"> - Update `org.apache.logging:logging-parent` to version `12.0.0` + Update `org.apache.logging:logging-parent` to version `12.1.1` diff --git a/src/changelog/.2.x.x/update_org_apache_tomcat_tomcat_juli.xml b/src/changelog/2.25.0/update_org_apache_tomcat_tomcat_juli.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_apache_tomcat_tomcat_juli.xml rename to src/changelog/2.25.0/update_org_apache_tomcat_tomcat_juli.xml diff --git a/src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_util.xml b/src/changelog/2.25.0/update_org_eclipse_jetty_jetty_util.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_eclipse_jetty_jetty_util.xml rename to src/changelog/2.25.0/update_org_eclipse_jetty_jetty_util.xml diff --git a/src/changelog/.2.x.x/update_org_jmdns_jmdns.xml b/src/changelog/2.25.0/update_org_jmdns_jmdns.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_jmdns_jmdns.xml rename to src/changelog/2.25.0/update_org_jmdns_jmdns.xml diff --git a/src/changelog/.2.x.x/update_org_mongodb_bson.xml b/src/changelog/2.25.0/update_org_mongodb_bson.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_mongodb_bson.xml rename to src/changelog/2.25.0/update_org_mongodb_bson.xml diff --git a/src/changelog/.2.x.x/update_org_slf4j_slf4j_api.xml b/src/changelog/2.25.0/update_org_slf4j_slf4j_api.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_slf4j_slf4j_api.xml rename to src/changelog/2.25.0/update_org_slf4j_slf4j_api.xml diff --git a/src/changelog/.2.x.x/update_org_springframework_cloud_spring_cloud_context.xml b/src/changelog/2.25.0/update_org_springframework_cloud_spring_cloud_context.xml similarity index 100% rename from src/changelog/.2.x.x/update_org_springframework_cloud_spring_cloud_context.xml rename to src/changelog/2.25.0/update_org_springframework_cloud_spring_cloud_context.xml From c9fbc53323a1222a169b5028c950d87af887962d Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Fri, 13 Jun 2025 18:26:23 +0200 Subject: [PATCH 2/5] fix: use normalized form for new configuration property --- .../core/util/internal/instant/InstantPatternFormatter.java | 2 +- .../manual/systemproperties/properties-log4j-core-misc.adoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java index e3fab77e188..785968c26e1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java @@ -40,7 +40,7 @@ public interface InstantPatternFormatter extends InstantFormatter { boolean LEGACY_FORMATTERS_ENABLED = - "legacy".equalsIgnoreCase(PropertiesUtil.getProperties().getStringProperty("log4j2.instant.formatter")); + "legacy".equalsIgnoreCase(PropertiesUtil.getProperties().getStringProperty("log4j2.instantFormatter")); String getPattern(); diff --git a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc index e9a44de433b..fcb8ff4d706 100644 --- a/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc +++ b/src/site/antora/modules/ROOT/partials/manual/systemproperties/properties-log4j-core-misc.adoc @@ -262,8 +262,8 @@ link:../javadoc/log4j-api/org/apache/logging/log4j/message/FlowMessageFactory.ht implementation to be used by all loggers. // end::flow-tracing[] -[id=log4j2.instant.formatter] -== `log4j2.instant.formatter` +[id=log4j2.instantFormatter] +== `log4j2.instantFormatter` [cols="1h,5"] |=== From 75061eb9d266005c871eedaeab668faa2118ce7d Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Fri, 13 Jun 2025 19:08:55 +0200 Subject: [PATCH 3/5] fix: Javadoc and documentation problems --- .../map/UnmodifiableArrayBackedMap.java | 8 ----- src/changelog/2.25.0/.release-notes.adoc.ftl | 12 +++++-- .../pages/manual/appenders/message-queue.adoc | 35 +++++++++++++++++-- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java index 45f61cefd9f..2911710bd3c 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java @@ -269,10 +269,6 @@ public UnmodifiableArrayBackedMap copyAndPut(String key, String value) { /** * Creates a new instance that contains the same entries as this map, plus the * new entries or updated values passed in the parameters. - * - * @param key - * @param value - * @return */ public UnmodifiableArrayBackedMap copyAndPutAll(Map entriesToAdd) { // create a new array that can hold the maximum output size @@ -304,10 +300,6 @@ public UnmodifiableArrayBackedMap copyAndPutAll(Map entriesToAdd /** * Creates a new instance that contains the same entries as this map, minus the * entry with the specified key (if such an entry exists). - * - * @param key - * @param value - * @return */ public UnmodifiableArrayBackedMap copyAndRemove(String key) { int indexToRemove = -1; diff --git a/src/changelog/2.25.0/.release-notes.adoc.ftl b/src/changelog/2.25.0/.release-notes.adoc.ftl index 5780f2efe85..76b92252d79 100644 --- a/src/changelog/2.25.0/.release-notes.adoc.ftl +++ b/src/changelog/2.25.0/.release-notes.adoc.ftl @@ -30,6 +30,14 @@ https://www.graalvm.org/latest/reference-manual/native-image/metadata/[GraalVM r enabling seamless generation of native images with GraalVM out of the box—no manual configuration required. For more information, refer to our xref:graalvm.adoc[GraalVM guide]. +[NOTE] +==== +When building third-party Log4j plugins, using the new `GraalVmProcessor` +introduced in version `2.25.0` will automatically generate the required reachability metadata for GraalVM native images. +However, the processor will fail the build if the required `log4j.graalvm.groupId` and `log4j.graalvm.artifactId` parameters are not provided. +For detailed instructions, see xref:manual/plugins.adoc#plugin-registry[Registering plugins]. +==== + [#release-notes-2-25-0-PL-ex] === Exception Handling in Pattern Layout @@ -39,7 +47,7 @@ Key improvements include: * Stack traces are now consistently prefixed with a newline instead of other whitespace. * The default exception converter has changed from xref:manual/pattern-layout.adoc#converter-exception-extended[extended] to xref:manual/pattern-layout.adoc#converter-exception[plain], offering better performance. -* Support for the `{ansi}` option in exception converters has been removed. +* Support for the `\{ansi}` option in exception converters has been removed. [#release-notes-2-25-0-instant-format] === Date & Time Formatting @@ -51,7 +59,7 @@ These are now deprecated in favor of Java’s standard https://docs.oracle.com/javase/{java-target-version}/docs/api/java/time/format/DateTimeFormatter.html[`DateTimeFormatter`]. If you encounter formatting issues after upgrading—particularly with `n` or `x` directives—you can temporarily revert to the legacy formatters by setting the xref:manual/systemproperties.adoc#log4j2.instantFormatter[`log4j2.instantFormatter`] property to `legacy`. -Please report any issues via our {logging-services-url}/support.html#issues\[issue tracker]. +Please report any issues via our {logging-services-url}/support.html#issues[issue tracker]. [#release-notes-2-25-0-windows-ansi] === ANSI Support on Windows diff --git a/src/site/antora/modules/ROOT/pages/manual/appenders/message-queue.adoc b/src/site/antora/modules/ROOT/pages/manual/appenders/message-queue.adoc index d032c53de30..2095597e39b 100644 --- a/src/site/antora/modules/ROOT/pages/manual/appenders/message-queue.adoc +++ b/src/site/antora/modules/ROOT/pages/manual/appenders/message-queue.adoc @@ -424,7 +424,7 @@ This example cannot be configured using Java properties. == JMS Appender The JMS Appender sends a formatted log event to a -https://jakarta.ee/specifications/messaging/3.0/[Jakarta] or https://jakarta.ee/specifications/messaging/2.0/[Javax] Messaging API +https://jakarta.ee/specifications/messaging/3.0/[Jakarta] or https://jakarta.ee/specifications/messaging/2.0/[Java] EE Messaging API destination. [IMPORTANT] @@ -434,9 +434,38 @@ xref:manual/systemproperties.adoc#log4j2.enableJndiJms[`log4j2.enableJndiJms`] configuration property to `true`. ==== -For Jakarta, use the `JMS-Jakarta` element name in the `log4j-jakarta-jms` Maven module. +[WARNING] +===== +Starting with Log4j `2.25.0`, the correct Appender element name depends on the version of Jakarta Messaging you are using: + +* **For Jakarta Messaging 3.0 or later**, use the `JMS-Jakarta` element name. +This requires additional runtime dependencies: ++ +[tabs] +==== +Maven:: ++ +[source,xml,subs="+attributes"] +---- + + org.apache.logging.log4j + log4j-jakarta-jms + {log4j-core-version} + +---- -For Javax, use the `JMS-Javax` element name; the names `JMS`, `JMSQueue`, and `JMSTopic` are provided for backward compatibility. +Gradle:: ++ +[source,groovy,subs="+attributes"] +---- +runtimeOnly 'org.apache.logging.log4j:log4j-jakarta-jms:{log4j-core-version}' +---- +==== + +* **For Java Messaging or Jakarta Messaging 2.0**, use the `JMS-Javax` element name instead. + +The legacy element names `JMS`, `JMSQueue`, and `JMSTopic` are still supported for backward compatibility. +===== [#JmsAppender-attributes] .JMS Appender configuration attributes From ea10ad3e78469e43f138853b8c9892bc51bc87ec Mon Sep 17 00:00:00 2001 From: ASF Logging Services RM Date: Fri, 13 Jun 2025 17:38:30 +0000 Subject: [PATCH 4/5] Update the `project.build.outputTimestamp` property --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a336379dcb5..856d2a805e9 100644 --- a/pom.xml +++ b/pom.xml @@ -325,7 +325,7 @@ 2. This value is employed in various places while creating the distribution To mitigate these, we define a *dummy* value here and let the CI replace it during a release. Hence, *DO NOT MANUALLY EDIT THIS VALUE*! --> - 2024-12-10T10:15:05Z + 2025-06-13T17:08:55Z - 2.25.0 + 2.26.0-SNAPSHOT 2.25.0 2.25.0