(logging-log4j2) branch main-site-stg-out updated: Add `.asf.yaml` along with an INFRA fix for the website content generated from `f95b50babfd4c768037a74b5f3fd483806e7c735`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new 415fed8b85 Add `.asf.yaml` along with an INFRA fix for the website content generated from `f95b50babfd4c768037a74b5f3fd483806e7c735` 415fed8b85 is described below commit 415fed8b85e2ddb060d1c36573df5a3f43f8b31e Author: ASF Logging Services RM AuthorDate: Mon Apr 22 04:31:43 2024 + Add `.asf.yaml` along with an INFRA fix for the website content generated from `f95b50babfd4c768037a74b5f3fd483806e7c735` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 0a712fd579..231c50456d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 29646 -# - Commit ID: 16511c9c0e98a4db6db9905e7ba913631f211e18 -# - Timestamp: 2024-04-21T18:34:39Z +# - Seed: 13882 +# - Commit ID: f95b50babfd4c768037a74b5f3fd483806e7c735 +# - Timestamp: 2024-04-22T04:31:43Z
(logging-log4j2) branch main-scoped-context deleted (was 388971b94f)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to branch main-scoped-context in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 388971b94f Import references in javadoc The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j2) branch main updated: Add scoped context support. Remove ThreadContextDataInjector. (#2494)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new f95b50babf Add scoped context support. Remove
ThreadContextDataInjector. (#2494)
f95b50babf is described below
commit f95b50babfd4c768037a74b5f3fd483806e7c735
Author: Ralph Goers
AuthorDate: Sun Apr 21 21:27:20 2024 -0700
Add scoped context support. Remove ThreadContextDataInjector. (#2494)
* Add ScopedContext. Remove ThreadContextDataInjector
* Import references in javadoc
---
.../logging/log4j/async/logger/AsyncLogger.java| 20 +-
.../log4j/async/logger/RingBufferLogEvent.java | 4 +-
.../async/logger/RingBufferLogEventTranslator.java | 14 +-
.../logging/log4j/core/LogEventFactoryTest.java| 19 +-
.../core/impl/ThreadContextDataInjectorTest.java | 178 --
.../log4j/core/util/ContextDataProviderTest.java | 23 +-
.../logging/log4j/core/ContextDataInjector.java| 112 -
.../org/apache/logging/log4j/core/LogEvent.java| 4 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 33 +--
.../core/filter/MutableThreadContextMapFilter.java | 3 -
.../log4j/core/filter/ThreadContextMapFilter.java | 28 +--
.../logging/log4j/core/impl/ContextData.java | 107
.../log4j/core/impl/ContextDataFactory.java| 5 +-
.../core/impl/ContextDataInjectorFactory.java | 95
.../logging/log4j/core/impl/CoreDefaultBundle.java | 25 +-
.../impl/CoreInstanceFactoryPostProcessor.java | 3 -
.../logging/log4j/core/impl/CoreProperties.java| 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 11 +-
.../logging/log4j/core/impl/Log4jProvider.java | 15 ++
.../log4j/core/impl/ReusableLogEventFactory.java | 15 +-
...rovider.java => ScopedContextDataProvider.java} | 37 ++-
.../log4j/core/impl/ThreadContextDataInjector.java | 271 -
.../log4j/core/impl/ThreadContextDataProvider.java | 15 +-
.../impl/internal/QueuedScopedContextProvider.java | 70 ++
.../log4j/core/impl/internal/package-info.java | 25 ++
.../log4j/core/lookup/ContextMapLookup.java| 15 +-
.../log4j/core/util/ContextDataProvider.java | 45 +++-
.../log4j/perf/jmh/ThreadContextBenchmark.java | 16 +-
src/site/antora/modules/ROOT/nav.adoc | 2 +
.../ROOT/pages/manual/dependencyinjection.adoc | 1 -
.../modules/ROOT/pages/manual/extending.adoc | 3 +-
.../modules/ROOT/pages/manual/resource-logger.adoc | 88 +++
.../modules/ROOT/pages/manual/scoped-context.adoc | 116 +
.../ROOT/pages/manual/systemproperties.adoc| 7 -
34 files changed, 589 insertions(+), 841 deletions(-)
diff --git
a/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
b/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
index cd430f94c0..5d0b2fc070 100644
---
a/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
+++
b/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
@@ -20,7 +20,6 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.ContextDataInjector;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.ReusableLogEvent;
@@ -30,7 +29,7 @@ import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.ReliabilityStrategy;
-import org.apache.logging.log4j.core.impl.ContextDataFactory;
+import org.apache.logging.log4j.core.impl.ContextData;
import org.apache.logging.log4j.core.time.Clock;
import org.apache.logging.log4j.core.time.NanoClock;
import org.apache.logging.log4j.kit.logger.AbstractLogger;
@@ -72,7 +71,6 @@ public class AsyncLogger extends Logger {
// immediate inlining instead of waiting until they are designated "hot
enough".
private final Clock clock; // not reconfigurable
-private final ContextDataInjector contextDataInjector; // not
reconfigurable
private final Recycler translatorRecycler;
private final AsyncLoggerDisruptor loggerDisruptor;
@@ -105,7 +103,6 @@ public class AsyncLogger extends Logger {
includeLocation = privateConfig.loggerConfig.isIncludeLocation();
nanoClock = configuration.getNanoClock();
clock = configuration.getComponent(Clock.KEY);
-contextDataInjector =
configuration.getComponent(ContextDataInjector.KEY);
}
/*
@@ -214,7 +211,6 @@ public class AsyncLogger extends
(logging-log4j-scala) branch dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0 updated (ffc646d -> 2f8f29f)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
discard ffc646d Bump org.apache.maven.plugins:maven-toolchains-plugin
add 2f8f29f Update `org.apache.maven.plugins:maven-toolchains-plugin` to
version `3.2.0` (#52)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ffc646d)
\
N -- N -- N
refs/heads/dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0
(2f8f29f)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../update_org_apache_maven_plugins_maven_toolchains_plugin.xml} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
copy src/changelog/{13.1.0/update_org_apache_logging_log4j_log4j_bom.xml =>
.13.x.x/update_org_apache_maven_plugins_maven_toolchains_plugin.xml} (59%)
(logging-log4j-scala) branch dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0 deleted (was 2f8f29f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git was 2f8f29f Update `org.apache.maven.plugins:maven-toolchains-plugin` to version `3.2.0` (#52) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-scala) branch main updated (8fccbb5 -> 2f8f29f)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git
from 8fccbb5 Fix `downloadUrl`
add 2f8f29f Update `org.apache.maven.plugins:maven-toolchains-plugin` to
version `3.2.0` (#52)
No new revisions were added by this update.
Summary of changes:
pom.xml | 2 +-
.../update_org_apache_maven_plugins_maven_toolchains_plugin.xml} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
copy src/changelog/{13.1.0/update_org_apache_logging_log4j_log4j_bom.xml =>
.13.x.x/update_org_apache_maven_plugins_maven_toolchains_plugin.xml} (59%)
(logging-log4j-scala) branch dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0 created (now ffc646d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-toolchains-plugin-3.2.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git at ffc646d Bump org.apache.maven.plugins:maven-toolchains-plugin No new revisions were added by this update.
(logging-log4j2) branch main-scoped-context updated (ef3261d683 -> 388971b94f)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to branch main-scoped-context in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from ef3261d683 merge main add 388971b94f Import references in javadoc No new revisions were added by this update. Summary of changes: log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java | 1 + .../org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java | 1 + .../main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java | 1 + .../main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java | 1 + 4 files changed, 4 insertions(+)
(logging-log4j2) branch main-scoped-context created (now ef3261d683)
This is an automated email from the ASF dual-hosted git repository. rgoers pushed a change to branch main-scoped-context in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at ef3261d683 merge main This branch includes the following new commits: new c0625c966b Add ScopedContext. Remove ThreadContextDataInjector new ef3261d683 merge main The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-log4j2) 02/02: merge main
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch main-scoped-context
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ef3261d6830575afa3f5da3ba2f513be6e26226d
Merge: c0625c966b 16511c9c0e
Author: Ralph Goers
AuthorDate: Sun Apr 21 16:54:10 2024 -0700
merge main
.github/generate-email.sh | 15 +-
.github/workflows/build.yaml | 23 +-
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/deploy-site.yaml | 98 +++
.github/workflows/merge-dependabot.yaml| 8 +-
antora-playbook.yaml | 10 +-
.../log4j/async/logger/AsyncThreadContextTest.java | 26 +-
.../config/plugins/convert/TypeConvertersTest.java | 14 +-
.../util/NamedLoggerContextPropertiesTest.java | 67 --
.../template/json/resolver/LevelResolver.java | 32 +-
.../.log4j-plugin-processing-activator | 0
{log4j-mongodb4 => log4j-mongodb}/pom.xml | 8 +-
.../logging/log4j/mongodb/MongoDbConnection.java | 14 +-
.../log4j/mongodb/MongoDbDocumentObject.java | 6 +-
.../log4j/mongodb/MongoDbDocumentObjectCodec.java | 14 +-
.../logging/log4j/mongodb/MongoDbLevelCodec.java | 6 +-
.../logging/log4j/mongodb/MongoDbProvider.java | 26 +-
.../logging/log4j/mongodb}/package-info.java | 2 +-
.../log4j/mongodb/AbstractMongoDbCappedTest.java | 10 +-
.../log4j/mongodb/MongoDbAdditionalFieldsTest.java | 12 +-
.../log4j/mongodb/MongoDbAuthFailureTest.java | 12 +-
.../log4j/mongodb/MongoDbCappedIntTest.java| 6 +-
.../log4j/mongodb/MongoDbCappedLongTest.java | 6 +-
.../log4j/mongodb/MongoDbMapMessageTest.java | 12 +-
.../logging/log4j/mongodb/MongoDbResolver.java | 11 +-
.../logging/log4j/mongodb/MongoDbResolverTest.java | 6 +-
.../apache/logging/log4j/mongodb/MongoDbTest.java | 12 +-
.../log4j/mongodb/MongoDbTestConstants.java| 4 +-
.../apache/logging/log4j/mongodb/UsingMongoDb.java | 6 +-
.../resources/log4j2-mongodb-additional-fields.xml | 2 +-
.../test/resources/log4j2-mongodb-auth-failure.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-int.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-long.xml | 2 +-
.../test/resources/log4j2-mongodb-map-message.xml | 2 +-
.../src/test/resources/log4j2-mongodb.xml | 2 +-
log4j-parent/pom.xml | 8 +-
log4j-spring-cloud-config-client/pom.xml | 2 +-
pom.xml| 230 ++-
.../.3.x.x/2408_remove_log4j_kubernetes.xml| 4 +-
src/changelog/.3.x.x/add_plugin_reference.xml | 4 +-
src/changelog/.3.x.x/migrate_to_antora.xml | 4 +-
src/changelog/.3.x.x/remove_cli_tools.xml | 4 +-
src/changelog/.3.x.x/remove_duration.xml | 4 +-
.../rename_log4j_mongodb4_to_log4j_mongodb.xml | 7 +
.../.3.x.x/update_apache_logging_parent.xml| 8 +
...update_co_elastic_logging_log4j2_ecs_layout.xml | 4 +-
.../update_com_fasterxml_jackson_jackson_bom.xml | 4 +-
.../.3.x.x/update_com_github_luben_zstd_jni.xml| 4 +-
...update_com_github_tomakehurst_wiremock_jre8.xml | 4 +-
.../.3.x.x/update_com_google_guava_guava.xml | 4 +-
.../.3.x.x/update_commons_io_commons_io.xml| 4 +-
.../update_commons_logging_commons_logging.xml | 4 +-
src/changelog/.3.x.x/update_io_netty_netty_bom.xml | 8 +-
.../.3.x.x/update_net_bytebuddy_byte_buddy.xml | 4 +-
.../update_org_apache_commons_commons_compress.xml | 4 +-
.../update_org_apache_commons_commons_dbcp2.xml| 4 +-
.../.3.x.x/update_org_apache_groovy_groovy_bom.xml | 4 +-
.../update_org_apache_tomcat_tomcat_juli.xml | 4 +-
.../.3.x.x/update_org_awaitility_awaitility.xml| 4 +-
...pdate_org_eclipse_platform_org_eclipse_osgi.xml | 4 +-
...client_elasticsearch_rest_high_level_client.xml | 4 +-
.../update_org_graalvm_truffle_truffle_api.xml | 8 +-
.../.3.x.x/update_org_javassist_javassist.xml | 4 +-
.../.3.x.x/update_org_mockito_mockito_bom.xml | 4 +-
src/changelog/.3.x.x/update_org_mongodb_bson.xml | 4 +-
.../.3.x.x/update_org_slf4j_slf4j_api.xml | 8 +
...ingframework_boot_spring_boot_autoconfigure.xml | 8 +-
..._springframework_cloud_spring_cloud_context.xml | 4 +-
...te_org_springframework_spring_framework_bom.xml | 4 +-
src/changelog/3.0.0-alpha1/.release.xml| 6 +-
.../3.0.0-alpha1/1220_Simplify_site_generation.xml | 5 +-
.../3.0.0-alpha1/480_Update_build_to_Java_11.xml | 5 +-
...be_created_through_more_flexible_dependency.xml | 5 +-
..._Convert_documentation_into_AsciiDoc_format.xml | 5 +-
...2171_Allow_to_force_LOG4J2_to_use_TCCL_only.xml | 9 +-
...ore_util_datetime_to_core_time_internal_for.xml | 5 +-
(logging-log4j2) 01/02: Add ScopedContext. Remove ThreadContextDataInjector
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch main-scoped-context
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c0625c966b47da3358c68c3bf2b116817949feab
Author: Ralph Goers
AuthorDate: Sun Apr 21 16:50:46 2024 -0700
Add ScopedContext. Remove ThreadContextDataInjector
---
.../logging/log4j/async/logger/AsyncLogger.java| 20 +-
.../log4j/async/logger/RingBufferLogEvent.java | 4 +-
.../async/logger/RingBufferLogEventTranslator.java | 14 +-
.../logging/log4j/core/LogEventFactoryTest.java| 19 +-
.../core/impl/ThreadContextDataInjectorTest.java | 178 --
.../log4j/core/util/ContextDataProviderTest.java | 23 +-
.../util/NamedLoggerContextPropertiesTest.java | 2 +-
.../logging/log4j/core/ContextDataInjector.java| 112 -
.../org/apache/logging/log4j/core/LogEvent.java| 3 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 32 +--
.../core/filter/MutableThreadContextMapFilter.java | 3 -
.../log4j/core/filter/ThreadContextMapFilter.java | 28 +--
.../logging/log4j/core/impl/ContextData.java | 107
.../log4j/core/impl/ContextDataFactory.java| 4 +-
.../core/impl/ContextDataInjectorFactory.java | 95
.../logging/log4j/core/impl/CoreDefaultBundle.java | 25 +-
.../impl/CoreInstanceFactoryPostProcessor.java | 3 -
.../logging/log4j/core/impl/CoreProperties.java| 5 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 11 +-
.../logging/log4j/core/impl/Log4jProvider.java | 15 ++
.../log4j/core/impl/ReusableLogEventFactory.java | 15 +-
...rovider.java => ScopedContextDataProvider.java} | 37 ++-
.../log4j/core/impl/ThreadContextDataInjector.java | 271 -
.../log4j/core/impl/ThreadContextDataProvider.java | 15 +-
.../impl/internal/QueuedScopedContextProvider.java | 70 ++
.../log4j/core/impl/internal/package-info.java | 25 ++
.../log4j/core/lookup/ContextMapLookup.java| 14 +-
.../log4j/core/util/ContextDataProvider.java | 45 +++-
.../log4j/perf/jmh/ThreadContextBenchmark.java | 16 +-
src/site/antora/modules/ROOT/nav.adoc | 2 +
.../ROOT/pages/manual/dependencyinjection.adoc | 1 -
.../modules/ROOT/pages/manual/extending.adoc | 3 +-
.../modules/ROOT/pages/manual/resource-logger.adoc | 88 +++
.../modules/ROOT/pages/manual/scoped-context.adoc | 116 +
.../ROOT/pages/manual/systemproperties.adoc| 7 -
35 files changed, 586 insertions(+), 842 deletions(-)
diff --git
a/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
b/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
index cd430f94c0..5d0b2fc070 100644
---
a/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
+++
b/log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/AsyncLogger.java
@@ -20,7 +20,6 @@ import java.util.List;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.ContextDataInjector;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.ReusableLogEvent;
@@ -30,7 +29,7 @@ import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.ReliabilityStrategy;
-import org.apache.logging.log4j.core.impl.ContextDataFactory;
+import org.apache.logging.log4j.core.impl.ContextData;
import org.apache.logging.log4j.core.time.Clock;
import org.apache.logging.log4j.core.time.NanoClock;
import org.apache.logging.log4j.kit.logger.AbstractLogger;
@@ -72,7 +71,6 @@ public class AsyncLogger extends Logger {
// immediate inlining instead of waiting until they are designated "hot
enough".
private final Clock clock; // not reconfigurable
-private final ContextDataInjector contextDataInjector; // not
reconfigurable
private final Recycler translatorRecycler;
private final AsyncLoggerDisruptor loggerDisruptor;
@@ -105,7 +103,6 @@ public class AsyncLogger extends Logger {
includeLocation = privateConfig.loggerConfig.isIncludeLocation();
nanoClock = configuration.getNanoClock();
clock = configuration.getComponent(Clock.KEY);
-contextDataInjector =
configuration.getComponent(ContextDataInjector.KEY);
}
/*
@@ -214,7 +211,6 @@ public class AsyncLogger extends Logger {
location,
clock,
nanoClock,
-contextDataInjector,
requiresLocation());
}
@@ -255,7 +251,8 @@ public class AsyncLogger extends Logger {
(logging-log4net) branch Feature/144-Use-Logging-Services-common-pages created (now 0be9ab61)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch Feature/144-Use-Logging-Services-common-pages in repository https://gitbox.apache.org/repos/asf/logging-log4net.git at 0be9ab61 Use Logging Services common pages #144 This branch includes the following new commits: new 0be9ab61 Use Logging Services common pages #144 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-log4net) 01/01: Use Logging Services common pages #144
This is an automated email from the ASF dual-hosted git repository.
freeandnil pushed a commit to branch
Feature/144-Use-Logging-Services-common-pages
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
commit 0be9ab61a3c190c166f45157a3d1dee0019195ff
Author: Jan Friedrich
AuthorDate: Sun Apr 21 22:45:29 2024 +0200
Use Logging Services common pages #144
---
pom.xml| 2 -
src/site/resources/doap_log4net.rdf| 4 +-
src/site/site.vm | 3 +-
src/site/site.xml | 8 +-
src/site/xdoc/download_log4net.xml | 127 -
src/site/xdoc/release/security-reports.xml | 80 --
6 files changed, 5 insertions(+), 219 deletions(-)
diff --git a/pom.xml b/pom.xml
index 087b2898..c09b2281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,8 +148,6 @@
scm
license
project-team
- issue-tracking
- mailing-list
diff --git a/src/site/resources/doap_log4net.rdf
b/src/site/resources/doap_log4net.rdf
index fd6ad3bb..c4420b34 100644
--- a/src/site/resources/doap_log4net.rdf
+++ b/src/site/resources/doap_log4net.rdf
@@ -29,9 +29,7 @@
http://logging.apache.org/log4net/; />
http://logging.apache.org; />
Apache log4net provides logging services for .NET.
-https://github.com/apache/logging-log4net/issues; />
-http://logging.apache.org/log4net/mail-lists.html; />
-https://logging.apache.org/log4net/download_log4net.html; />
+https://logging.apache.org/download.html; />
C#
http://projects.apache.org/category/library; />
diff --git a/src/site/site.vm b/src/site/site.vm
index 370dd987..3dc2549b 100644
--- a/src/site/site.vm
+++ b/src/site/site.vm
@@ -201,8 +201,7 @@
#set ($active = " active")
#end
#if (${project.artifactId} != "log4net" && $isComponentDocumentation &&
- ($item.href == "team-list.html" || $item.href
== "mail-lists.html"
- || $item.href == "issue-tracking.html" ||
$item.href == "license.html"
+ ($item.href == "team-list.html" || $item.href
== "license.html"
|| $item.href == "source-repository.html"))
#else
diff --git a/src/site/site.xml b/src/site/site.xml
index be20bada..050f42a2 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,8 +28,8 @@
-
-
+
+
@@ -53,8 +53,6 @@
-
-
@@ -67,7 +65,7 @@
http://www.apache.org/licenses/"/>
http://www.apache.org/foundation/sponsorship.html"/>
http://www.apache.org/foundation/thanks.html"/>
- http://www.apache.org/security/"/>
+ http://logging.apache.org/security.html"/>
http://www.apachecon.com"/>
diff --git a/src/site/xdoc/download_log4net.xml
b/src/site/xdoc/download_log4net.xml
deleted file mode 100644
index 0bcacba8..
--- a/src/site/xdoc/download_log4net.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-Download Apache log4net
-
-
-
-
-
-
-Apache log4net is distributed under the http://www.apache.org/licenses/LICENSE-2.0.html;>Apache License, version
2.0.
-
-
- Starting with log4net 1.2.11 log4net is available as source only or
binary only release.
-
- Users who download the ZIP files to Windows may need to unblock the
archive (right click on the ZIP and press the "Unblock" button) before
extracting it.
-
-
-
-
-
-
-
-
-
- https://downloads.apache.org/logging/log4net/source/apache-log4net-source-3.0.0.zip;>apache-log4net-source-3.0.0.zip
-
-
- https://downloads.apache.org/logging/log4net/source/apache-log4net-source-3.0.0.zip.sha512;>sha512
-
-
- https://downloads.apache.org/logging/log4net/source/apache-log4net-source-3.0.0.zip.asc;>pgp
-
-
-
-
-
-
-
- Binaries are available in a zip file or nupkg, which is also
available from https://www.nuget.org/packages/log4net/;>nuget.org
-
-
-
-
- https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-3.0.0.zip;>log4net-binaries-3.0.0.zip
-
-
- https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-3.0.0.zip.sha512;>sha512
-
-
- https://downloads.apache.org/logging/log4net/binaries/apache-log4net-binaries-3.0.0.zip.asc;>pgp
-
-
-
-
- https://downloads.apache.org/logging/log4net/binaries/apache-log4net.3.0.0.nupkg;>log4net-3.0.0.nupkg
-
-
(logging-log4net-site) branch asf-staging updated (0681682 -> cb0c5d7)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-log4net-site.git discard 0681682 Use Logging Services common pages #144 new cb0c5d7 Use Logging Services common pages #144 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0681682) \ N -- N -- N refs/heads/asf-staging (cb0c5d7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: log4net-2.0.17/history.html | 6 -- log4net-2.0.17/index.html| 6 -- log4net-2.0.17/license.html | 6 -- log4net-2.0.17/project-info.html | 6 -- log4net-2.0.17/project-reports.html | 6 -- log4net-2.0.17/rat-report.html | 8 +--- log4net-2.0.17/release/building.html | 6 -- log4net-2.0.17/release/config-examples.html | 6 -- log4net-2.0.17/release/example-apps.html | 6 -- log4net-2.0.17/release/faq.html | 6 -- log4net-2.0.17/release/features.html | 6 -- log4net-2.0.17/release/framework-support.html| 6 -- log4net-2.0.17/release/manual/configuration.html | 6 -- log4net-2.0.17/release/manual/contexts.html | 6 -- log4net-2.0.17/release/manual/internals.html | 6 -- log4net-2.0.17/release/manual/introduction.html | 6 -- log4net-2.0.17/release/manual/plugins.html | 6 -- log4net-2.0.17/release/manual/repositories.html | 6 -- log4net-2.0.17/release/release-notes.html| 6 -- log4net-2.0.17/roadmap.html | 6 -- log4net-2.0.17/source-repository.html| 8 +--- log4net-2.0.17/team-list.html| 6 -- 22 files changed, 2 insertions(+), 134 deletions(-)
(logging-log4net-site) branch asf-staging updated (d4b9b88 -> 0681682)
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-log4net-site.git discard d4b9b88 Use Logging Services common pages #144 new 0681682 Use Logging Services common pages #144 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d4b9b88) \ N -- N -- N refs/heads/asf-staging (0681682) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: log4net-2.0.17/doap_log4net.rdf | 4 +- log4net-2.0.17/history.html | 3 + log4net-2.0.17/index.html| 3 + log4net-2.0.17/issue-tracking.html | 204 log4net-2.0.17/license.html | 3 + log4net-2.0.17/mail-lists.html | 235 --- log4net-2.0.17/project-info.html | 11 +- log4net-2.0.17/project-reports.html | 3 + log4net-2.0.17/rat-report.html | 5 +- log4net-2.0.17/release/building.html | 3 + log4net-2.0.17/release/config-examples.html | 3 + log4net-2.0.17/release/example-apps.html | 3 + log4net-2.0.17/release/faq.html | 3 + log4net-2.0.17/release/features.html | 3 + log4net-2.0.17/release/framework-support.html| 3 + log4net-2.0.17/release/manual/configuration.html | 3 + log4net-2.0.17/release/manual/contexts.html | 3 + log4net-2.0.17/release/manual/internals.html | 3 + log4net-2.0.17/release/manual/introduction.html | 3 + log4net-2.0.17/release/manual/plugins.html | 3 + log4net-2.0.17/release/manual/repositories.html | 3 + log4net-2.0.17/release/release-notes.html| 3 + log4net-2.0.17/roadmap.html | 3 + log4net-2.0.17/source-repository.html| 3 + log4net-2.0.17/team-list.html| 3 + 25 files changed, 69 insertions(+), 450 deletions(-) delete mode 100644 log4net-2.0.17/issue-tracking.html delete mode 100644 log4net-2.0.17/mail-lists.html
(logging-log4j-jakarta) branch main-site-stg-out updated: Add website content generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main-site-stg-out
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git
The following commit(s) were added to refs/heads/main-site-stg-out by this push:
new 994faae Add website content generated from
`8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
994faae is described below
commit 994faae369b6b46e9d3aa83e233eec9d91e209e9
Author: ASF Logging Services RM
AuthorDate: Sun Apr 21 19:55:24 2024 +
Add website content generated from
`8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
---
404.html | 82
README.txt| 1 -
_/css/site.css| 3 +
_/css/vendor/tabs.css | 110 +
_/font/roboto-cyrillic-400-italic.woff2 | Bin 0 -> 10292 bytes
_/font/roboto-cyrillic-400-normal.woff2 | Bin 0 -> 9628 bytes
_/font/roboto-cyrillic-500-italic.woff2 | Bin 0 -> 10640 bytes
_/font/roboto-cyrillic-500-normal.woff2 | Bin 0 -> 9840 bytes
_/font/roboto-latin-400-italic.woff | Bin 0 -> 22048 bytes
_/font/roboto-latin-400-italic.woff2 | Bin 0 -> 17368 bytes
_/font/roboto-latin-400-normal.woff | Bin 0 -> 20344 bytes
_/font/roboto-latin-400-normal.woff2 | Bin 0 -> 15744 bytes
_/font/roboto-latin-500-italic.woff | Bin 0 -> 22092 bytes
_/font/roboto-latin-500-italic.woff2 | Bin 0 -> 17336 bytes
_/font/roboto-latin-500-normal.woff | Bin 0 -> 20544 bytes
_/font/roboto-latin-500-normal.woff2 | Bin 0 -> 15920 bytes
_/font/roboto-mono-latin-400-normal.woff | Bin 0 -> 15160 bytes
_/font/roboto-mono-latin-400-normal.woff2 | Bin 0 -> 12312 bytes
_/font/roboto-mono-latin-500-normal.woff | Bin 0 -> 15364 bytes
_/font/roboto-mono-latin-500-normal.woff2 | Bin 0 -> 12532 bytes
_/img/back.svg| 1 +
_/img/caret.svg | 1 +
_/img/chevron.svg | 1 +
_/img/home-o.svg | 1 +
_/img/home.svg| 1 +
_/img/menu.svg| 1 +
_/img/octicons-16.svg | 1 +
_/js/site.js | 6 +
_/js/vendor/highlight.js | 1 +
_/js/vendor/tabs.js | 127 ++
development.html | 173
index.html| 160 +++
log4j-jakarta-jms.html| 363
log4j-jakarta-smtp.html | 341 +++
log4j-jakarta-web.html| 674 ++
release-notes.html| 216 ++
sitemap.xml | 27 ++
37 files changed, 2290 insertions(+), 1 deletion(-)
diff --git a/404.html b/404.html
new file mode 100644
index 000..c618367
--- /dev/null
+++ b/404.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+Page Not Found :: Apache Log4j Jakarta
+
+
+
+
+
+
+ /* `page-toclevels` greater than 4 are not supported by Antora UI, patching
it: */
+ .toc .toc-menu li[data-level="4"] a {
+padding-left: 2.75rem
+ }
+ /* Replace the default highlight.js color for strings from red to green: */
+ .hljs-string {
+color: #0f8532;
+ }
+
+
+
+
+
+
+ Apache Log4j Jakarta
+
+
+
+https://logging.apache.org;>a subproject
ofApache Logging Services
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://github.com/apache/logging-log4j-jakarta/edit/main/src/site/antora/modules//pages/;>Edit
this Page
+
+
+
+Page Not Found
+
+The page youre looking for does not exist. It may have been moved.
You can return to the start page, or follow one of
the links in the navigation to the left.
+
+
+If you arrived on this page by clicking on a link, please notify the owner
of the site that the link is broken.
+If you typed the URL of this page manually, please double check that you
entered the address correctly.
+
+
+
+
+
+
+
+Copyright © 1999-2024 https://www.apache.org/;>The Apache
Software Foundation.
+Licensed under the https://www.apache.org/licenses/LICENSE-2.0;>Apache Software License,
Version 2.0.
+Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy
policy.
+
+
+Apache, Log4j, and the Apache feather logo are trademarks or registered
trademarks of The Apache Software Foundation.
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+
+
+
+
+
+
+
diff --git a/README.txt b/README.txt
deleted file mode 100644
index e10b1e9..000
--- a/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Content for initializing an orphan branch for the website to be generated from
`8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
diff --git a/_/css/site.css
(logging-site) branch main updated: fix stackoverflow link for log4net
This is an automated email from the ASF dual-hosted git repository. freeandnil pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/main by this push: new 1bc7aa1c fix stackoverflow link for log4net 1bc7aa1c is described below commit 1bc7aa1ce9f3f3a2fec5aad8e5a8022c322908d0 Author: Jan Friedrich AuthorDate: Sun Apr 21 21:55:08 2024 +0200 fix stackoverflow link for log4net --- support.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support.adoc b/support.adoc index 8fa9249e..45a5149f 100644 --- a/support.adoc +++ b/support.adoc @@ -54,7 +54,7 @@ Please **don't send mails containing confidential information** to public mailin For more information, please see the https://privacy.apache.org/policies/privacy-policy-public.html[privacy policy] -* Stack Overflow (http://stackoverflow.com/questions/tagged/log4cxx[Log4cxx], http://stackoverflow.com/questions/tagged/log4j[Log4j], http://stackoverflow.com/questions/tagged/log4j[Log4net]) +* Stack Overflow (http://stackoverflow.com/questions/tagged/log4cxx[Log4cxx], http://stackoverflow.com/questions/tagged/log4j[Log4j], http://stackoverflow.com/questions/tagged/log4net[Log4net]) [#discussions-maintainer] == Maintainer discussions
(logging-log4j-jakarta) branch dependabot/maven/org.springframework-spring-framework-bom-6.1.6 updated (0bd217b -> 94fa756)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-framework-bom-6.1.6 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git discard 0bd217b Bump org.springframework:spring-framework-bom from 6.1.5 to 6.1.6 add 8d54f9c Update `logging-parent` to version `11.0.0` and migrate to Antora (apache/logging-log4j2#2443) add 94fa756 Bump org.springframework:spring-framework-bom from 6.1.5 to 6.1.6 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0bd217b) \ N -- N -- N refs/heads/dependabot/maven/org.springframework-spring-framework-bom-6.1.6 (94fa756) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .asf.yaml | 8 -- .github/dependabot.yaml| 8 +- .github/generate-email.sh | 30 +++-- .github/workflows/build.yaml | 15 ++- .github/workflows/codeql-analysis.yaml | 2 +- .github/workflows/deploy-site.yaml | 95 .github/workflows/merge-dependabot.yaml| 6 +- .github/workflows/scorecards-analysis.yaml | 2 +- .gitignore | 4 + antora-playbook.yaml | 117 +++ .../logging/log4j/jms/appender/JmsAppender.java| 10 +- .../log4j/jms/appender/JmsAppenderTest.java| 3 +- package.json | 7 ++ pom.xml| 4 +- src/changelog/.3.x.x/.release-notes.adoc.ftl | 2 +- ...w_multiple_servletcontextlistener_instances.xml | 22 +--- ...Allow_web_lookup_to_access_more_information.xml | 23 +--- src/changelog/.3.x.x/antora.xml| 8 ++ src/changelog/.3.x.x/genesis.xml | 20 +--- src/changelog/.3.x.x/jakartaee-jms.xml | 20 +--- src/changelog/.3.x.x/javaee-jms.xml| 20 +--- .../.3.x.x/update_apache_logging_parent.xml| 4 +- .../update_commons_logging_commons_logging.xml | 4 +- ...e_jakarta_activation_jakarta_activation_api.xml | 4 +- .../update_jakarta_mail_jakarta_mail_api.xml | 4 +- .../update_org_apache_logging_logging_parent.xml | 4 +- .../update_org_eclipse_angus_angus_activation.xml | 4 +- .../.3.x.x/update_org_eclipse_angus_angus_mail.xml | 4 +- .../.3.x.x/update_org_junit_junit_bom.xml | 4 +- .../.3.x.x/update_org_mockito_mockito_bom.xml | 4 +- ...te_org_springframework_spring_framework_bom.xml | 4 +- src/changelog/.changelog.adoc.ftl | 3 +- src/changelog/.index.adoc.ftl | 9 +- src/site/_constants.adoc | 41 --- src/site/_constants.tmpl.adoc | 41 --- src/site/_release-notes.adoc | 39 --- src/site/_release-notes/_3.x.x.adoc| 72 src/site/antora/antora.tmpl.yml| 49 src/site/antora/antora.yml | 49 src/site/antora/modules/ROOT/nav.adoc | 26 + .../antora/modules/ROOT/pages/development.adoc | 47 src/site/antora/modules/ROOT/pages/index.adoc | 48 .../modules/ROOT/pages/log4j-jakarta-jms.adoc} | 15 ++- .../modules/ROOT/pages/log4j-jakarta-smtp.adoc}| 13 +-- .../modules/ROOT/pages/log4j-jakarta-web.adoc} | 35 +++--- .../antora/modules/ROOT/pages/release-notes.adoc | 21 src/site/index.adoc| 125 - 47 files changed, 583 insertions(+), 516 deletions(-) create mode 100644 .github/workflows/deploy-site.yaml create mode 100644 antora-playbook.yaml create mode 100644 package.json create mode 100644 src/changelog/.3.x.x/antora.xml delete mode 100644 src/site/_constants.adoc delete mode 100644 src/site/_constants.tmpl.adoc delete mode 100644 src/site/_release-notes.adoc delete mode 100644 src/site/_release-notes/_3.x.x.adoc create mode 100644 src/site/antora/antora.tmpl.yml create mode 100644 src/site/antora/antora.yml create mode 100644 src/site/antora/modules/ROOT/nav.adoc create mode 100644
(logging-log4j-jakarta) branch dependabot/maven/org.apache.logging-logging-parent-11.0.0 deleted (was 5888f6e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.logging-logging-parent-11.0.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git was 5888f6e Bump org.apache.logging:logging-parent from 10.5.0 to 11.0.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-jakarta) branch main-site-stg-out updated: Add `.asf.yaml` along with an INFRA fix for the website content generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new db46433 Add `.asf.yaml` along with an INFRA fix for the website content generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5` db46433 is described below commit db46433f510dc62769778562c7b3529f793e0760 Author: ASF Logging Services RM AuthorDate: Sun Apr 21 19:55:25 2024 + Add `.asf.yaml` along with an INFRA fix for the website content generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5` --- .asf.yaml | 14 ++ 1 file changed, 14 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..c3aaab8 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,14 @@ +staging: + profile: ~ + whoami: main-site-stg-out + subdir: content/log4j/jakarta + + +# INFRA cannot handle change sets bigger than a certain size: https://the-asf.slack.com/archives/CBX4TSBQ8/p1709724983391709 +# This file will be used to push a small commit to help the INFRA to recover. +# +# Random values to cause a change: +# +# - Seed: 6875 +# - Commit ID: 8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5 +# - Timestamp: 2024-04-21T19:55:25Z
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 89a8319c Automatic Site Publish by Buildbot 89a8319c is described below commit 89a8319c3cecd8aa5c1081607161ac3a63c0f272 Author: buildbot AuthorDate: Sun Apr 21 19:55:48 2024 + Automatic Site Publish by Buildbot --- content/feed.xml | 2 +- content/support.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/feed.xml b/content/feed.xml index 21d19142..94036594 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2024-04-19T15:52:46+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] +http://www.w3.org/2005/Atom; >https://jekyllrb.com/; version="4.2.2">Jekyll2024-04-21T19:55:47+00:00/feed.xmlApache Software Foundation - Logging ServicesWrite an awesome description for your new site here. You can edit this line in _ [...] Today, December 17, 2023 marks a significant milestone for the Apache Logging Services project, as we celebrate 20 years since the inception of Log4j 1. diff --git a/content/support.html b/content/support.html index 5dfb02a3..e37a017a 100644 --- a/content/support.html +++ b/content/support.html @@ -156,7 +156,7 @@ For more information, please see the https://privacy.apache.org/policie -Stack Overflow (http://stackoverflow.com/questions/tagged/log4cxx;>Log4cxx, http://stackoverflow.com/questions/tagged/log4j;>Log4j, http://stackoverflow.com/questions/tagged/log4j;>Log4net) +Stack Overflow (http://stackoverflow.com/questions/tagged/log4cxx;>Log4cxx, http://stackoverflow.com/questions/tagged/log4j;>Log4j, http://stackoverflow.com/questions/tagged/log4net;>Log4net)
(logging-log4j-jakarta) 01/01: Initial content for the website to be generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git commit 9691bf448046f03daf543e9a8c3b9a6eadc3adfa Author: ASF Logging Services RM AuthorDate: Sun Apr 21 19:55:23 2024 + Initial content for the website to be generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5` --- README.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/README.txt b/README.txt new file mode 100644 index 000..e10b1e9 --- /dev/null +++ b/README.txt @@ -0,0 +1 @@ +Content for initializing an orphan branch for the website to be generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5`
(logging-log4j-jakarta) branch main-site-stg-out created (now 9691bf4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git at 9691bf4 Initial content for the website to be generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5` This branch includes the following new commits: new 9691bf4 Initial content for the website to be generated from `8d54f9cdd81ca136d16262b0d7eafebd96bcb3e5` The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-log4j-jakarta) branch main updated (4b7a7ed -> 8d54f9c)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-jakarta.git
from 4b7a7ed Update `commons-logging:commons-logging` to version `1.3.1`
(#25)
add 8d54f9c Update `logging-parent` to version `11.0.0` and migrate to
Antora (apache/logging-log4j2#2443)
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 8 --
.github/dependabot.yaml| 8 +-
.github/generate-email.sh | 30 +++--
.github/workflows/build.yaml | 15 ++-
.github/workflows/codeql-analysis.yaml | 2 +-
.github/workflows/deploy-site.yaml | 95
.github/workflows/merge-dependabot.yaml| 6 +-
.github/workflows/scorecards-analysis.yaml | 2 +-
.gitignore | 4 +
antora-playbook.yaml | 117 +++
.../logging/log4j/jms/appender/JmsAppender.java| 10 +-
.../log4j/jms/appender/JmsAppenderTest.java| 3 +-
package.json | 7 ++
pom.xml| 4 +-
src/changelog/.3.x.x/.release-notes.adoc.ftl | 2 +-
...w_multiple_servletcontextlistener_instances.xml | 22 +---
...Allow_web_lookup_to_access_more_information.xml | 23 +---
src/changelog/.3.x.x/antora.xml| 8 ++
src/changelog/.3.x.x/genesis.xml | 20 +---
src/changelog/.3.x.x/jakartaee-jms.xml | 20 +---
src/changelog/.3.x.x/javaee-jms.xml| 20 +---
.../.3.x.x/update_apache_logging_parent.xml| 4 +-
.../update_commons_logging_commons_logging.xml | 4 +-
...e_jakarta_activation_jakarta_activation_api.xml | 4 +-
.../update_jakarta_mail_jakarta_mail_api.xml | 4 +-
.../update_org_apache_logging_logging_parent.xml | 4 +-
.../update_org_eclipse_angus_angus_activation.xml | 4 +-
.../.3.x.x/update_org_eclipse_angus_angus_mail.xml | 4 +-
.../.3.x.x/update_org_junit_junit_bom.xml | 4 +-
.../.3.x.x/update_org_mockito_mockito_bom.xml | 4 +-
...te_org_springframework_spring_framework_bom.xml | 4 +-
src/changelog/.changelog.adoc.ftl | 3 +-
src/changelog/.index.adoc.ftl | 9 +-
src/site/_constants.adoc | 41 ---
src/site/_constants.tmpl.adoc | 41 ---
src/site/_release-notes.adoc | 39 ---
src/site/_release-notes/_3.x.x.adoc| 72
src/site/antora/antora.tmpl.yml| 49
src/site/antora/antora.yml | 49
src/site/antora/modules/ROOT/nav.adoc | 26 +
.../antora/modules/ROOT/pages/development.adoc | 47
src/site/antora/modules/ROOT/pages/index.adoc | 48
.../modules/ROOT/pages/log4j-jakarta-jms.adoc} | 15 ++-
.../modules/ROOT/pages/log4j-jakarta-smtp.adoc}| 13 +--
.../modules/ROOT/pages/log4j-jakarta-web.adoc} | 35 +++---
.../antora/modules/ROOT/pages/release-notes.adoc | 21
src/site/index.adoc| 125 -
47 files changed, 583 insertions(+), 516 deletions(-)
create mode 100644 .github/workflows/deploy-site.yaml
create mode 100644 antora-playbook.yaml
create mode 100644 package.json
create mode 100644 src/changelog/.3.x.x/antora.xml
delete mode 100644 src/site/_constants.adoc
delete mode 100644 src/site/_constants.tmpl.adoc
delete mode 100644 src/site/_release-notes.adoc
delete mode 100644 src/site/_release-notes/_3.x.x.adoc
create mode 100644 src/site/antora/antora.tmpl.yml
create mode 100644 src/site/antora/antora.yml
create mode 100644 src/site/antora/modules/ROOT/nav.adoc
create mode 100644 src/site/antora/modules/ROOT/pages/development.adoc
create mode 100644 src/site/antora/modules/ROOT/pages/index.adoc
rename src/site/{_log4j-jakarta-jms.adoc =>
antora/modules/ROOT/pages/log4j-jakarta-jms.adoc} (97%)
rename src/site/{_log4j-jakarta-smtp.adoc =>
antora/modules/ROOT/pages/log4j-jakarta-smtp.adoc} (96%)
rename src/site/{_log4j-jakarta-web.adoc =>
antora/modules/ROOT/pages/log4j-jakarta-web.adoc} (96%)
create mode 100644 src/site/antora/modules/ROOT/pages/release-notes.adoc
delete mode 100644 src/site/index.adoc
(logging-log4j2) branch main-site-stg-out updated: Add website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new 1bc1a180f1 Add website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18` 1bc1a180f1 is described below commit 1bc1a180f10e45b32e5c5860841f0348dbaaa167 Author: ASF Logging Services RM AuthorDate: Sun Apr 21 18:34:17 2024 + Add website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18` --- articles.html | 2 +- download.html | 2 +- faq.html | 2 +- getting-started/index.html| 2 +- guidelines.html | 2 +- index.html| 2 +- javadoc.html | 2 +- log4j-1.2-api.html| 2 +- log4j-api.html| 2 +- log4j-docker.html | 2 +- log4j-flume-ng.html | 2 +- log4j-iostreams.html | 2 +- log4j-jpl.html| 2 +- log4j-jul.html| 2 +- log4j-mongodb4.html | 5 +- log4j-slf4j-impl.html | 2 +- log4j-slf4j2-impl.html| 2 +- log4j-spring-cloud-config-client.html | 2 +- log4j-to-jul.html | 2 +- log4j-to-slf4j.html | 2 +- manual/api-separation.html| 2 +- manual/api.html | 2 +- manual/appenders.html | 31 +++-- manual/architecture.html | 2 +- manual/async.html | 2 +- manual/cloud.html | 2 +- manual/compatibility.html | 2 +- manual/configuration.html | 2 +- manual/customconfig.html | 2 +- manual/customloglevels.html | 2 +- manual/dependencyinjection.html | 2 +- manual/eventlogging.html | 2 +- manual/extending.html | 2 +- manual/filters.html | 2 +- manual/flowtracing.html | 2 +- manual/garbagefree.html | 2 +- manual/index.html | 2 +- manual/installation.html | 2 +- manual/jmx.html | 2 +- manual/json-template-layout.html | 2 +- manual/layouts.html | 2 +- manual/log4j1-compat.html | 2 +- manual/logbuilder.html| 2 +- manual/logsep.html| 2 +- manual/lookups.html | 2 +- manual/markers.html | 2 +- manual/messages.html | 4 +- manual/migration.html | 2 +- manual/performance.html | 2 +- manual/plugins.html | 2 +- manual/systemproperties.html | 2 +- manual/thread-context.html| 2 +- manual/usage.html | 2 +- plugin-reference.html | 45 ++ release-notes.html| 7 ++- runtime-dependencies.html | 6 +- sitemap.xml | 114 +- thanks.html | 2 +- 58 files changed, 150 insertions(+), 164 deletions(-) diff --git a/articles.html b/articles.html index 2b673d593f..0bc96bb9cd 100644 --- a/articles.html +++ b/articles.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j IOStreams diff --git a/download.html b/download.html index 94e15a181c..bc1fd8abe4 100644 --- a/download.html +++ b/download.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j IOStreams diff --git a/faq.html b/faq.html index e5fe1e53e2..8f85e953ef 100644 --- a/faq.html +++ b/faq.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j IOStreams diff --git a/getting-started/index.html b/getting-started/index.html index a07a351fc8..aaf9abe571 100644 --- a/getting-started/index.html +++ b/getting-started/index.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j IOStreams diff --git a/guidelines.html b/guidelines.html index a3486f7769..2c96f29e35 100644 --- a/guidelines.html +++ b/guidelines.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j IOStreams diff --git a/index.html b/index.html index 6be8460aa5..523c50d2b1 100644 --- a/index.html +++ b/index.html @@ -218,7 +218,7 @@ Flume Appender -MongoDB 4 appender +log4j-mongodb.adoc Log4j
(logging-log4j2) branch main-site-stg-out updated: Add `.asf.yaml` along with an INFRA fix for the website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18`
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main-site-stg-out in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/main-site-stg-out by this push: new 8ff8e3a170 Add `.asf.yaml` along with an INFRA fix for the website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18` 8ff8e3a170 is described below commit 8ff8e3a1702d45e6a8c702f8e782c9efb814c734 Author: ASF Logging Services RM AuthorDate: Sun Apr 21 18:34:39 2024 + Add `.asf.yaml` along with an INFRA fix for the website content generated from `16511c9c0e98a4db6db9905e7ba913631f211e18` --- .asf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 605bfc8b33..0a712fd579 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -9,6 +9,6 @@ staging: # # Random values to cause a change: # -# - Seed: 12408 -# - Commit ID: 4b54ae38a98b9bc7e1481d675dc28ab05ab147d5 -# - Timestamp: 2024-04-19T11:05:14Z +# - Seed: 29646 +# - Commit ID: 16511c9c0e98a4db6db9905e7ba913631f211e18 +# - Timestamp: 2024-04-21T18:34:39Z
(logging-log4j2) branch main updated: In 3.0.0, we provide one MongoDB module: `log4j-mongodb`, based on the (#2493)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 16511c9c0e In 3.0.0, we provide one MongoDB module: `log4j-mongodb`,
based on the (#2493)
16511c9c0e is described below
commit 16511c9c0e98a4db6db9905e7ba913631f211e18
Author: Gary Gregory
AuthorDate: Sun Apr 21 14:29:59 2024 -0400
In 3.0.0, we provide one MongoDB module: `log4j-mongodb`, based on the
(#2493)
current MongoDB Client Driver.
We renamed the `log4j-mongodb4`, module, package, and classes in favor
of `log4j-mongodb`, in other words, drop the `4`.
We no longer provide the modules `log4j-mongodb2`, `log4j-mongodb3`,
`log4j-mongodb4`.
---
.../.log4j-plugin-processing-activator | 0
{log4j-mongodb4 => log4j-mongodb}/pom.xml | 6 ++---
.../logging/log4j/mongodb/MongoDbConnection.java | 14 ++--
.../log4j/mongodb/MongoDbDocumentObject.java | 6 ++---
.../log4j/mongodb/MongoDbDocumentObjectCodec.java | 14 ++--
.../logging/log4j/mongodb/MongoDbLevelCodec.java | 6 ++---
.../logging/log4j/mongodb/MongoDbProvider.java | 26 +++---
.../logging/log4j/mongodb}/package-info.java | 2 +-
.../log4j/mongodb/AbstractMongoDbCappedTest.java | 10 -
.../log4j/mongodb/MongoDbAdditionalFieldsTest.java | 12 +-
.../log4j/mongodb/MongoDbAuthFailureTest.java | 12 +-
.../log4j/mongodb/MongoDbCappedIntTest.java| 6 ++---
.../log4j/mongodb/MongoDbCappedLongTest.java | 6 ++---
.../log4j/mongodb/MongoDbMapMessageTest.java | 12 +-
.../logging/log4j/mongodb/MongoDbResolver.java | 11 +
.../logging/log4j/mongodb/MongoDbResolverTest.java | 6 ++---
.../apache/logging/log4j/mongodb/MongoDbTest.java | 12 +-
.../log4j/mongodb/MongoDbTestConstants.java| 4 ++--
.../apache/logging/log4j/mongodb/UsingMongoDb.java | 6 ++---
.../resources/log4j2-mongodb-additional-fields.xml | 2 +-
.../test/resources/log4j2-mongodb-auth-failure.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-int.xml | 2 +-
.../test/resources/log4j2-mongodb-capped-long.xml | 2 +-
.../test/resources/log4j2-mongodb-map-message.xml | 2 +-
.../src/test/resources/log4j2-mongodb.xml | 2 +-
pom.xml| 4 ++--
.../rename_log4j_mongodb4_to_log4j_mongodb.xml | 7 ++
src/site/antora/modules/ROOT/nav.adoc | 2 +-
.../modules/ROOT/pages/manual/appenders.adoc | 21 +++--
.../antora/modules/ROOT/pages/manual/messages.adoc | 2 +-
.../modules/ROOT/pages/runtime-dependencies.adoc | 4 ++--
31 files changed, 114 insertions(+), 109 deletions(-)
diff --git a/log4j-mongodb4/.log4j-plugin-processing-activator
b/log4j-mongodb/.log4j-plugin-processing-activator
similarity index 100%
rename from log4j-mongodb4/.log4j-plugin-processing-activator
rename to log4j-mongodb/.log4j-plugin-processing-activator
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb/pom.xml
similarity index 96%
rename from log4j-mongodb4/pom.xml
rename to log4j-mongodb/pom.xml
index 36d7653849..3ccd7f9df7 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb/pom.xml
@@ -26,9 +26,9 @@
../log4j-parent
- log4j-mongodb4
- Apache Log4j MongoDB 4
- MongoDB appender for Log4j using the MongoDB 4 driver
API.
+ log4j-mongodb
+ Apache Log4j MongoDB Appender
+ MongoDB appender for Log4j using the MongoDB 5 driver
API.
-
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
similarity index 91%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
index a84154e78d..4b740bc947 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb-map-message.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb-map-message.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
b/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
similarity index 91%
rename from log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
rename to log4j-mongodb/src/test/resources/log4j2-mongodb.xml
index b36a58affc..4f0865b2c4 100644
--- a/log4j-mongodb4/src/test/resources/log4j2-mongodb.xml
+++ b/log4j-mongodb/src/test/resources/log4j2-mongodb.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/pom.xml b/pom.xml
index 200aee78d8..ebf46e3953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
log4j-kit
log4j-layout-template-json
log4j-layout-template-json-test
-log4j-mongodb4
+log4j-mongodb
log4j-osgi-test
