(logging-log4j2) 04/07: Access system properties directly
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit e15359668c1137bcc2280a375f408dac8dd0d61e
Author: Matt Sicker
AuthorDate: Mon Nov 13 22:44:54 2023 -0600
Access system properties directly
Signed-off-by: Matt Sicker
---
.../org/apache/logging/log4j/util/Strings.java | 3 +-
.../log4j/util/SystemPropertiesPropertySource.java | 37 +-
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
index 6c02b6ba06..13cc9b7bfc 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Strings.java
@@ -46,8 +46,7 @@ public final class Strings {
* OS-dependent line separator, defaults to {@code "\n"} if the system
property {@code ""line.separator"} cannot be
* read.
*/
-public static final String LINE_SEPARATOR =
SystemPropertiesPropertySource.getSystemProperty("line.separator",
-"\n");
+public static final String LINE_SEPARATOR =
System.getProperty("line.separator", "\n");
private Strings() {
// empty
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
index f2275a58b3..169e7bc534 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/util/SystemPropertiesPropertySource.java
@@ -25,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceProvider;
/**
@@ -35,7 +34,7 @@ import aQute.bnd.annotation.spi.ServiceProvider;
*
* @since 2.10.0
*/
-@ServiceProvider(value = PropertySource.class, resolution =
Resolution.OPTIONAL)
+@ServiceProvider(PropertySource.class)
public class SystemPropertiesPropertySource extends ContextAwarePropertySource
implements PropertySource {
private static final int DEFAULT_PRIORITY = 0;
@@ -53,18 +52,6 @@ public class SystemPropertiesPropertySource extends
ContextAwarePropertySource i
super(null, SYSTEM_CONTEXT, true);
}
-/**
- * Used by bootstrap code to get system properties without loading
PropertiesUtil.
- */
-public static String getSystemProperty(final String key, final String
defaultValue) {
-try {
-return System.getProperty(key, defaultValue);
-} catch (SecurityException e) {
-// Silently ignore the exception
-return defaultValue;
-}
-}
-
@Override
public int getPriority() {
return DEFAULT_PRIORITY;
@@ -104,11 +91,11 @@ public class SystemPropertiesPropertySource extends
ContextAwarePropertySource i
@Override
public String getProperty(final String contextName, final String key) {
if (contextName != null && !contextName.equals(SYSTEM_CONTEXT)) {
-return getSystemProperty(PREFIX + contextName + DELIM + key, null);
+return System.getProperty(PREFIX + contextName + DELIM + key,
null);
} else {
-String result = getSystemProperty(PREFIX + SYSTEM_CONTEXT + DELIM
+ key, null);
+String result = System.getProperty(PREFIX + SYSTEM_CONTEXT + DELIM
+ key, null);
if (result == null) {
-result = getSystemProperty(key, null);
+result = System.getProperty(key, null);
}
return result;
}
@@ -117,10 +104,10 @@ public class SystemPropertiesPropertySource extends
ContextAwarePropertySource i
@Override
public boolean containsProperty(final String contextName, final String
key) {
if (contextName != null && !contextName.equals(SYSTEM_CONTEXT)) {
-return getSystemProperty(PREFIX + contextName + DELIM + key, null)
!= null;
+return System.getProperty(PREFIX + contextName + DELIM + key,
null) != null;
} else {
-return getSystemProperty(PREFIX + SYSTEM_CONTEXT + DELIM + key,
null) != null
-|| getSystemProperty(key, null) != null;
+return System.getProperty(PREFIX + SYSTEM_CONTEXT + DELIM + key,
null) != null
+|| System.getProperty(key, null) != null;
}
}
@@ -137,7 +124,7 @@ public class SystemPropertiesPropertySource extends
ContextAwarePropertySource i
*/
RELOAD_LOCK.lock();
try {
-final Properties props = getProperties();
+final Properties props =
(logging-log4j2) 05/07: Remove SecurityManager checks from LoaderUtil
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 79d21aee3ad18415b312cb308fb8bd2fc8500581
Author: Matt Sicker
AuthorDate: Mon Nov 13 22:45:12 2023 -0600
Remove SecurityManager checks from LoaderUtil
Signed-off-by: Matt Sicker
---
.../org/apache/logging/log4j/util/LoaderUtil.java | 184 +++--
1 file changed, 57 insertions(+), 127 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 7a405fdafc..43d3f87c1c 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -20,8 +20,6 @@ import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Enumeration;
import java.util.LinkedHashSet;
@@ -45,38 +43,11 @@ public final class LoaderUtil {
// this variable must be lazily loaded; otherwise, we get a nice circular
class loading problem where LoaderUtil
// wants to use PropertiesUtil, but then PropertiesUtil wants to use
LoaderUtil.
private static Boolean ignoreTCCL;
-
-private static final RuntimePermission GET_CLASS_LOADER = new
RuntimePermission("getClassLoader");
-private static final boolean GET_CLASS_LOADER_DISABLED;
-
static Boolean forceTcclOnly;
-private static final PrivilegedAction TCCL_GETTER = new
ThreadContextClassLoaderGetter();
-private static final PrivilegedAction
CLASSLOADER_ACCUMULATOR = new ClassLoaderAccumulator();
-
static {
if (System.getSecurityManager() != null) {
-boolean getClassLoaderDisabled;
-try {
-AccessController.checkPermission(GET_CLASS_LOADER);
-// seems like we'll be ok
-getClassLoaderDisabled = false;
-} catch (final SecurityException ignored) {
-try {
-// let's see if we can obtain that permission
-AccessController.doPrivileged((PrivilegedAction) ()
-> {
-AccessController.checkPermission(GET_CLASS_LOADER);
-return null;
-}, null, GET_CLASS_LOADER);
-getClassLoaderDisabled = false;
-} catch (final SecurityException ignore) {
-// no chance
-getClassLoaderDisabled = true;
-}
-}
-GET_CLASS_LOADER_DISABLED = getClassLoaderDisabled;
-} else {
-GET_CLASS_LOADER_DISABLED = false;
+LowLevelLogUtil.log("A custom SecurityManager was detected; Log4j
no longer supports security permissions.");
}
}
@@ -94,18 +65,13 @@ public final class LoaderUtil {
// TODO: this method could use some explanation
public static ClassLoader getClassLoader(final Class class1, final
Class class2) {
-PrivilegedAction action = () -> {
-final ClassLoader loader1 = class1 == null ? null :
class1.getClassLoader();
-final ClassLoader loader2 = class2 == null ? null :
class2.getClassLoader();
-final ClassLoader referenceLoader = GET_CLASS_LOADER_DISABLED
-? getThisClassLoader()
-: Thread.currentThread().getContextClassLoader();
-if (isChild(referenceLoader, loader1)) {
-return isChild(referenceLoader, loader2) ? referenceLoader :
loader2;
-}
-return isChild(loader1, loader2) ? loader1 : loader2;
-};
-return AccessController.doPrivileged(action, null, GET_CLASS_LOADER);
+final ClassLoader loader1 = class1 == null ? null :
class1.getClassLoader();
+final ClassLoader loader2 = class2 == null ? null :
class2.getClassLoader();
+final ClassLoader referenceLoader =
Thread.currentThread().getContextClassLoader();
+if (isChild(referenceLoader, loader1)) {
+return isChild(referenceLoader, loader2) ? referenceLoader :
loader2;
+}
+return isChild(loader1, loader2) ? loader1 : loader2;
}
/**
@@ -129,101 +95,74 @@ public final class LoaderUtil {
}
/**
- * Looks up the ClassLoader for this current thread. If this class does
not have the runtime permission
- * {@code getClassLoader}, then the only ClassLoader this attempts to look
up is the loader behind this
- * class. When a SecurityManager is installed, this attempts to make a
privileged call to get the current
- * {@linkplain Thread#getContextClassLoader() thread context
(logging-log4j2) 03/07: Remove tests related to SecurityManager
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 295d5e460a54fdf690d2780e4a891686779334e4
Author: Matt Sicker
AuthorDate: Mon Nov 13 22:44:03 2023 -0600
Remove tests related to SecurityManager
Signed-off-by: Matt Sicker
---
.../log4j/test/junit/SecurityManagerTestRule.java | 93 --
...EnvironmentPropertySourceSecurityManagerIT.java | 83 ---
...ropertyFilePropertySourceSecurityManagerIT.java | 89 -
.../logging/log4j/util/StackLocatorTestIT.java | 64 ---
.../logging/log4j/util/StackLocatorUtilTest.java | 11 +--
...mPropertiesPropertySourceSecurityManagerIT.java | 92 -
.../util/PrivateSecurityManagerStackTraceUtil.java | 80 ---
.../apache/logging/log4j/util/StackLocator.java| 4 -
.../log4j/core/impl/ThrowableProxyTest.java| 78 --
.../log4j/perf/jmh/ReflectionBenchmark.java| 13 ---
.../.3.x.x/remove_security_manager_support.xml | 10 +++
11 files changed, 11 insertions(+), 606 deletions(-)
diff --git
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
deleted file mode 100644
index c3a8a6f41e..00
---
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.logging.log4j.test.junit;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-/**
- * Sets a security manager for a test run. The current security manager is
first saved then restored after the test is
- * run.
- *
- * Using a security manager can mess up other tests so this is best used from
integration tests (classes that end in
- * "IT" instead of "Test" and "TestCase".)
- *
- *
- *
- * When this test rule is evaluated, it will:
- *
- *
- * Save the current SecurityManager.
- * Set the SecurityManager to the instance supplied to this rule.
- * Evaluate the test statement.
- * Reset the current SecurityManager to the one from step (1).
- *
- *
- * @since 2.11.0
- */
-public class SecurityManagerTestRule implements TestRule {
-
-/**
- * Constructs a new instance with the given {@link SecurityManager}.
- *
- * When this test rule is evaluated, it will:
- *
- *
- * Save the current SecurityManager.
- * Set the SecurityManager to the instance supplied to this rule.
- * Evaluate the test statement.
- * Reset the current SecurityManager to the one from step (1).
- *
- *
- * @param securityManager
- *the {@link SecurityManager} to use while running a test.
- */
-public SecurityManagerTestRule(final SecurityManager securityManager) {
-super();
-this.securityManager = securityManager;
-}
-
-private SecurityManager securityManagerBefore;
-private final SecurityManager securityManager;
-
-@Override
-public Statement apply(final Statement base, final Description
description) {
-return new Statement() {
-@Override
-public void evaluate() throws Throwable {
-before();
-try {
-base.evaluate();
-} finally {
-after();
-}
-}
-
-private void after() {
-System.setSecurityManager(securityManagerBefore);
-}
-
-private void before() {
-securityManagerBefore = System.getSecurityManager();
-System.setSecurityManager(securityManager);
-
-}
-};
-}
-
-}
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java
(logging-log4j2) 07/07: Remove ServiceRegistry in favor of utility function
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3118f4799728d6b2b987a1858ac80b4c8579fc38
Author: Matt Sicker
AuthorDate: Tue Nov 14 00:06:39 2023 -0600
Remove ServiceRegistry in favor of utility function
Without a need for tracking externally registered services, everywhere that
was looking up services can do so more directly now.
Signed-off-by: Matt Sicker
---
.../logging/log4j/util/ServiceLoaderUtilTest.java | 27 ++--
.../logging/log4j/message/ThreadDumpMessage.java | 16 +--
.../apache/logging/log4j/spi/LoggingSystem.java| 9 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 41 ++
.../logging/log4j/util/ServiceLoaderUtil.java | 142 +++--
.../apache/logging/log4j/util/ServiceRegistry.java | 81
.../log4j/core/config/AbstractConfiguration.java | 11 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 22 ++--
.../logging/log4j/core/util/WatchManager.java | 12 +-
.../org/apache/logging/log4j/plugins/di/DI.java| 8 +-
10 files changed, 76 insertions(+), 293 deletions(-)
diff --git
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
index e6d9d704bd..b82fb953b2 100644
---
a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
+++
b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/ServiceLoaderUtilTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.logging.log4j.util;
-import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
import java.util.stream.Collectors;
import org.apache.logging.log4j.Level;
@@ -32,29 +32,30 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
public class ServiceLoaderUtilTest {
@Test
public void testServiceResolution() {
-final List services = new ArrayList<>();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(BetterService.class, MethodHandles.lookup(),
false)
-.forEach(services::add));
-assertThat(services).hasSize(1);
-services.clear();
-assertDoesNotThrow(() ->
ServiceLoaderUtil.loadServices(PropertySource.class, MethodHandles.lookup(),
false)
-.forEach(services::add));
-assertThat(services).hasSize(3);
-}
+final List services = new ArrayList<>();
+final ClassLoader classLoader = getClass().getClassLoader();
+assertDoesNotThrow(() ->
ServiceLoaderUtil.safeStream(ServiceLoader.load(BetterService.class,
classLoader))
+.forEach(services::add));
+assertThat(services).hasSize(1);
+services.clear();
+assertDoesNotThrow(() ->
ServiceLoaderUtil.safeStream(ServiceLoader.load(PropertySource.class,
classLoader))
+.forEach(services::add));
+assertThat(services).hasSize(3);
+}
@Test
@UsingStatusListener
public void testBrokenServiceFile(final ListStatusListener listener) {
final List services = new ArrayList<>();
-assertDoesNotThrow(() -> ServiceLoaderUtil.loadServices(Service.class,
MethodHandles.lookup(), false)
+final ClassLoader classLoader = getClass().getClassLoader();
+assertDoesNotThrow(() ->
ServiceLoaderUtil.safeStream(ServiceLoader.load(Service.class, classLoader))
.forEach(services::add));
-assertEquals(2, services.size());
+assertThat(services).hasSize(2);
// A warning for each broken service
final List errors =
listener.findStatusData(Level.WARN).map(StatusData::getThrowable)
.collect(Collectors.toList());
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
index cbfa241b5b..585728251f 100644
---
a/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
+++
b/log4j-api/src/main/java/org/apache/logging/log4j/message/ThreadDumpMessage.java
@@ -16,16 +16,15 @@
*/
package org.apache.logging.log4j.message;
-import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
+import java.util.ServiceLoader;
import aQute.bnd.annotation.Cardinality;
-import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceConsumer;
import org.apache.logging.log4j.message.ThreadDumpMessage.ThreadInfoFactory;
import
(logging-log4j2) 01/07: Access current thread group directly
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5237149e270ac106e3ae1f58f3acac6f67ea6c8b
Author: Matt Sicker
AuthorDate: Mon Nov 13 22:42:29 2023 -0600
Access current thread group directly
Signed-off-by: Matt Sicker
---
.../java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
index 65ed49c7c1..2a55c1a901 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
@@ -75,9 +75,7 @@ public class Log4jThreadFactory implements ThreadFactory {
this.threadNamePrefix = PREFIX + FACTORY_NUMBER.getAndIncrement() +
"-" + threadFactoryName + "-";
this.daemon = daemon;
this.priority = priority;
-final SecurityManager securityManager = System.getSecurityManager();
-this.group = securityManager != null ? securityManager.getThreadGroup()
-: Thread.currentThread().getThreadGroup();
+this.group = Thread.currentThread().getThreadGroup();
}
@Override
(logging-log4j2) branch the-great-deletion updated (68a57ce0de -> 3118f47997)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 68a57ce0de Use explicit Configuration in test
new 5237149e27 Access current thread group directly
new d0f7e533a3 Update changelog entry
new 295d5e460a Remove tests related to SecurityManager
new e15359668c Access system properties directly
new 79d21aee3a Remove SecurityManager checks from LoaderUtil
new 6e00230de9 Use system properties directly
new 3118f47997 Remove ServiceRegistry in favor of utility function
The 7 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:
.../log4j/test/junit/SecurityManagerTestRule.java | 93 ---
...EnvironmentPropertySourceSecurityManagerIT.java | 83 --
...ropertyFilePropertySourceSecurityManagerIT.java | 89 --
.../logging/log4j/util/ServiceLoaderUtilTest.java | 27 +--
.../logging/log4j/util/StackLocatorTestIT.java | 64 ---
.../logging/log4j/util/StackLocatorUtilTest.java | 11 +-
...mPropertiesPropertySourceSecurityManagerIT.java | 92 ---
.../logging/log4j/message/ThreadDumpMessage.java | 16 +-
.../apache/logging/log4j/spi/LoggingSystem.java| 9 +-
.../org/apache/logging/log4j/util/LoaderUtil.java | 184 +++--
.../util/PrivateSecurityManagerStackTraceUtil.java | 80 -
.../apache/logging/log4j/util/PropertiesUtil.java | 41 ++---
.../logging/log4j/util/ServiceLoaderUtil.java | 142 ++--
.../apache/logging/log4j/util/ServiceRegistry.java | 81 -
.../apache/logging/log4j/util/StackLocator.java| 4 -
.../org/apache/logging/log4j/util/Strings.java | 3 +-
.../log4j/util/SystemPropertiesPropertySource.java | 37 +
.../log4j/core/impl/ThrowableProxyTest.java| 78 -
.../log4j/core/config/AbstractConfiguration.java | 11 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 22 +--
.../log4j/core/util/Log4jThreadFactory.java| 4 +-
.../logging/log4j/core/util/WatchManager.java | 12 +-
.../logging/log4j/smtp/appender/SmtpManager.java | 3 +-
.../log4j/perf/jmh/ReflectionBenchmark.java| 13 --
.../org/apache/logging/log4j/plugins/di/DI.java| 8 +-
.../logging/log4j/smtp/appender/SmtpManager.java | 3 +-
.../.3.x.x/remove_legacy_osgi_support.xml | 23 +--
...bom.xml => remove_security_manager_support.xml} | 8 +-
28 files changed, 156 insertions(+), 1085 deletions(-)
delete mode 100644
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SecurityManagerTestRule.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/EnvironmentPropertySourceSecurityManagerIT.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertyFilePropertySourceSecurityManagerIT.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorTestIT.java
delete mode 100644
log4j-api-test/src/test/java/org/apache/logging/log4j/util/SystemPropertiesPropertySourceSecurityManagerIT.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/PrivateSecurityManagerStackTraceUtil.java
delete mode 100644
log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceRegistry.java
copy src/changelog/.3.x.x/{update_io_netty_netty_bom.xml =>
remove_security_manager_support.xml} (58%)
(logging-log4j2) 06/07: Use system properties directly
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 6e00230de955c76ee8564472bb1cb74813388129
Author: Matt Sicker
AuthorDate: Tue Nov 14 00:01:40 2023 -0600
Use system properties directly
Signed-off-by: Matt Sicker
---
.../main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java | 3 +--
.../main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
b/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
index 1845d26453..35f9ec64f2 100644
---
a/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
+++
b/log4j-jakarta-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
@@ -50,7 +50,6 @@ import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
import org.apache.logging.log4j.core.util.CyclicBuffer;
import org.apache.logging.log4j.core.util.NetUtils;
import org.apache.logging.log4j.smtp.MimeMessageBuilder;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
/**
@@ -343,7 +342,7 @@ public class SmtpManager extends AbstractManager {
public SmtpManager createManager(final String name, final FactoryData
data) {
final String prefix = "mail." + data.protocol;
-final Properties properties = PropertiesUtil.getSystemProperties();
+final Properties properties = System.getProperties();
properties.setProperty("mail.transport.protocol", data.protocol);
if (properties.getProperty("mail.host") == null) {
// Prevent an UnknownHostException in Java 7
diff --git
a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
index 530a1f6fd8..d6182ece7d 100644
---
a/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
+++
b/log4j-smtp/src/main/java/org/apache/logging/log4j/smtp/appender/SmtpManager.java
@@ -50,7 +50,6 @@ import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
import org.apache.logging.log4j.core.util.CyclicBuffer;
import org.apache.logging.log4j.core.util.NetUtils;
import org.apache.logging.log4j.smtp.MimeMessageBuilder;
-import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Strings;
/**
@@ -347,7 +346,7 @@ public class SmtpManager extends AbstractManager {
public SmtpManager createManager(final String name, final FactoryData
data) {
final String prefix = "mail." + data.protocol;
-final Properties properties = PropertiesUtil.getSystemProperties();
+final Properties properties = System.getProperties();
properties.setProperty("mail.transport.protocol", data.protocol);
if (properties.getProperty("mail.host") == null) {
// Prevent an UnknownHostException in Java 7
(logging-log4j2) 02/07: Update changelog entry
This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch the-great-deletion in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git commit d0f7e533a3769957b243d46cf9a93cf63dab2e27 Author: Matt Sicker AuthorDate: Mon Nov 13 22:42:43 2023 -0600 Update changelog entry Signed-off-by: Matt Sicker --- .../.3.x.x/remove_legacy_osgi_support.xml | 23 +- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/changelog/.3.x.x/remove_legacy_osgi_support.xml b/src/changelog/.3.x.x/remove_legacy_osgi_support.xml index 0b2656f6e4..a4f72a0670 100644 --- a/src/changelog/.3.x.x/remove_legacy_osgi_support.xml +++ b/src/changelog/.3.x.x/remove_legacy_osgi_support.xml @@ -1,21 +1,8 @@ - - -http://logging.apache.org/log4j/changelog; type="removed"> + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="removed"> Remove legacy OSGi integration. `ServiceLoader` mechanism should be used instead.
(logging-log4cxx) branch master updated: Use default std::stringstream formatting attributes in each log request (#288)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new 4b20aa6f Use default std::stringstream formatting attributes in each
log request (#288)
4b20aa6f is described below
commit 4b20aa6f4d56b8452e741fb6524d84bdb17b9dd0
Author: vopl
AuthorDate: Tue Nov 14 06:33:31 2023 +0300
Use default std::stringstream formatting attributes in each log request
(#288)
* add test to verify outputstream resets
-
Co-authored-by: Robert Middleton
---
src/main/cpp/messagebuffer.cpp | 5
src/test/cpp/helpers/messagebuffertest.cpp | 28 ++
src/test/resources/input/messagebuffer1.properties | 21
src/test/resources/witness/messagebuffer.1 | 2 ++
4 files changed, 56 insertions(+)
diff --git a/src/main/cpp/messagebuffer.cpp b/src/main/cpp/messagebuffer.cpp
index bad3296a..461e9a9c 100644
--- a/src/main/cpp/messagebuffer.cpp
+++ b/src/main/cpp/messagebuffer.cpp
@@ -54,9 +54,14 @@ struct StringOrStream
if (!this->stream)
{
#if LOG4CXX_HAS_THREAD_LOCAL
+ const static std::basic_ostringstream initialState;
thread_local static std::basic_ostringstream sStream;
this->stream =
this->stream->clear();
+ this->stream->precision(initialState.precision());
+ this->stream->width(initialState.width());
+ this->stream->setf(initialState.flags(),
~initialState.flags());
+ this->stream->fill(initialState.fill());
#else
this->stream = new std::basic_ostringstream();
#endif
diff --git a/src/test/cpp/helpers/messagebuffertest.cpp
b/src/test/cpp/helpers/messagebuffertest.cpp
index deba396b..f953ea30 100644
--- a/src/test/cpp/helpers/messagebuffertest.cpp
+++ b/src/test/cpp/helpers/messagebuffertest.cpp
@@ -21,6 +21,9 @@
#include "../logunit.h"
#include
#include
+#include
+#include
+#include "util/compare.h"
#if LOG4CXX_CFSTRING_API
#include
@@ -42,6 +45,7 @@ LOGUNIT_CLASS(MessageBufferTest)
LOGUNIT_TEST(testInsertNull);
LOGUNIT_TEST(testInsertInt);
LOGUNIT_TEST(testInsertManipulator);
+ LOGUNIT_TEST(testBaseChange);
#if LOG4CXX_WCHAR_T_API
LOGUNIT_TEST(testInsertConstWStr);
LOGUNIT_TEST(testInsertWString);
@@ -136,6 +140,30 @@ public:
LOGUNIT_ASSERT_EQUAL(true, buf.hasStream());
}
+ void testBaseChange()
+ {
+ LoggerPtr root;
+ LoggerPtr logger;
+
+ root = Logger::getRootLogger();
+ logger =
Logger::getLogger(LOG4CXX_STR("java.org.apache.log4j.PatternLayoutTest"));
+
+
PropertyConfigurator::configure(LOG4CXX_FILE("input/messagebuffer1.properties"));
+
+ int num = 220;
+ LOG4CXX_INFO(logger, "number in hex: " << std::hex << num);
+ LOG4CXX_INFO(logger, "number in dec: " << num);
+
+
LOGUNIT_ASSERT(Compare::compare(LOG4CXX_STR("output/messagebuffer"),
LOG4CXX_FILE("witness/messagebuffer.1")));
+
+ auto rep = root->getLoggerRepository();
+
+ if (rep)
+ {
+ rep->resetConfiguration();
+ }
+ }
+
#if LOG4CXX_WCHAR_T_API
void testInsertConstWStr()
{
diff --git a/src/test/resources/input/messagebuffer1.properties
b/src/test/resources/input/messagebuffer1.properties
new file mode 100644
index ..f80075be
--- /dev/null
+++ b/src/test/resources/input/messagebuffer1.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+log4j.rootCategory=DEBUG, testAppender
+log4j.appender.testAppender=org.apache.log4j.FileAppender
+log4j.appender.testAppender.file=output/messagebuffer
+log4j.appender.testAppender.Append=false
+log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout
(logging-log4j2) 02/03: Clean up unused classpath-scanning things
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit ab6bd338db3d114af96f1a65e71183592fa4902c
Author: Matt Sicker
AuthorDate: Mon Nov 13 14:21:47 2023 -0600
Clean up unused classpath-scanning things
Signed-off-by: Matt Sicker
---
.../apache/logging/log4j/spi/LoggingSystem.java| 56 +--
.../config/builder/impl/BuiltConfiguration.java| 4 +-
.../config/composite/CompositeConfiguration.java | 6 +-
.../log4j/core/config/jason/JsonConfiguration.java | 5 +-
.../log4j/core/config/json/JsonConfiguration.java | 5 +-
.../log4j/core/config/xml/XmlConfiguration.java| 5 +-
.../util/ResolverUtilCustomProtocolTest.java | 172 ---
.../log4j/plugins/util/ResolverUtilTest.java | 216 -
.../log4j/plugins/model/PluginRegistry.java| 152 +--
.../logging/log4j/plugins/util/ResolverUtil.java | 497 -
10 files changed, 21 insertions(+), 1097 deletions(-)
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
index 66ad3f2681..4691a74c48 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggingSystem.java
@@ -27,12 +27,9 @@ import java.util.Objects;
import java.util.Properties;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier;
import java.util.stream.Collectors;
-import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceConsumer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.ThreadContext;
@@ -43,7 +40,6 @@ import
org.apache.logging.log4j.message.ParameterizedMessageFactory;
import org.apache.logging.log4j.message.ReusableMessageFactory;
import org.apache.logging.log4j.simple.SimpleLoggerContextFactory;
import org.apache.logging.log4j.util.Constants;
-import org.apache.logging.log4j.util.InternalApi;
import org.apache.logging.log4j.util.Lazy;
import org.apache.logging.log4j.util.LoaderUtil;
import org.apache.logging.log4j.util.LowLevelLogUtil;
@@ -51,7 +47,14 @@ import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.PropertyEnvironment;
import org.apache.logging.log4j.util.ServiceRegistry;
-import static org.apache.logging.log4j.spi.LoggingSystemProperty.*;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.LOGGER_FLOW_MESSAGE_FACTORY_CLASS;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.LOGGER_MESSAGE_FACTORY_CLASS;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_ENABLE;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_GARBAGE_FREE_ENABLED;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_INITIAL_CAPACITY;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_MAP_CLASS;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_MAP_INHERITABLE;
+import static
org.apache.logging.log4j.spi.LoggingSystemProperty.THREAD_CONTEXT_STACK_ENABLED;
/**
* Handles initializing the Log4j API through {@link Provider} discovery. This
keeps track of which
@@ -60,7 +63,7 @@ import static
org.apache.logging.log4j.spi.LoggingSystemProperty.*;
*
* @since 3.0.0
*/
-@ServiceConsumer(value = Provider.class, resolution = Resolution.OPTIONAL)
+@ServiceConsumer(Provider.class)
public class LoggingSystem {
/**
* Resource name for a Log4j 2 provider properties file.
@@ -73,8 +76,7 @@ public class LoggingSystem {
private static final Lazy SYSTEM =
Lazy.relaxed(LoggingSystem::new);
-private final Lock initializationLock = new ReentrantLock();
-private volatile SystemProvider provider;
+private final Lazy providerLazy =
Lazy.relaxed(this::findProvider);
private final Lazy environmentLazy =
Lazy.relaxed(PropertiesUtil::getProperties);
private final Lazy loggerContextFactoryLazy =
environmentLazy.map(environment ->
getProvider().createLoggerContextFactory(environment));
@@ -103,45 +105,11 @@ public class LoggingSystem {
private final Lazy>
threadContextStackFactoryLazy = environmentLazy.map(environment ->
() -> getProvider().createContextStack(environment));
-/**
- * Acquires a lock on the initialization of locating a logging system
provider. This lock should be
- * {@linkplain #releaseInitializationLock() released} once the logging
system provider is loaded. This lock is
- * provided to allow for lazy initialization via frameworks like OSGi to
wait for a provider to be installed
-
(logging-log4j2) branch the-great-deletion created (now 68a57ce0de)
This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a change to branch the-great-deletion in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 68a57ce0de Use explicit Configuration in test This branch includes the following new commits: new 5838921275 Remove legacy OSGi support new ab6bd338db Clean up unused classpath-scanning things new 68a57ce0de Use explicit Configuration in test The 3 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) 03/03: Use explicit Configuration in test
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 68a57ce0de17f75d2cda8a8b5d5f17e806b94e4c
Author: Matt Sicker
AuthorDate: Mon Nov 13 14:22:29 2023 -0600
Use explicit Configuration in test
Signed-off-by: Matt Sicker
---
.../log4j/core/appender/FileAppenderTest.java | 46 --
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
index 241cc4a41b..5014fcf47a 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
@@ -33,6 +33,8 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.apache.logging.log4j.core.util.Integers;
@@ -63,18 +65,20 @@ public class FileAppenderTest {
assertFalse(AbstractManager.hasManager(FILE_NAME), "Manager for " +
FILE_NAME + " not removed");
}
+private final Configuration configuration = new DefaultConfiguration();
+
@ParameterizedTest
@ValueSource(booleans = { false, true })
public void testAppender(final boolean createOnDemand) throws Exception {
final int logEventCount = 1;
-writer(false, logEventCount, "test", createOnDemand, false);
+writer(false, logEventCount, "test", createOnDemand, false,
configuration);
verifyFile(logEventCount);
}
@ParameterizedTest
@ValueSource(booleans = { false, true })
public void testLazyCreate(final boolean createOnDemand) throws Exception {
-final Layout layout = createPatternLayout();
+final Layout layout = createPatternLayout(configuration);
// @formatter:off
final FileAppender appender = FileAppender.newBuilder()
.setFileName(FILE_NAME)
@@ -98,17 +102,20 @@ public class FileAppenderTest {
assertNotEquals(createOnDemand, Files.exists(PATH));
}
-private static PatternLayout createPatternLayout() {
-return
PatternLayout.newBuilder().setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN)
+private static PatternLayout createPatternLayout(final Configuration
configuration) {
+return PatternLayout.newBuilder()
+.setConfiguration(configuration)
+.setPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN)
.build();
}
@ParameterizedTest
@ValueSource(booleans = { false, true })
public void testSmallestBufferSize(final boolean createOnDemand) throws
Exception {
-final Layout layout = createPatternLayout();
+final Layout layout = createPatternLayout(configuration);
// @formatter:off
final FileAppender appender = FileAppender.newBuilder()
+.setConfiguration(configuration)
.setFileName(FILE_NAME)
.setName("test")
.setImmediateFlush(false)
@@ -155,7 +162,7 @@ public class FileAppenderTest {
@ValueSource(booleans = { false, true })
public void testLockingAppender(final boolean createOnDemand) throws
Exception {
final int logEventCount = 1;
-writer(true, logEventCount, "test", createOnDemand, false);
+writer(true, logEventCount, "test", createOnDemand, false,
configuration);
verifyFile(logEventCount);
}
@@ -170,7 +177,7 @@ public class FileAppenderTest {
final ExecutorService threadPool =
Executors.newFixedThreadPool(threadCount);
final AtomicReference throwableRef = new
AtomicReference<>();
final int logEventCount = 100;
-final Runnable runnable = new FileWriterRunnable(createOnDemand, lock,
logEventCount, throwableRef);
+final Runnable runnable = new FileWriterRunnable(createOnDemand, lock,
logEventCount, throwableRef, configuration);
for (int i = 0; i < threadCount; ++i) {
threadPool.execute(runnable);
}
@@ -225,11 +232,13 @@ public class FileAppenderTest {
verifyFile(logEventCount * processCount);
}
-private static void writer(final boolean locking, final int logEventCount,
final String name, final boolean createOnDemand,
-final boolean concurrent) throws Exception {
-final Layout layout = createPatternLayout();
+private static void writer(
+final boolean
(logging-log4j2) 01/03: Remove legacy OSGi support
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch the-great-deletion
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 58389212758947059e9b7dacd992ef9da5c50f9c
Author: Matt Sicker
AuthorDate: Mon Nov 13 14:21:06 2023 -0600
Remove legacy OSGi support
Rely on ServiceLoader for compatibility instead.
Signed-off-by: Matt Sicker
---
log4j-api/pom.xml | 12 --
.../org/apache/logging/log4j/util/Activator.java | 160 --
.../logging/log4j/util/OsgiServiceLocator.java | 80 -
.../apache/logging/log4j/util/ServiceRegistry.java | 75 +
.../apache/logging/log4j/util/package-info.java| 2 +-
log4j-core/pom.xml | 12 --
.../log4j/core/impl/ThreadContextDataInjector.java | 2 +-
.../apache/logging/log4j/core/osgi/Activator.java | 47 --
.../log4j/core/osgi/BundleContextSelector.java | 172 ---
.../log4j/core/osgi/OsgiBundlePostProcessor.java | 72
.../logging/log4j/osgi/tests/CoreOsgiTest.java | 13 --
log4j-plugin-processor/pom.xml | 11 --
log4j-plugins-test/pom.xml | 11 --
log4j-plugins/pom.xml | 11 --
.../logging/log4j/plugins/osgi/Activator.java | 187 -
.../.3.x.x/remove_legacy_osgi_support.xml | 21 +++
16 files changed, 27 insertions(+), 861 deletions(-)
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 1885edaf9e..a48e0e5338 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -44,16 +44,4 @@
-
-
- org.osgi
- org.osgi.framework
- provided
-
-
- org.osgi
- org.osgi.resource
- provided
-
-
diff --git
a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
b/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
deleted file mode 100644
index 741e33fdd6..00
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.logging.log4j.util;
-
-import java.security.Permission;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.spi.LoggingSystem;
-import org.apache.logging.log4j.spi.Provider;
-import org.apache.logging.log4j.status.StatusLogger;
-import org.osgi.annotation.bundle.Header;
-import org.osgi.framework.AdaptPermission;
-import org.osgi.framework.AdminPermission;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.Constants;
-import org.osgi.framework.SynchronousBundleListener;
-import org.osgi.framework.wiring.BundleWiring;
-
-/**
- * Consider this class private.
- * OSGi bundle activator. Used for locating an implementation of
- * {@link org.apache.logging.log4j.spi.LoggerContextFactory} et al. that have
corresponding
- * {@code META-INF/log4j-provider.properties} files. As with all OSGi
BundleActivator classes, this class is not for
- * public use and is only useful in an OSGi framework environment.
- */
-@InternalApi
-@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
-@Header(name = Constants.BUNDLE_ACTIVATIONPOLICY, value =
Constants.ACTIVATION_LAZY)
-public class Activator implements BundleActivator, SynchronousBundleListener {
-
-private static final SecurityManager SECURITY_MANAGER =
System.getSecurityManager();
-
-private static final Logger LOGGER = StatusLogger.getLogger();
-
-// until we have at least one Provider, we'll lock LoggingSystem which
locks LogManager.getFactory by extension.
-// this variable needs to be reset once the lock has been released
-private boolean hasLoggingSystemInitializationLock;
-
-private static void checkPermission(final Permission permission) {
-if
(logging-parent) branch asf-staging updated: Fix changelog
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/asf-staging by this push: new 98aebdf Fix changelog 98aebdf is described below commit 98aebdf696e6cd9f27c06f36a9274c148f9f236b Author: Volkan Yazıcı AuthorDate: Mon Nov 13 21:59:35 2023 +0100 Fix changelog --- 10.x/index.html | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/10.x/index.html b/10.x/index.html index 94d0b4d..72fe0e7 100644 --- a/10.x/index.html +++ b/10.x/index.html @@ -822,15 +822,6 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur Increase directory scanning depth from 8 to 32 in the distribution BeanShell script - -Update com.github.spotbugs:spotbugs-annotations to version 4.8.1 (https://github.com/apache/logging-parent/pull/58;>58) - - -Update com.github.spotbugs:spotbugs-maven-plugin to version 4.8.1.0 (https://github.com/apache/logging-parent/pull/57;>57) - - -Update org.apache.maven.plugins:maven-artifact-plugin to version 3.5.0 - @@ -1597,7 +1588,7 @@ See the License for the specific language governing permissions and limitations -Last updated 2023-11-13 20:38:30 UTC +Last updated 2023-11-13 20:52:45 UTC
svn commit: r65267 - /dev/logging/logging-parent/
Author: svc_dist_logging Date: Mon Nov 13 20:53:34 2023 New Revision: 65267 Log: Added `apache-logging-parent` artifacts for release `10.4.0` Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt dev/logging/logging-parent/apache-logging-parent-10.4.0-site.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip.asc dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip.sha512 Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc Mon Nov 13 20:53:34 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmVSjM0ACgkQVuc7qaC1 +ktDR/w//XrYbp+PEbH8N6cluFctamRfA95kebsHCD3El2Q5vcf0tGO1+k1Ob1Zgb +7V/xX0YrKDCDF7ZyYGF9avuC7/fCYwUA5GdVZyoWZUhTQc+xrltGDx5RzZ7Tnht/ +YtIkWKzSU1WcHxxcRRQflVWWvDjXJnJ2sWdZRy9AOziFMviljBpTTCixajONugfh +4Zkw5G0cMuGy83NUoGv0wcSWOKl9odHtP+gOuso4KSa1PW+YZyIPjZWkL+FJZ9R9 +JomMIzkgsO8gSTUnITGkR2qgKoshrcWbggxmpXCh2Q/xvqNx6ITTZ+5f2fvNQcw7 +J/3OOdLX7LR1c8P2P5i1qfviRIsQL+iTTqAfiKJi64tiG/UqY/R+OTwtd5qfR+d5 +fAKrtVjYYvnnG1bhxExdMFoK9nwvChWeV/VIOGX3NhGPcv/8jO1nr+ytrMZ624As +lvb0Q8+9SyZD6TU+yM4AZMBS2pm84XHcDT+FLaSxx1yFJ1a8Os8+7P/18lxiAiZY +K6lpudcbtEMGUZy+zgNlF55UR2lEiR7KLMOtxHV6iGGQkhvS/MzRFnLSYXBykTuK +2DgKYd8WUN75VqAHpuaRl26qKaxqIdUp4nSKvvTKYHRUCZWRe3XKtuWb6uVKUt3F +ukW+qh0H+B78l4fYsYzOMPGIx/zTEM7WiHuYRQGzOnVvoJaHYRw= +=zrqc +-END PGP SIGNATURE- Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 Mon Nov 13 20:53:34 2023 @@ -0,0 +1 @@ +7207a76ba81bc5f1dfe6a486afcac95cf20848ee5b9a0886415159b14fe751bb38212696cfbc7b7837e7aa3033923468a8b7250e38de88e5d10b802a0220d2c8 apache-logging-parent-10.4.0-bin.zip Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt Mon Nov 13 20:53:34 2023 @@ -0,0 +1,22 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Logging Parent 10.4.0 released + +Apache Logging Parent team is pleased to announce the 10.4.0 +release. This project contains the parent POM for other Maven-based +Apache Logging Services projects. For further information (support, +download, etc.) see the project website[1]. + +[1] https://logging.apache.org/logging-parent + +=== Release Notes + +This minor release contains several small improvements. + + + Added + +* Add deterministic Palantir Java formatter + + Changed + +* Increase directory scanning depth from 8 to 32 in the distribution BeanShell script Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt Mon Nov 13 20:53:34 2023 @@ -0,0 +1,34 @@ +To: d...@logging.apache.org +Title: [VOTE][LAZY] Release Apache Logging Parent 10.4.0 + +This is a lazy-vote to release the Apache Logging Parent 10.4.0. + +Website: https://logging.staged.apache.org/logging-parent +GitHub: https://github.com/apache/logging-parent +Commit: e45457c683302242be5e8e7c3c33edf8f0e0ec0e +Distribution: https://dist.apache.org/repos/dist/dev/logging/logging-parent +Nexus: https://repository.apache.org/content/repositories/orgapachelogging-1113 +Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0 + +Please download, test, and cast your votes on this mailing list. + +[ ] +1, release the artifacts +[ ] -1,
(logging-parent) branch release/10.4.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.4.0 by this push: new e45457c Update the `project.build.outputTimestamp` property e45457c is described below commit e45457c683302242be5e8e7c3c33edf8f0e0ec0e Author: ASF Logging Services RM AuthorDate: Mon Nov 13 20:52:50 2023 + 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 edb7133..c6a6821 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,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*! --> - 2023-11-13T20:36:11Z + 2023-11-13T20:50:43Z 8
(logging-parent) branch release/10.4.0 updated: Fix changelog
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.4.0 by this push: new 87b97a9 Fix changelog 87b97a9 is described below commit 87b97a99b71df1c1bd2b6198cf192829f31e1952 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 21:50:43 2023 +0100 Fix changelog --- .../10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml| 8 .../10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml | 8 .../update_org_apache_maven_plugins_maven_artifact_plugin.xml | 7 --- src/site/_release-notes/_10.4.0.adoc | 3 --- 4 files changed, 26 deletions(-) diff --git a/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml deleted file mode 100644 index e3e5bf2..000 --- a/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="changed"> - https://github.com/apache/logging-parent/pull/58"/> - Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` - diff --git a/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml deleted file mode 100644 index 5829f02..000 --- a/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="changed"> - https://github.com/apache/logging-parent/pull/57"/> - Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` - diff --git a/src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml b/src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml deleted file mode 100644 index 84088ad..000 --- a/src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml +++ /dev/null @@ -1,7 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="changed"> - Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0` - diff --git a/src/site/_release-notes/_10.4.0.adoc b/src/site/_release-notes/_10.4.0.adoc index 2835c72..b4d1628 100644 --- a/src/site/_release-notes/_10.4.0.adoc +++ b/src/site/_release-notes/_10.4.0.adoc @@ -48,6 +48,3 @@ This minor release contains several small improvements. Changed * Increase directory scanning depth from 8 to 32 in the distribution BeanShell script -* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` (https://github.com/apache/logging-parent/pull/58[58]) -* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` (https://github.com/apache/logging-parent/pull/57[57]) -* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0`
(logging-parent) branch asf-staging updated: Update for `logging-parent` version `10.4.0` release
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 9f3b0d7 Update for `logging-parent` version `10.4.0` release
9f3b0d7 is described below
commit 9f3b0d78f6d86fa8378583087e51dba9c5a12250
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 21:45:47 2023 +0100
Update for `logging-parent` version `10.4.0` release
---
10.x/index.html | 71 ++---
1 file changed, 58 insertions(+), 13 deletions(-)
diff --git a/10.x/index.html b/10.x/index.html
index d7bbea7..94d0b4d 100644
--- a/10.x/index.html
+++ b/10.x/index.html
@@ -545,6 +545,7 @@ table.CodeRay td.code{padding:0 0 0 .75em}
Security
Release Notes
+10.4.0
10.3.0
10.2.0
10.1.1
@@ -695,7 +696,7 @@ This VDR is accessible through the following URL: https://logging.apach
-Add org.apache.logging:logging-parent:10.3.0 as a
parent to your pom.xml
+Add org.apache.logging:logging-parent:10.4.0 as a
parent to your pom.xml
@@ -792,6 +793,49 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
Release Notes
+10.4.0
+
+
+Release date
+
+2023-11-13
+
+
+
+
+This minor release contains several small improvements.
+
+
+Added
+
+
+
+Add deterministic Palantir Java formatter
+
+
+
+
+
+Changed
+
+
+
+Increase directory scanning depth from 8 to 32 in the distribution
BeanShell script
+
+
+Update com.github.spotbugs:spotbugs-annotations to version
4.8.1 (https://github.com/apache/logging-parent/pull/58;>58)
+
+
+Update com.github.spotbugs:spotbugs-maven-plugin to version
4.8.1.0 (https://github.com/apache/logging-parent/pull/57;>57)
+
+
+Update org.apache.maven.plugins:maven-artifact-plugin to
version 3.5.0
+
+
+
+
+
+
10.3.0
@@ -805,7 +849,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This minor release contains several small improvements.
-Added
+Added
@@ -824,7 +868,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -885,7 +929,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This minor release contains several small improvements.
-Added
+Added
@@ -895,7 +939,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -956,7 +1000,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This patch release contains minor fixes addressing issues blocking the
release of log4j-tools, log4j-kotlin, etc.
-Added
+Added
@@ -966,7 +1010,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -1013,7 +1057,7 @@ Hence, no need for custom .bnd and/or
module-info.java
In particular, we expect the absence of module-info.java files to
avoid several IDE and testing related headaches.
-Added
+Added
@@ -1035,7 +1079,7 @@ In particular, we expect the absence of
module-info.java files to a
-Changed
+Changed
@@ -1100,7 +1144,7 @@ See README.adoc for the complete list of
features and their usage.<
All preparations (release notes, source and binary distributions, vote
announcement emails, etc.) are staged to both Nexus and SVN and waiting the
release manager to proceed.
-Added
+Added
@@ -1131,7 +1175,7 @@ All preparations (release notes, source and binary
distributions, vote ann
-Changed
+Changed
@@ -1435,10 +1479,11 @@ svn co
https://dist.apache.org/repos/dist/release/logging logging-dist-rel
cd logging-dist-rel
mkdir -p logging-parent/7.8.0
cp ../logging-dist-dev/logging-parent/*-7.8.0-{bin,src}.* logging-parent/7.8.0/
+svn add logging-parent/7.8.0
svn commit -m 'Add `logging-parent` version `7.8.0` distribution'
# Update `dev` folder
-cd logging-dist-dev
+cd ../logging-dist-dev
cp logging-parent/*-7.8.0-email-announce.txt /tmp
svn rm logging-parent
svn commit -m 'Remove `logging-parent` version `7.8.0` files
released'
@@ -1552,7 +1597,7 @@ See the License for the specific language governing
permissions and limitations
-Last updated 2023-11-09 09:08:55 UTC
+Last updated 2023-11-13 20:38:30 UTC
svn commit: r65266 - /dev/logging/logging-parent/
Author: svc_dist_logging Date: Mon Nov 13 20:39:24 2023 New Revision: 65266 Log: Added `apache-logging-parent` artifacts for release `10.4.0` Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt dev/logging/logging-parent/apache-logging-parent-10.4.0-site.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip (with props) dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip.asc dev/logging/logging-parent/apache-logging-parent-10.4.0-src.zip.sha512 Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.asc Mon Nov 13 20:39:24 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmVSiXoACgkQVuc7qaC1 +ktDjhg/9HYtlNaqKWNW37sXjj4Sakq6RGJWlVzsX9OZRD9+5VZV92aP+k9YaXP15 +k7MVgu1QMppcNb7QTYBhtlmFJJCUolhr7fhzwPYP6FZJHzb1E2SYZxeBwZ5gzmv6 +3cwYvAFITwMyYK0QKauFbyeoCnPiUx2bxnwfsiU60qHWcV2UWEEyjVbVOLtYC63S +w5F92aJE2yJeAzxjORCI6xBGADcPauVQJU9mn/xxn6ePqWdtzU7gvKF3FuGnV8qZ +Www6AgNmBWky+iic6IN9MbQgZD6uOWGr//oYvnkZv6UULnC1/vng+BtTYXwp52DF +KisrNXc6/jvaOTMQzsYfRzaCH6ppeufmT5qzF9JRCgEDbZuc4dugkdOON9/GTE+y +35JTNabcf0MQEVxVyG4RgE8MgPCdNq7YWiFTXS0eFvYJsAcwlp2NpoIxPD6rMoSd +6hHo1KezzvlgDOm7CEaEsXP8hlOgKAwIIZyu14Z4YqXWlOcitGND13sbImLL6mkJ +1Bu+0Crk+lrV918hhC+Nl2KjkeZWONLM6vzVFUTzZg4Ow6AFiYImxvptw7sbiom/ +BfNqYBI1CNGYw46Pd1f2V4nPAZyNa1rhfMfjyjX8XF2uPtCgp1aoE4tWxLyELXRX +g99hRecwK5qdZ6yItoUmBIxu+CvkVMBMrDFEcpteGU9988aJGRU= +=kuV6 +-END PGP SIGNATURE- Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-bin.zip.sha512 Mon Nov 13 20:39:24 2023 @@ -0,0 +1 @@ +b1e9c4b8b8a4b9ebb60c4564561843cdc3a0b82cccbdc051f2d61c1c759a18f9d1f730f846183611675b9c51f00f715c6dccd6008a20cfdce80732c45e2c0af2 apache-logging-parent-10.4.0-bin.zip Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-email-announce.txt Mon Nov 13 20:39:24 2023 @@ -0,0 +1,25 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Logging Parent 10.4.0 released + +Apache Logging Parent team is pleased to announce the 10.4.0 +release. This project contains the parent POM for other Maven-based +Apache Logging Services projects. For further information (support, +download, etc.) see the project website[1]. + +[1] https://logging.apache.org/logging-parent + +=== Release Notes + +This minor release contains several small improvements. + + + Added + +* Add deterministic Palantir Java formatter + + Changed + +* Increase directory scanning depth from 8 to 32 in the distribution BeanShell script +* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1` (#58) +* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0` (#57) +* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0` Added: dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt == --- dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt (added) +++ dev/logging/logging-parent/apache-logging-parent-10.4.0-email-vote.txt Mon Nov 13 20:39:24 2023 @@ -0,0 +1,37 @@ +To: d...@logging.apache.org +Title: [VOTE][LAZY] Release Apache Logging Parent 10.4.0 + +This is a lazy-vote to release the Apache Logging Parent 10.4.0. + +Website: https://logging.staged.apache.org/logging-parent +GitHub: https://github.com/apache/logging-parent +Commit: 08224ec433db5ade8e7ce5df245a3034416e281d +Distribution: https://dist.apache.org/repos/dist/dev/logging/logging-parent +Nexus:
(logging-parent) branch release/10.4.0 updated: Release changelog for version `10.4.0`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release/10.4.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/release/10.4.0 by this push:
new 08224ec Release changelog for version `10.4.0`
08224ec is described below
commit 08224ec433db5ade8e7ce5df245a3034416e281d
Author: ASF Logging Services RM
AuthorDate: Mon Nov 13 20:38:45 2023 +
Release changelog for version `10.4.0`
---
.../10.4.0/.release-notes.adoc.ftl} | 18 --
src/changelog/10.4.0/.release.xml | 21 +
.../add-deterministic-formatter.xml | 0
.../increase-file-walk-depth.xml| 0
...ate_com_github_spotbugs_spotbugs_annotations.xml | 0
...te_com_github_spotbugs_spotbugs_maven_plugin.xml | 0
...g_apache_maven_plugins_maven_artifact_plugin.xml | 0
src/site/_release-notes.adoc| 2 +-
.../_release-notes/{_10.x.x.adoc => _10.4.0.adoc} | 6 +++---
src/site/_release-notes/_10.x.x.adoc| 11 ---
10 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/changelog/10.4.0/.release-notes.adoc.ftl
similarity index 79%
copy from src/site/_release-notes/_10.x.x.adoc
copy to src/changelog/10.4.0/.release-notes.adoc.ftl
index cf47ae7..b220984 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/changelog/10.4.0/.release-notes.adoc.ftl
@@ -33,21 +33,11 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-[#release-notes-10-x-x]
-=== 10.x.x
-
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
+<#if release.date?has_content>Release date:: ${release.date}
This minor release contains several small improvements.
-
- Added
-
-* Add deterministic Palantir Java formatter
-
- Changed
-
-* Increase directory scanning depth from 8 to 32 in the distribution BeanShell
script
-* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1`
(https://github.com/apache/logging-parent/pull/58[58])
-* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0`
(https://github.com/apache/logging-parent/pull/57[57])
-* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0`
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/10.4.0/.release.xml
b/src/changelog/10.4.0/.release.xml
new file mode 100644
index 000..ef12f07
--- /dev/null
+++ b/src/changelog/10.4.0/.release.xml
@@ -0,0 +1,21 @@
+
+
+http://logging.apache.org/log4j/changelog;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ date="2023-11-13" version="10.4.0"/>
diff --git a/src/changelog/.10.x.x/add-deterministic-formatter.xml
b/src/changelog/10.4.0/add-deterministic-formatter.xml
similarity index 100%
rename from src/changelog/.10.x.x/add-deterministic-formatter.xml
rename to src/changelog/10.4.0/add-deterministic-formatter.xml
diff --git a/src/changelog/.10.x.x/increase-file-walk-depth.xml
b/src/changelog/10.4.0/increase-file-walk-depth.xml
similarity index 100%
rename from src/changelog/.10.x.x/increase-file-walk-depth.xml
rename to src/changelog/10.4.0/increase-file-walk-depth.xml
diff --git
a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml
similarity index 100%
rename from
src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
rename to
src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_annotations.xml
diff --git
a/src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml
b/src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml
similarity index 100%
rename from
src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml
rename to
src/changelog/10.4.0/update_com_github_spotbugs_spotbugs_maven_plugin.xml
diff --git
a/src/changelog/.10.x.x/update_org_apache_maven_plugins_maven_artifact_plugin.xml
b/src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml
similarity index 100%
rename from
src/changelog/.10.x.x/update_org_apache_maven_plugins_maven_artifact_plugin.xml
rename to
src/changelog/10.4.0/update_org_apache_maven_plugins_maven_artifact_plugin.xml
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 54a344c..b5dbc78 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::_release-notes/_10.x.x.adoc[]
+include::_release-notes/_10.4.0.adoc[]
include::_release-notes/_10.3.0.adoc[]
include::_release-notes/_10.2.0.adoc[]
(logging-parent) branch release/10.4.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/release/10.4.0 by this push: new 9debe4e Update the `project.build.outputTimestamp` property 9debe4e is described below commit 9debe4e82091d2d031a42245e16de569a97191e4 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 20:38:38 2023 + 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 fced422..edb7133 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,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*! --> - 2023-11-09T09:05:03Z + 2023-11-13T20:36:11Z 8
(logging-parent) branch release/10.4.0 created (now da3fdfb)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git at da3fdfb Set the version to `10.4.0` This branch includes the following new commits: new da3fdfb Set the version to `10.4.0` 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-parent) 01/01: Set the version to `10.4.0`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit da3fdfbfec108735507a3e28b23336147c4ce9b8 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 21:36:11 2023 +0100 Set the version to `10.4.0` --- pom.xml | 2 +- src/site/_constants.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 26093c8..fced422 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ -10.4.0-SNAPSHOT +10.4.0
(logging-log4j-tools) branch release/0.6.0 deleted (was c9e2da8)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git was c9e2da8 Update the `project.build.outputTimestamp` property This change permanently discards the following revisions: discard c9e2da8 Update the `project.build.outputTimestamp` property discard 8792c6e Hopefully last attachment filepath pattern tuning discard be670ff Update the `project.build.outputTimestamp` property discard 77b3a0f One more attachment filepath pattern tuning discard 2155d81 Update the `project.build.outputTimestamp` property discard 193daeb Relax attachment filepath pattern in CI discard 81203ef Update the `project.build.outputTimestamp` property discard 15e82db Fix CI attachment pattern discard edab382 Update the `project.build.outputTimestamp` property discard f08642a Workaround `logging-parent` issue in CI discard d4e089f Update the `project.build.outputTimestamp` property discard 91b1bf7 Add the `project.build.outputTimestamp` Maven property discard 115de50 Remove the redundant `distribution-attachment-count` CI argument discard aefbc35 Release changelog for version `0.6.0` discard c723677 Set the version to `0.6.0`
(logging-parent) 02/02: Remove incorrect changelog entry
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 9c5c59528cca57403bf4b60c0023bab51daf8708 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 21:27:02 2023 +0100 Remove incorrect changelog entry --- src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml | 9 - src/site/_release-notes/_10.x.x.adoc| 1 - 2 files changed, 10 deletions(-) diff --git a/src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml b/src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml deleted file mode 100644 index 276671e..000 --- a/src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml +++ /dev/null @@ -1,9 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="added"> - -Add XSLT transformation step to add a deterministic `serialNumber` and VDR links to the SBOM - - diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc index aa4cecd..cf47ae7 100644 --- a/src/site/_release-notes/_10.x.x.adoc +++ b/src/site/_release-notes/_10.x.x.adoc @@ -44,7 +44,6 @@ This minor release contains several small improvements. Added * Add deterministic Palantir Java formatter -* Add XSLT transformation step to add a deterministic `serialNumber` and VDR links to the SBOM Changed
(logging-parent) 01/02: Remove redundant `cyclonedx.json` attachment pattern from CI
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 98d4231d79030bc80e1edf4fcec4a51fe92dd18c Author: Volkan Yazıcı AuthorDate: Mon Nov 13 21:26:24 2023 +0100 Remove redundant `cyclonedx.json` attachment pattern from CI --- .github/workflows/deploy-release-reusable.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml index b23d965..1e6d6ac 100644 --- a/.github/workflows/deploy-release-reusable.yaml +++ b/.github/workflows/deploy-release-reusable.yaml @@ -201,7 +201,7 @@ jobs: # This regex needs to work for both Java (`distribution` profile) and `find` (while counting attachments)! # Hence, we don't escape dots, etc. with backslashes, which is problematic to get working in both worlds. -export DIST_ATTACHMENT_FILEPATH_PATTERN="^$ALT_DEPLOYMENT_REPO_FILEPATH/.+-$PROJECT_VERSION"'((-tests)?.jar|-cyclonedx.(xml|json))$' +export DIST_ATTACHMENT_FILEPATH_PATTERN="^$ALT_DEPLOYMENT_REPO_FILEPATH/.+-$PROJECT_VERSION"'((-tests)?.jar|-cyclonedx.xml)$' export DIST_ATTACHMENT_COUNT=$(find "$ALT_DEPLOYMENT_REPO_FILEPATH" -type f -regextype posix-extended -regex "$DIST_ATTACHMENT_FILEPATH_PATTERN" | wc -l) fi
(logging-parent) branch main updated (7e446a1 -> 9c5c595)
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-parent.git from 7e446a1 Revert troubleshooting aid new 98d4231 Remove redundant `cyclonedx.json` attachment pattern from CI new 9c5c595 Remove incorrect changelog entry 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. Summary of changes: .github/workflows/deploy-release-reusable.yaml | 2 +- src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml | 9 - src/site/_release-notes/_10.x.x.adoc| 1 - 3 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/changelog/.10.x.x/add-sbom-serialNumber-and-vex.xml
(logging-log4j2) branch main updated: Try fixing `FileOutputTest` on Windows
This is an automated email from the ASF dual-hosted git repository.
pkarwasz 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 168369e245 Try fixing `FileOutputTest` on Windows
168369e245 is described below
commit 168369e2457886bed7a6c5df27b5ccc348ebf2ae
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 21:19:25 2023 +0100
Try fixing `FileOutputTest` on Windows
---
.../test/java/org/apache/logging/log4j/core/config/FileOutputTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
index 75bcdd51ce..c5f5d54356 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.file.Path;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.test.junit.TempLoggingDir;
import org.junit.jupiter.api.Test;
@@ -38,6 +39,8 @@ public class FileOutputTest {
public void testConfig() throws IOException {
final Path logFile = loggingPath.resolve("status.log");
assertThat(logFile).exists().isNotEmptyFile();
+// Closes the current listeners
+StatusLogger.getLogger().reset();
}
}
(logging-log4j2) branch 2.x updated: Try fixing `FileOutputTest` on Windows
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new ce3a6de7a5 Try fixing `FileOutputTest` on Windows
ce3a6de7a5 is described below
commit ce3a6de7a53a879764dadf01aae35298a039e6be
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 21:19:25 2023 +0100
Try fixing `FileOutputTest` on Windows
---
.../test/java/org/apache/logging/log4j/core/config/FileOutputTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
index 75bcdd51ce..c5f5d54356 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.file.Path;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.test.junit.TempLoggingDir;
import org.junit.jupiter.api.Test;
@@ -38,6 +39,8 @@ public class FileOutputTest {
public void testConfig() throws IOException {
final Path logFile = loggingPath.resolve("status.log");
assertThat(logFile).exists().isNotEmptyFile();
+// Closes the current listeners
+StatusLogger.getLogger().reset();
}
}
(logging-log4j2) branch main updated: Add missing change from AbstractManager cleanup
This is an automated email from the ASF dual-hosted git repository.
mattsicker 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 659941aa87 Add missing change from AbstractManager cleanup
659941aa87 is described below
commit 659941aa876b07fd051a716fc3b19d7702aa73f7
Author: Matt Sicker
AuthorDate: Mon Nov 13 14:18:15 2023 -0600
Add missing change from AbstractManager cleanup
Signed-off-by: Matt Sicker
---
.../org/apache/logging/log4j/core/appender/ManagerRegistry.java| 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
index 78563da373..e4d0061ea2 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
@@ -73,7 +73,7 @@ public class ManagerRegistry {
final String name = manager.getName();
registryLock.lock();
try {
-if (--manager.count <= 0 && managers.remove(name, manager)) {
+if (--manager.count <= 0 && removeManager(name, manager)) {
final String simpleName = manager.getClass().getSimpleName();
LOGGER.debug("Shutting down {} {}", simpleName, name);
final boolean stopped = manager.releaseSub(timeout, unit);
@@ -85,4 +85,9 @@ public class ManagerRegistry {
registryLock.unlock();
}
}
+
+boolean removeManager(final String name, final AbstractManager manager) {
+return managers.remove(name, manager);
+}
+
}
(logging-log4j2) branch main updated (def47a8f82 -> 61d3e703e4)
This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git from def47a8f82 Fix `FileOutputTest` on Windows new c16cba9438 Inline ConfigurableInstanceFactoryPostProcessor::getPostProcessors new 61d3e703e4 Update AbstractManager reflective cleanup 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. Summary of changes: .../log4j/core/appender/ReconfigureAppenderTest.java | 13 + .../java/org/apache/logging/log4j/plugins/di/DI.java | 12 ++-- .../spi/ConfigurableInstanceFactoryPostProcessor.java | 19 +-- 3 files changed, 16 insertions(+), 28 deletions(-)
(logging-log4j2) 02/02: Update AbstractManager reflective cleanup
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 61d3e703e481efa3705eb9e7f38710b322cc17fe
Author: Matt Sicker
AuthorDate: Sun Nov 12 18:48:45 2023 -0600
Update AbstractManager reflective cleanup
This was matching the old behavior which changed.
Signed-off-by: Matt Sicker
---
.../log4j/core/appender/ReconfigureAppenderTest.java| 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
index 6f96ab4b7b..dcc03e1bae 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/ReconfigureAppenderTest.java
@@ -17,13 +17,13 @@
package org.apache.logging.log4j.core.appender;
import java.lang.reflect.Field;
-import java.util.Map;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import
org.apache.logging.log4j.core.appender.rolling.DirectWriteRolloverStrategy;
+import org.apache.logging.log4j.core.appender.rolling.RollingFileManager;
import
org.apache.logging.log4j.core.appender.rolling.SizeBasedTriggeringPolicy;
import org.apache.logging.log4j.core.config.Configurator;
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
@@ -105,15 +105,12 @@ public class ReconfigureAppenderTest {
{
try
{
-final Field field = AbstractManager.class.getDeclaredField("MAP");
+final Field field =
AbstractManager.class.getDeclaredField("REGISTRY");
field.setAccessible(true);
+final ManagerRegistry registry = (ManagerRegistry) field.get(null);
-// Retrieve the map itself.
-final Map map =
-(Map) field.get(null);
-
-// Remove the file manager keyed on file pattern.
-map.remove(appender.getFilePattern());
+final RollingFileManager manager = appender.getManager();
+registry.removeManager(manager.getName(), manager);
}
catch (Exception e)
{
(logging-log4j2) 01/02: Inline ConfigurableInstanceFactoryPostProcessor::getPostProcessors
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c16cba94380266238bcde749b0422ac201aeb07d
Author: Matt Sicker
AuthorDate: Sun Nov 12 18:46:41 2023 -0600
Inline ConfigurableInstanceFactoryPostProcessor::getPostProcessors
Signed-off-by: Matt Sicker
---
.../java/org/apache/logging/log4j/plugins/di/DI.java | 12 ++--
.../spi/ConfigurableInstanceFactoryPostProcessor.java | 19 +--
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DI.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DI.java
index 91515c38e5..f831f3d262 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DI.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DI.java
@@ -16,7 +16,12 @@
*/
package org.apache.logging.log4j.plugins.di;
+import java.lang.invoke.MethodHandles;
+import java.util.Comparator;
+
import
org.apache.logging.log4j.plugins.di.spi.ConfigurableInstanceFactoryPostProcessor;
+import org.apache.logging.log4j.plugins.util.OrderedComparator;
+import org.apache.logging.log4j.util.ServiceRegistry;
/**
* Factory for {@linkplain InstanceFactory instance factories}.
@@ -70,7 +75,10 @@ public final class DI {
* @param factory the instance factory to initialize
*/
public static void initializeFactory(final ConfigurableInstanceFactory
factory) {
-ConfigurableInstanceFactoryPostProcessor.getPostProcessors()
-.forEach(processor -> processor.postProcessFactory(factory));
+ServiceRegistry.getInstance()
+.getServices(ConfigurableInstanceFactoryPostProcessor.class,
MethodHandles.lookup(), null)
+.stream()
+
.sorted(Comparator.comparing(ConfigurableInstanceFactoryPostProcessor::getClass,
OrderedComparator.INSTANCE))
+.forEachOrdered(processor ->
processor.postProcessFactory(factory));
}
}
diff --git
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
index 478e66518d..5b0dc08454 100644
---
a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
+++
b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
@@ -16,17 +16,11 @@
*/
package org.apache.logging.log4j.plugins.di.spi;
-import java.lang.invoke.MethodHandles;
-import java.util.Comparator;
-import java.util.List;
import java.util.ServiceLoader;
-import aQute.bnd.annotation.Resolution;
import aQute.bnd.annotation.spi.ServiceConsumer;
import org.apache.logging.log4j.plugins.Ordered;
import org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory;
-import org.apache.logging.log4j.plugins.util.OrderedComparator;
-import org.apache.logging.log4j.util.ServiceRegistry;
/**
* Provides post-processing capabilities to the initialization of a {@link
ConfigurableInstanceFactory}.
@@ -34,7 +28,7 @@ import org.apache.logging.log4j.util.ServiceRegistry;
* {@link Ordered} annotation on the class for overriding the order it will be
invoked.
*/
@FunctionalInterface
-@ServiceConsumer(value = ConfigurableInstanceFactoryPostProcessor.class,
resolution = Resolution.OPTIONAL)
+@ServiceConsumer(ConfigurableInstanceFactoryPostProcessor.class)
public interface ConfigurableInstanceFactoryPostProcessor {
/**
@@ -44,15 +38,4 @@ public interface ConfigurableInstanceFactoryPostProcessor {
*/
void postProcessFactory(final ConfigurableInstanceFactory factory);
-/**
- * Gets the list of registered post processor services and sorts them
using {@link OrderedComparator}.
- *
- * @return list of post processor services
- */
-static List getPostProcessors() {
-final List services =
ServiceRegistry.getInstance()
-.getServices(ConfigurableInstanceFactoryPostProcessor.class,
MethodHandles.lookup(), null);
-
services.sort(Comparator.comparing(ConfigurableInstanceFactoryPostProcessor::getClass,
OrderedComparator.INSTANCE));
-return services;
-}
}
(logging-log4j2) branch main updated: Fix `FileOutputTest` on Windows
This is an automated email from the ASF dual-hosted git repository.
pkarwasz 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 def47a8f82 Fix `FileOutputTest` on Windows
def47a8f82 is described below
commit def47a8f828cc8d9e5029066ff46aa3ed537da28
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 20:50:43 2023 +0100
Fix `FileOutputTest` on Windows
---
.../logging/log4j/core/config/FileOutputTest.java | 24 +++
.../logging/log4j/core/config/FileOutputTest.xml} | 34 ++
2 files changed, 14 insertions(+), 44 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
index 6f479d72b2..75bcdd51ce 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
@@ -16,30 +16,28 @@
*/
package org.apache.logging.log4j.core.config;
-
import java.io.IOException;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.test.junit.CleanUpFiles;
+import org.apache.logging.log4j.test.junit.TempLoggingDir;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.condition.OS.WINDOWS;
+import static org.assertj.core.api.Assertions.assertThat;
-@DisabledOnOs(WINDOWS) // FIXME: Fix status logger to close files so this will
pass on windows.
-@CleanUpFiles({"target/status.log", "target/test.log"})
+/**
+ * Tests the possibility to redirect status logger output to a file.
+ */
public class FileOutputTest {
+@TempLoggingDir
+private static Path loggingPath;
+
@Test
-@LoggerContextSource("classpath:log4j-filetest.xml")
+@LoggerContextSource
public void testConfig() throws IOException {
-final Path logFile = Paths.get("target", "status.log");
-assertTrue(Files.exists(logFile), "Status output file does not exist");
-assertTrue(Files.size(logFile) > 0, "File is empty");
+final Path logFile = loggingPath.resolve("status.log");
+assertThat(logFile).exists().isNotEmptyFile();
}
}
diff --git a/log4j-core-test/src/test/resources/log4j-filetest.xml
b/log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
similarity index 50%
rename from log4j-core-test/src/test/resources/log4j-filetest.xml
rename to
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
index 249a010451..09ba189b53 100644
--- a/log4j-core-test/src/test/resources/log4j-filetest.xml
+++
b/log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
@@ -15,41 +15,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-
-target/test.log
-
-
-
+
-
-
-
-
-
-%d %p %C{1.} [%t] %m%n
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
(logging-log4j2) branch 2.x updated: Fix `FileOutputTest` on Windows
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 7d459898eb Fix `FileOutputTest` on Windows
7d459898eb is described below
commit 7d459898eb8ea2e695684e70fdcd8ef445d72b72
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 20:50:43 2023 +0100
Fix `FileOutputTest` on Windows
---
.../logging/log4j/core/config/FileOutputTest.java | 20 +++--
.../logging/log4j/core/config/FileOutputTest.xml} | 34 ++
2 files changed, 14 insertions(+), 40 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
index c7fea212e1..75bcdd51ce 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java
@@ -17,25 +17,27 @@
package org.apache.logging.log4j.core.config;
import java.io.IOException;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.test.junit.CleanUpFiles;
+import org.apache.logging.log4j.test.junit.TempLoggingDir;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
-@CleanUpFiles("target/test.log") // File name MUST match the one in
log4j-filetest.xml.
+/**
+ * Tests the possibility to redirect status logger output to a file.
+ */
public class FileOutputTest {
+@TempLoggingDir
+private static Path loggingPath;
+
@Test
-@LoggerContextSource(value="classpath:log4j-filetest.xml")
+@LoggerContextSource
public void testConfig() throws IOException {
-final Path logFile = Paths.get("target", "status.log");
-assertTrue(Files.exists(logFile), "Status output file does not exist");
-assertTrue(Files.size(logFile) > 0, "File is empty");
+final Path logFile = loggingPath.resolve("status.log");
+assertThat(logFile).exists().isNotEmptyFile();
}
}
diff --git a/log4j-core-test/src/test/resources/log4j-filetest.xml
b/log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
similarity index 50%
rename from log4j-core-test/src/test/resources/log4j-filetest.xml
rename to
log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
index 249a010451..09ba189b53 100644
--- a/log4j-core-test/src/test/resources/log4j-filetest.xml
+++
b/log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml
@@ -15,41 +15,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
-
-target/test.log
-
-
-
+
-
-
-
-
-
-%d %p %C{1.} [%t] %m%n
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
(logging-log4j2) branch dependabot/maven/2.x/de.flapdoodle.reverse-de.flapdoodle.reverse-1.7.0 deleted (was 1f5adfb802)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/de.flapdoodle.reverse-de.flapdoodle.reverse-1.7.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 1f5adfb802 Bump de.flapdoodle.reverse:de.flapdoodle.reverse from 1.6.0 to 1.7.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-log4j2) branch 2.x updated: Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` (#1965)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/2.x by this push: new 992db8ba84 Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` (#1965) 992db8ba84 is described below commit 992db8ba848023953fe10234f0fed513f9ff7553 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 19:03:26 2023 + Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` (#1965) --- log4j-parent/pom.xml | 2 +- .../.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml | 8 src/site/_release-notes/_2.x.x.adoc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index b53f905ee1..88713e0cb8 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -84,7 +84,7 @@ 0.9.0 7.0.5 4.9.0 -1.6.0 +1.7.0 1.11.0 3.0.19 32.1.3-jre diff --git a/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml b/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml new file mode 100644 index 00..17145ccdd1 --- /dev/null +++ b/src/changelog/.2.x.x/update_de_flapdoodle_reverse_de_flapdoodle_reverse.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-log4j2/pull/1965"/> + Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` + diff --git a/src/site/_release-notes/_2.x.x.adoc b/src/site/_release-notes/_2.x.x.adoc index 6cae05e635..f9edde47b7 100644 --- a/src/site/_release-notes/_2.x.x.adoc +++ b/src/site/_release-notes/_2.x.x.adoc @@ -55,6 +55,7 @@ The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, `log4j * Update `com.google.guava:guava` to version `32.1.3-jre` (https://github.com/apache/logging-log4j2/pull/1875[1875]) * Update `com.h2database:h2` to version `2.2.224` (https://github.com/apache/logging-log4j2/pull/1880[1880]) * Update `de.flapdoodle.embed:de.flapdoodle.embed.mongo` to version `4.9.0` (https://github.com/apache/logging-log4j2/pull/1945[1945]) +* Update `de.flapdoodle.reverse:de.flapdoodle.reverse` to version `1.7.0` (https://github.com/apache/logging-log4j2/pull/1965[1965]) * Update `io.netty:netty-bom` to version `4.1.101.Final` (https://github.com/apache/logging-log4j2/pull/1960[1960]) * Update `net.bytebuddy:byte-buddy` to version `1.14.9` (https://github.com/apache/logging-log4j2/pull/1891[1891]) * Update `org.eclipse.persistence:org.eclipse.persistence.jpa` to version `2.7.13` (https://github.com/apache/logging-log4j2/pull/1900[1900])
(logging-log4j2) branch 2.x updated: Update `co.elastic.clients:elasticsearch-java` to version `8.11.0` (#1953)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git The following commit(s) were added to refs/heads/2.x by this push: new 558da40fe9 Update `co.elastic.clients:elasticsearch-java` to version `8.11.0` (#1953) 558da40fe9 is described below commit 558da40fe93cc9f5ba727aff0c3181cc0430b60d Author: ASF Logging Services RM AuthorDate: Mon Nov 13 19:00:55 2023 + Update `co.elastic.clients:elasticsearch-java` to version `8.11.0` (#1953) --- log4j-parent/pom.xml | 2 +- .../update_co_elastic_clients_elasticsearch_java.xml | 8 src/site/_release-notes/_2.0-beta4.adoc| 4 ++-- src/site/_release-notes/_2.14.0.adoc | 2 +- src/site/_release-notes/_2.14.1.adoc | 18 +- src/site/_release-notes/_2.15.0.adoc | 2 +- src/site/_release-notes/_2.17.2.adoc | 18 +- src/site/_release-notes/_2.21.0.adoc | 2 +- src/site/_release-notes/_2.x.x.adoc| 1 + 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index 053de842da..b53f905ee1 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -80,7 +80,7 @@ 1.2.15 3.4.4 -8.10.4 +8.11.0 0.9.0 7.0.5 4.9.0 diff --git a/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml b/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml new file mode 100644 index 00..d7dbfcc87e --- /dev/null +++ b/src/changelog/.2.x.x/update_co_elastic_clients_elasticsearch_java.xml @@ -0,0 +1,8 @@ + +http://www.w3.org/2001/XMLSchema-instance; + xmlns="http://logging.apache.org/log4j/changelog; + xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; + type="changed"> + https://github.com/apache/logging-log4j2/pull/1953"/> + Update `co.elastic.clients:elasticsearch-java` to version `8.11.0` + diff --git a/src/site/_release-notes/_2.0-beta4.adoc b/src/site/_release-notes/_2.0-beta4.adoc index ccb794cf06..66f4148b72 100644 --- a/src/site/_release-notes/_2.0-beta4.adoc +++ b/src/site/_release-notes/_2.0-beta4.adoc @@ -41,10 +41,10 @@ Release date:: 2013-01-28 === Added +* Add MessageFormatMessage and FormattedMessage. * Added Flume Appender samples. -* Added hostName and contextName to property map. * Added Log4j 2 to SLF4J adapter. -* Add MessageFormatMessage and FormattedMessage. +* Added hostName and contextName to property map. * Add SMTPAppender. (https://issues.apache.org/jira/browse/LOG4J2-131[LOG4J2-131]) * Allow custom message creation via a message factory. (https://issues.apache.org/jira/browse/LOG4J2-133[LOG4J2-133]) * Use %red, %white, %blue, and so on in the console appender. (https://issues.apache.org/jira/browse/LOG4J2-134[LOG4J2-134]) diff --git a/src/site/_release-notes/_2.14.0.adoc b/src/site/_release-notes/_2.14.0.adoc index 72e0b7ae5a..9a9a316035 100644 --- a/src/site/_release-notes/_2.14.0.adoc +++ b/src/site/_release-notes/_2.14.0.adoc @@ -67,10 +67,10 @@ For complete information on Apache Log4j 2, including instructions on how to sub * Add date pattern support for HTML layout. (https://issues.apache.org/jira/browse/LOG4J2-2889[LOG4J2-2889]) * Allow GelfLayout to produce newline delimited events. (https://issues.apache.org/jira/browse/LOG4J2-2892[LOG4J2-2892]) +* Update MongoDB tests to require Java 8 unconditionally now that Log4j requires Java 8. * Update com.fasterxml.jackson.* 2.10.2 -> 2.11.0. * Update jackson 2.11.0 -> 2.11.2. * Update mongodb3.version from 3.12.1 to 3.12.6. -* Update MongoDB tests to require Java 8 unconditionally now that Log4j requires Java 8. * Update org.apache.activemq:activemq-broker 5.15.11 -> 5.16.0. * Update org.apache.commons:commons-compress 1.19 -> 1.20. * Update org.apache.commons:commons-csv 1.7 -> 1.8. diff --git a/src/site/_release-notes/_2.14.1.adoc b/src/site/_release-notes/_2.14.1.adoc index b0dd873f4c..9d344dfd92 100644 --- a/src/site/_release-notes/_2.14.1.adoc +++ b/src/site/_release-notes/_2.14.1.adoc @@ -63,17 +63,20 @@ For complete information on Apache Log4j 2, including instructions on how to sub * Allow reconfiguration when Log4j 1 configuration files are updated. (https://issues.apache.org/jira/browse/LOG4J2-2893[LOG4J2-2893]) * Add Rollover Listener to aid in unit test validation. (https://issues.apache.org/jira/browse/LOG4J2-2923[LOG4J2-2923]) * Replace outdated PatternLayout.createLayout() calls in docs with createDefaultLayout(). (https://issues.apache.org/jira/browse/LOG4J2-2977[LOG4J2-2977]) +* Update JSON Unit 2.21.0 -> 2.22.0. +* Update JaCoCo 0.8.3 -> 0.8.6. +* Update Mockito 3.6.0 -> 3.7.0. +* Update MongoDB 3 plugin:
(logging-log4j2) branch dependabot/maven/2.x/co.elastic.clients-elasticsearch-java-8.11.0 deleted (was 5842c692f5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/co.elastic.clients-elasticsearch-java-8.11.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 5842c692f5 Bump co.elastic.clients:elasticsearch-java from 8.10.4 to 8.11.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-log4j2) branch main updated: Fix Javadoc inheritDoc tags
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 de9dd4a639 Fix Javadoc inheritDoc tags
de9dd4a639 is described below
commit de9dd4a6397b52d4516926519a294565c004228a
Author: Gary Gregory
AuthorDate: Mon Nov 13 11:57:55 2023 -0500
Fix Javadoc inheritDoc tags
---
log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java | 6 +++---
.../src/test/java/org/apache/log4j/helpers/DateLayoutTest.java| 8
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
index 87676a070c..09f626e02e 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
@@ -30,20 +30,20 @@ public class LayoutTest extends TestCase {
*/
private static final class MockLayout extends Layout {
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public void activateOptions() {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public String format(final LoggingEvent event) {
return "Mock";
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public boolean ignoresThrowable() {
return true;
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
index 46c5bc9825..07b90752d4 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
@@ -54,7 +54,7 @@ public class DateLayoutTest extends LayoutTest {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
protected Layout createLayout() {
return new MockLayout();
@@ -264,20 +264,20 @@ public class DateLayoutTest extends LayoutTest {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public String format(final LoggingEvent event) {
return "Mock";
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public void activateOptions() {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public boolean ignoresThrowable() {
return true;
(logging-log4j2) branch 2.x updated: Fix Javadoc inheritDoc tags
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 4c53356bc0 Fix Javadoc inheritDoc tags
4c53356bc0 is described below
commit 4c53356bc08a81d374eca42adcfea67aa5384f1e
Author: Gary Gregory
AuthorDate: Mon Nov 13 11:30:28 2023 -0500
Fix Javadoc inheritDoc tags
Plus, whatever spotless complained about through through spotless:apply
---
.../src/test/java/org/apache/log4j/LayoutTest.java | 6 +++---
.../java/org/apache/log4j/helpers/DateLayoutTest.java | 8
.../org/apache/logging/log4j/core/StringLayout.java| 2 +-
.../db/jdbc/AbstractDriverManagerConnectionSource.java | 2 +-
src/changelog/.2.x.x/fix_javadoc_inheritdoc.xml| 7 +++
src/site/_release-notes/_2.0-beta4.adoc| 4 ++--
src/site/_release-notes/_2.14.0.adoc | 2 +-
src/site/_release-notes/_2.14.1.adoc | 18 +-
src/site/_release-notes/_2.15.0.adoc | 2 +-
src/site/_release-notes/_2.17.2.adoc | 18 +-
src/site/_release-notes/_2.21.0.adoc | 2 +-
src/site/_release-notes/_2.x.x.adoc| 1 +
12 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
index 87676a070c..09f626e02e 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/LayoutTest.java
@@ -30,20 +30,20 @@ public class LayoutTest extends TestCase {
*/
private static final class MockLayout extends Layout {
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public void activateOptions() {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public String format(final LoggingEvent event) {
return "Mock";
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public boolean ignoresThrowable() {
return true;
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
index 46c5bc9825..07b90752d4 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/helpers/DateLayoutTest.java
@@ -54,7 +54,7 @@ public class DateLayoutTest extends LayoutTest {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
protected Layout createLayout() {
return new MockLayout();
@@ -264,20 +264,20 @@ public class DateLayoutTest extends LayoutTest {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public String format(final LoggingEvent event) {
return "Mock";
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public void activateOptions() {
}
/**
- * @{inheritDoc}
+ * {@inheritDoc}
*/
public boolean ignoresThrowable() {
return true;
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
index fe654ad275..ce6497d90d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core;
import java.nio.charset.Charset;
/**
- * Instantiates the @{link Layout} type for String-based layouts.
+ * Instantiates the {@link Layout} type for String-based layouts.
*/
public interface StringLayout extends Layout {
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
index e36f8566d7..48419c0f28 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
@@ -155,7 +155,7 @@ public class AbstractDriverManagerConnectionSource extends
AbstractConnectionSou
} else {
connection = DriverManager.getConnection(actualConnectionString,
toString(userName), toString(password));
}
-LOGGER.debug("{} acquired connection for '{}': {} ({}@{})",
getClass().getSimpleName(), actualConnectionString,
+
(logging-log4j-site) branch asf-staging updated (44b907c22 -> 0cd6e9d5a)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-log4j-site.git from 44b907c22 Remove TARs from download page (#1959) add 0cd6e9d5a Add `log4j-tools` version `0.6.0` site No new revisions were added by this update. Summary of changes: tools/0.x/index.html | 119 +++ 1 file changed, 102 insertions(+), 17 deletions(-)
(logging-log4j2) branch main updated: Fix formatter of `StatusLoggerExtension`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz 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 2aaf5ad46e Fix formatter of `StatusLoggerExtension`
2aaf5ad46e is described below
commit 2aaf5ad46e35d47090e750941b20930f68683cb9
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 14:58:04 2023 +0100
Fix formatter of `StatusLoggerExtension`
---
.../org/apache/logging/log4j/test/junit/StatusLoggerExtension.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
index 761c9740b1..7a46551e0e 100644
---
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
+++
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.test.junit;
import java.io.IOException;
import java.time.Instant;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -135,13 +136,12 @@ class StatusLoggerExtension extends
TypeBasedParameterResolver {
logger.atLevel(data.getLevel())
.withThrowable(data.getThrowable())
.withLocation(data.getStackTraceElement())
-.log("{} {}",
-
DateTimeFormatter.ISO_LOCAL_TIME.format(Instant.ofEpochMilli(data.getTimestamp())),
-data.getMessage());
+.log("{} {}",
formatter.format(Instant.ofEpochMilli(data.getTimestamp())), data.getMessage());
});
}
}
(logging-log4j2) branch 2.x updated: Fix formatter of `StatusLoggerExtension`
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 27ea08dc95 Fix formatter of `StatusLoggerExtension`
27ea08dc95 is described below
commit 27ea08dc955fb58efbc86eee351336a536962196
Author: Piotr P. Karwasz
AuthorDate: Mon Nov 13 14:58:04 2023 +0100
Fix formatter of `StatusLoggerExtension`
---
.../org/apache/logging/log4j/test/junit/StatusLoggerExtension.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
index 02df4dc9f0..2c84fe9dd0 100644
---
a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
+++
b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/StatusLoggerExtension.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.test.junit;
import java.io.IOException;
import java.time.Instant;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -141,13 +142,12 @@ class StatusLoggerExtension extends
TypeBasedParameterResolver {
logger.atLevel(data.getLevel())
.withThrowable(data.getThrowable())
.withLocation(data.getStackTraceElement())
-.log("{} {}",
-
DateTimeFormatter.ISO_LOCAL_TIME.format(Instant.ofEpochMilli(data.getTimestamp())),
-data.getMessage());
+.log("{} {}",
formatter.format(Instant.ofEpochMilli(data.getTimestamp())), data.getMessage());
});
}
}
svn commit: r65252 - /dev/logging/log4j-tools/
Author: svc_dist_logging Date: Mon Nov 13 11:25:12 2023 New Revision: 65252 Log: Added `apache-log4j-tools` artifacts for release `0.6.0` Added: dev/logging/log4j-tools/ dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.asc dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.sha512 dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-announce.txt dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-vote.txt dev/logging/log4j-tools/apache-log4j-tools-0.6.0-site.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.6.0-src.zip (with props) dev/logging/log4j-tools/apache-log4j-tools-0.6.0-src.zip.asc dev/logging/log4j-tools/apache-log4j-tools-0.6.0-src.zip.sha512 Added: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip == Binary file - no diff available. Propchange: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.asc == --- dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.asc (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.asc Mon Nov 13 11:25:12 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmVSB5YACgkQVuc7qaC1 +ktDYzA//fLXrNsvoUSVruWWWyCQpQQ5u6tfQON9ItD0s/KxmK1v8xtP3UU96HZk2 +lTsiJfZIlbSJDrPPNdsMb6GZQo5pzro9GeWVQYsYbZC+PYc5sR5+h1Vl+zOCkzgD +0Dx5RASV7wEnW5lEJ1z9eEt5vz4MNgE0CiFzEOMTe3oKxfn5cspwhUCudUVlm6U3 +vxsj834FZJ3pRgNBER5Zca8NDmr1J7XpTHvwIV6EbOidjxq/VS2rcRgGUOul9Rmm +7ggazbQ8pdMaW1tn3YEWsk38wpB9C6vLs+2/KPfOZ77pMLAbBqk+h7LUnD+zyGdK +05TDfaq/fPy2Kcbloin4WU7NrsHXwgr1TaRDHA+AEOGlQr3BEyaKoZ90GOGqaymd +B1uixGIu2JyEDZZqpuYDTqKUAypN1F1zh9ruqfM15vshbP+ThNWCBxMLl4zscZfu +suk2MGnPlP6AQ92Dfeu0ncUVUKvvigKx8U7jrq6HOiDyZrQMzZuDEKDjedIUdd9Y +3QJo1CmqexpGA1OftwXYIGjq7dExdzvEfudirgr0NPLNzpZkx8dvfD5HcZFT9WO9 +M05r5a9UiJW1+EONmPcct7UT14RKSezT5+czn5j8QQ6Rvf1GIza7P4U+0+nXshcM +qlh7bitc8bcfEYU7WSvGe5nufsn1yCiYqZx/mX7rRkQXQYPOWw4= +=+1An +-END PGP SIGNATURE- Added: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.sha512 == --- dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.sha512 (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.6.0-bin.zip.sha512 Mon Nov 13 11:25:12 2023 @@ -0,0 +1 @@ +dc5951d832e08e5411e6c7417ed3afec7bf7634f12fcde3240e647235858911f2319c965936d98cae522577e916bc8873348d6474306c137b887c247aabc apache-log4j-tools-0.6.0-bin.zip Added: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-announce.txt == --- dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-announce.txt (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-announce.txt Mon Nov 13 11:25:12 2023 @@ -0,0 +1,26 @@ +To: log4j-u...@logging.apache.org, d...@logging.apache.org +Title: [ANNOUNCE] Apache Log4j Tools 0.6.0 released + +Apache Log4j Tools team is pleased to announce the 0.6.0 +release. This project provides tooling internally used by the +Apache Log4j project. For further information (support, download, +etc.) see the project website[1]. + +[1] https://logging.apache.org/log4j/tools + +=== Release Notes + +This minor release contains various bug fixes and improvements. + + + Added + +* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.3.0` + + Changed + +* Update `org.apache.logging:logging-parent` to version `10.3.0` + + Fixed + +* `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.3.0` update. Added: dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-vote.txt == --- dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-vote.txt (added) +++ dev/logging/log4j-tools/apache-log4j-tools-0.6.0-email-vote.txt Mon Nov 13 11:25:12 2023 @@ -0,0 +1,39 @@ +To: d...@logging.apache.org +Title: [VOTE] Release Apache Log4j Tools 0.6.0 + +This is a vote to release the Apache Log4j Tools 0.6.0. + +Website: https://logging.staged.apache.org/log4j/tools +GitHub: https://github.com/apache/logging-log4j-tools +Commit: c9e2da889c56f0f9fefe6bc8b19d0a77539fb2b5 +Distribution: https://dist.apache.org/repos/dist/dev/logging/log4j-tools +Nexus: https://repository.apache.org/content/repositories/orgapachelogging-1113 +Signing key: 0x077e8893a6dcc33dd4a4d5b256e73ba9a0b592d0 + +Please download, test, and cast your votes on this mailing list. + +[ ] +1, release
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new c9e2da8 Update the `project.build.outputTimestamp` property c9e2da8 is described below commit c9e2da889c56f0f9fefe6bc8b19d0a77539fb2b5 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 11:23:22 2023 + 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 b688d0e..5b38596 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T10:54:49Z + 2023-11-13T11:18:01Z true
(logging-parent) branch main updated: Revert troubleshooting aid
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main by this push: new 7e446a1 Revert troubleshooting aid 7e446a1 is described below commit 7e446a1f6478a3be6c926afed25bcd44521fc1b4 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 12:19:26 2023 +0100 Revert troubleshooting aid --- .github/workflows/deploy-release-reusable.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml index 292c7ab..b23d965 100644 --- a/.github/workflows/deploy-release-reusable.yaml +++ b/.github/workflows/deploy-release-reusable.yaml @@ -220,9 +220,6 @@ jobs: shell: bash run: | - # Troubleshooting `log4j-tools` distribution issue - find . -type f -not -regex '.*\.git/.*' - # Generate the distribution (i.e., `src.zip` and optional `bin.zip`) ./mvnw \ --show-version --batch-mode --errors --no-transfer-progress \
(logging-log4j-tools) branch release/0.6.0 updated: Hopefully last attachment filepath pattern tuning
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new 8792c6e Hopefully last attachment filepath pattern tuning
8792c6e is described below
commit 8792c6e8897c4eacc27ceb7d709113a34164a2c2
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 12:17:39 2023 +0100
Hopefully last attachment filepath pattern tuning
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f8b1907..8c56ce1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
+ ^.*/log4j-(.+)-${PROJECT_VERSION}(\\.jar|-cyclonedx\\.xml)$
(logging-log4j-tools) branch main updated: Hopefully last attachment filepath pattern tuning
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 7ee040d Hopefully last attachment filepath pattern tuning
7ee040d is described below
commit 7ee040d5adc6e434f04e34ade8cc8b748b0d2717
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 12:17:39 2023 +0100
Hopefully last attachment filepath pattern tuning
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f8b1907..8c56ce1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
+ ^.*/log4j-(.+)-${PROJECT_VERSION}(\\.jar|-cyclonedx\\.xml)$
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new be670ff Update the `project.build.outputTimestamp` property be670ff is described below commit be670fff49243f5f650cb464124fd196d7942885 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 10:57:24 2023 + 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 75cbd37..b688d0e 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T10:49:07Z + 2023-11-13T10:54:49Z true
(logging-log4j-tools) branch release/0.6.0 updated: One more attachment filepath pattern tuning
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new 77b3a0f One more attachment filepath pattern tuning
77b3a0f is described below
commit 77b3a0f445319f9232a7bb3a1543ce95eccff372
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:54:17 2023 +0100
One more attachment filepath pattern tuning
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b94505c..f8b1907 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
+ '^.*/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
(logging-log4j-tools) branch main updated: One more attachment filepath pattern tuning
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new d49b755 One more attachment filepath pattern tuning
d49b755 is described below
commit d49b755e77d32addc01b8af11cf4294b7681010c
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:54:17 2023 +0100
One more attachment filepath pattern tuning
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b94505c..f8b1907 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
+ '^.*/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new 2155d81 Update the `project.build.outputTimestamp` property 2155d81 is described below commit 2155d81b2ff0c6a04560031305b9370b5a2cb822 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 10:51:24 2023 + 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 90643a4..75cbd37 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T10:10:53Z + 2023-11-13T10:49:07Z true
(logging-log4j2) branch dependabot/maven/2.x/de.flapdoodle.reverse-de.flapdoodle.reverse-1.7.0 created (now 1f5adfb802)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/2.x/de.flapdoodle.reverse-de.flapdoodle.reverse-1.7.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git at 1f5adfb802 Bump de.flapdoodle.reverse:de.flapdoodle.reverse from 1.6.0 to 1.7.0 No new revisions were added by this update.
(logging-log4j-tools) branch main updated: Relax attachment filepath pattern in CI
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 7ee7595 Relax attachment filepath pattern in CI
7ee7595 is described below
commit 7ee75950656123d3e26464ee5c934f3fbd479370
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:48:37 2023 +0100
Relax attachment filepath pattern in CI
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fabb067..b94505c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'\\.jar$'
+ '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
(logging-log4j-tools) branch release/0.6.0 updated: Relax attachment filepath pattern in CI
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new 193daeb Relax attachment filepath pattern in CI
193daeb is described below
commit 193daeb6c0c3473a5a67dfbc00351b66b1716d82
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:48:37 2023 +0100
Relax attachment filepath pattern in CI
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fabb067..b94505c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'\\.jar$'
+ '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'.jar$'
(logging-log4j-tools) branch release/0.6.0 updated (c9a673c -> 81203ef)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git discard c9a673c Update the `project.build.outputTimestamp` property new 81203ef Update the `project.build.outputTimestamp` property 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 (c9a673c) \ N -- N -- N refs/heads/release/0.6.0 (81203ef) 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:
(logging-log4j-tools) 01/01: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git commit 81203efc2f6c9ad49f2367e1752b6b434075cccb Author: ASF Logging Services RM AuthorDate: Mon Nov 13 10:31:33 2023 + 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 8c928e7..90643a4 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T09:56:17Z + 2023-11-13T10:10:53Z true
(logging-parent) branch main updated: Troubleshoot `log4j-tools` issue
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git The following commit(s) were added to refs/heads/main by this push: new c7772f3 Troubleshoot `log4j-tools` issue c7772f3 is described below commit c7772f3df0ce536d6bd1df0dedfbadf23f3a584b Author: Volkan Yazıcı AuthorDate: Mon Nov 13 11:28:45 2023 +0100 Troubleshoot `log4j-tools` issue --- .github/workflows/deploy-release-reusable.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml index b23d965..292c7ab 100644 --- a/.github/workflows/deploy-release-reusable.yaml +++ b/.github/workflows/deploy-release-reusable.yaml @@ -220,6 +220,9 @@ jobs: shell: bash run: | + # Troubleshooting `log4j-tools` distribution issue + find . -type f -not -regex '.*\.git/.*' + # Generate the distribution (i.e., `src.zip` and optional `bin.zip`) ./mvnw \ --show-version --batch-mode --errors --no-transfer-progress \
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new c9a673c Update the `project.build.outputTimestamp` property c9a673c is described below commit c9a673ca35832cb591e7e77ceedd840a4d4191a1 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 10:14:49 2023 + 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 8c928e7..90643a4 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T09:56:17Z + 2023-11-13T10:10:53Z true
(logging-log4j-tools) branch release/0.6.0 updated: Fix CI attachment pattern
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new 15e82db Fix CI attachment pattern
15e82db is described below
commit 15e82db0a36736f78b990593b20a5fe4f7dd17e7
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:09:01 2023 +0100
Fix CI attachment pattern
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 44faf4e..fabb067 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
- '^.*/target/log4j-tools-(.+)-'${PROJECT_VERSION}'\\.jar$'
+ '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'\\.jar$'
(logging-log4j-tools) branch main updated: Fix CI attachment pattern
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 588724a Fix CI attachment pattern
588724a is described below
commit 588724a49197325c1379f0a82aed0bb8daa2945b
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 11:09:01 2023 +0100
Fix CI attachment pattern
---
.github/workflows/build.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 07c84f6..fabb067 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,4 +71,4 @@ jobs:
# TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
distribution-attachment-count: 2
distribution-attachment-filepath-pattern: |-
-'^.*/target/log4j-tools-(.+)-'${PROJECT_VERSION}'\\.jar$'
+ '^.*/target/log4j-(.+)-'${PROJECT_VERSION}'\\.jar$'
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new edab382 Update the `project.build.outputTimestamp` property edab382 is described below commit edab382cb6ef7cea1baf569b97ae4363e02bf140 Author: ASF Logging Services RM AuthorDate: Mon Nov 13 09:59:51 2023 + 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 d7a82d3..8c928e7 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T09:05:53Z + 2023-11-13T09:56:17Z true
(logging-log4j-tools) branch release/0.6.0 updated: Workaround `logging-parent` issue in CI
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new f08642a Workaround `logging-parent` issue in CI
f08642a is described below
commit f08642ade17eb7b989d110c0b19611e868b13c79
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 10:54:13 2023 +0100
Workaround `logging-parent` issue in CI
---
.github/workflows/build.yaml | 4
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6f09693..44faf4e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -68,3 +68,7 @@ jobs:
with:
project-id: log4j-tools
site-enabled: true
+ # TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
+ distribution-attachment-count: 2
+ distribution-attachment-filepath-pattern: |-
+ '^.*/target/log4j-tools-(.+)-'${PROJECT_VERSION}'\\.jar$'
(logging-log4j-tools) branch main updated: Remove the redundant `distribution-attachment-count` CI argument
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/main by this push:
new f9be6ae Remove the redundant `distribution-attachment-count` CI
argument
f9be6ae is described below
commit f9be6aede6c1bbb2e2f3e3f4b5dfc277105dc908
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 09:57:18 2023 +0100
Remove the redundant `distribution-attachment-count` CI argument
---
.github/workflows/build.yaml | 4
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6f09693..07c84f6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -68,3 +68,7 @@ jobs:
with:
project-id: log4j-tools
site-enabled: true
+ # TODO Remove `distribution-attachment-*` arguments after
`logging-parent` version `10.4.0` release
+ distribution-attachment-count: 2
+ distribution-attachment-filepath-pattern: |-
+'^.*/target/log4j-tools-(.+)-'${PROJECT_VERSION}'\\.jar$'
(logging-parent) branch main updated: Increase directory scanning depth from 8 to 32 in the distribution BeanShell script
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 1a5bdd6 Increase directory scanning depth from 8 to 32 in the
distribution BeanShell script
1a5bdd6 is described below
commit 1a5bdd66997e27b8c6c68fd6b737d69f2a47
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 10:49:31 2023 +0100
Increase directory scanning depth from 8 to 32 in the distribution
BeanShell script
This is breaking the `log4j-tools` version `0.6.0` release and will
highly likely break other projects with deep nested folders.
---
pom.xml| 2 +-
src/changelog/.10.x.x/increase-file-walk-depth.xml | 7 +++
src/site/_constants.adoc | 2 +-
src/site/_release-notes/_10.x.x.adoc | 2 ++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f72513..26093c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1254,7 +1254,7 @@ import org.apache.commons.codec.digest.*;
String attachmentFilepathPattern =
"${attachmentFilepathPattern}";
System.out.format("Locating attachments matching the
provided pattern: `%s`%n", new Object[] {attachmentFilepathPattern});
SortedMap attachmentPathByFile = new TreeMap();
-Stream paths = Files.walk(new
File(repoDirectoryParent).toPath(), 8, /* required for BSH method resolution:
*/ new FileVisitOption[0]);
+Stream paths = Files.walk(new
File(repoDirectoryParent).toPath(), 32, /* required for BSH method resolution:
*/ new FileVisitOption[0]);
try {
paths.forEach(new Consumer() {
public void accept(Path path) {
diff --git a/src/changelog/.10.x.x/increase-file-walk-depth.xml
b/src/changelog/.10.x.x/increase-file-walk-depth.xml
new file mode 100644
index 000..8a65bf4
--- /dev/null
+++ b/src/changelog/.10.x.x/increase-file-walk-depth.xml
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2001/XMLSchema-instance;
+ xmlns="http://logging.apache.org/log4j/changelog;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ type="changed">
+ Increase directory scanning depth from 8 to
32 in the distribution BeanShell script
+
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index e3f1690..9c0ee1c 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
:project-github-url: https://github.com/apache/logging-parent
-:project-version: 10.3.0
+:project-version: 10.4.0-SNAPSHOT
:project-name: Logging Parent
:project-id: logging-parent
:java-target-version: 8
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 9b2b42d..aa4cecd 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -43,10 +43,12 @@ This minor release contains several small improvements.
Added
+* Add deterministic Palantir Java formatter
* Add XSLT transformation step to add a deterministic `serialNumber` and VDR
links to the SBOM
Changed
+* Increase directory scanning depth from 8 to 32 in the distribution BeanShell
script
* Update `com.github.spotbugs:spotbugs-annotations` to version `4.8.1`
(https://github.com/apache/logging-parent/pull/58[58])
* Update `com.github.spotbugs:spotbugs-maven-plugin` to version `4.8.1.0`
(https://github.com/apache/logging-parent/pull/57[57])
* Update `org.apache.maven.plugins:maven-artifact-plugin` to version `3.5.0`
(logging-site) branch activity-monitor updated: added some styling, extracted js to it's own file
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a commit to branch activity-monitor
in repository https://gitbox.apache.org/repos/asf/logging-site.git
The following commit(s) were added to refs/heads/activity-monitor by this push:
new 10592b09 added some styling, extracted js to it's own file
10592b09 is described below
commit 10592b09d71576eb7ffa18932157a61498e3a09d
Author: Christian Grobmeier
AuthorDate: Mon Nov 13 10:15:35 2023 +0100
added some styling, extracted js to it's own file
---
css/bootstrap.min.css | 689 +
index.html | 322 +
index.html => show-data.js | 73 +
3 files changed, 765 insertions(+), 319 deletions(-)
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
new file mode 100644
index ..c9514677
--- /dev/null
+++ b/css/bootstrap.min.css
@@ -0,0 +1,689 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted #333;outline:5px auto
-webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;}
+.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}
+body{margin:0;font-family:"Helvetica
Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#33;background-color:#ff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.container,.navbar-fixed-top .container,.navbar-fixed-bottom
.container{width:940px;}
+.span12{width:940px;}
+.span11{width:860px;}
+.span10{width:780px;}
+.span9{width:700px;}
+.span8{width:620px;}
+.span7{width:540px;}
+.span6{width:460px;}
+.span5{width:380px;}
+.span4{width:300px;}
+.span3{width:220px;}
+.span2{width:140px;}
+.span1{width:60px;}
+.offset12{margin-left:980px;}
+.offset11{margin-left:900px;}
+.offset10{margin-left:820px;}
+.offset9{margin-left:740px;}
+.offset8{margin-left:660px;}
+.offset7{margin-left:580px;}
+.offset6{margin-left:500px;}
+.offset5{margin-left:420px;}
+.offset4{margin-left:340px;}
+.offset3{margin-left:260px;}
+.offset2{margin-left:180px;}
+.offset1{margin-left:100px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";}
+.row-fluid:after{clear:both;}
+.row-fluid>[class*="span"]{float:left;margin-left:2.127659574%;}
+.row-fluid>[class*="span"]:first-child{margin-left:0;}
+.row-fluid > .span12{width:99.999899%;}
+.row-fluid > .span11{width:91.489361693%;}
+.row-fluid > .span10{width:82.9787233959%;}
+.row-fluid > .span9{width:74.468085099%;}
+.row-fluid > .span8{width:65.9574468019%;}
+.row-fluid > .span7{width:57.446808505%;}
+.row-fluid > .span6{width:48.9361702079%;}
+.row-fluid > .span5{width:40.425531911%;}
+.row-fluid > .span4{width:31.914893614%;}
+.row-fluid > .span3{width:23.404255317%;}
+.row-fluid > .span2{width:14.89361702%;}
+.row-fluid > .span1{width:6.382978723%;}
+.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;font-family:"Helvetica
Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p
small{font-size:11px;color:#99;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
(logging-log4j-tools) branch release/0.6.0 updated: Update the `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new d4e089f Update the `project.build.outputTimestamp` property d4e089f is described below commit d4e089f51bd8fbbee1c0edfd45e6bf69b762a42e Author: ASF Logging Services RM AuthorDate: Mon Nov 13 09:13:51 2023 + 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 4552842..d7a82d3 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,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*! --> - 2023-11-13T09:04:19Z + 2023-11-13T09:05:53Z true
(logging-parent) branch main updated: Fix regex
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 960c98d Fix regex
960c98d is described below
commit 960c98d525339b7a418b1169ad128c88bbdd0d7e
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 10:11:09 2023 +0100
Fix regex
---
.github/workflows/deploy-release-reusable.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/deploy-release-reusable.yaml
b/.github/workflows/deploy-release-reusable.yaml
index 612e040..b23d965 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -122,7 +122,7 @@ jobs:
shell: bash
run: |
export PROPERTY="project.build.outputTimestamp"
- grep -q '^([\t ]+<'$PROPERTY'>' pom.xml || {
+ grep -qE '^[\t ]+<'$PROPERTY'>' pom.xml || {
echo "Failed to find the \`$PROPERTY\` Maven property!"
exit 1
}
(logging-log4j-tools) branch release/0.6.0 updated: Add the `project.build.outputTimestamp` Maven property
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new 91b1bf7 Add the `project.build.outputTimestamp` Maven property 91b1bf7 is described below commit 91b1bf79192628f5bddfa451425f6ea5045cc07c Author: Volkan Yazıcı AuthorDate: Mon Nov 13 10:04:48 2023 +0100 Add the `project.build.outputTimestamp` Maven property --- pom.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 5b3273c..4552842 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,15 @@ 0.6.0 + + 2023-11-13T09:04:19Z + true true
(logging-log4j-tools) 03/03: Add the `project.build.outputTimestamp` Maven property
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git commit 5c20318f9b237372325b480ffd75d4f0d5bbe49f Author: Volkan Yazıcı AuthorDate: Mon Nov 13 10:04:48 2023 +0100 Add the `project.build.outputTimestamp` Maven property --- pom.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 5b3273c..4552842 100644 --- a/pom.xml +++ b/pom.xml @@ -115,6 +115,15 @@ 0.6.0 + + 2023-11-13T09:04:19Z + true true
(logging-log4j-tools) branch main updated (c2755c1 -> 5c20318)
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-tools.git
from c2755c1 Remove the redundant `distribution-attachment-count` CI
argument
new def6437 Set the version to `0.6.0`
new 1474059 Release changelog for version `0.6.0`
new 5c20318 Add the `project.build.outputTimestamp` Maven property
The 3 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:
pom.xml | 11 ++-
src/changelog/{.0.x.x => 0.6.0}/.release-notes.adoc.ftl | 0
src/changelog/{0.4.0 => 0.6.0}/.release.xml | 2 +-
src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml| 0
src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/update-parent.xml | 0
src/site/_constants.adoc| 2 +-
src/site/_release-notes.adoc| 2 +-
src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc}| 6 +++---
src/site/_release-notes/_0.x.x.adoc | 12
10 files changed, 16 insertions(+), 19 deletions(-)
copy src/changelog/{.0.x.x => 0.6.0}/.release-notes.adoc.ftl (100%)
copy src/changelog/{0.4.0 => 0.6.0}/.release.xml (96%)
rename src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml (100%)
rename src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml (100%)
rename src/changelog/{.0.x.x => 0.6.0}/update-parent.xml (100%)
copy src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} (97%)
(logging-log4j-tools) 01/03: Set the version to `0.6.0`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git commit def6437cd78e759c6af2c1cf1f9b38be1d21d15b Author: Volkan Yazıcı AuthorDate: Mon Nov 13 09:43:32 2023 +0100 Set the version to `0.6.0` --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9cc4fb..5b3273c 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ -0.6.0-SNAPSHOT +0.6.0 true
(logging-log4j-tools) 02/03: Release changelog for version `0.6.0`
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit 1474059749862415712820e4645de4d5b5b1655e
Author: ASF Logging Services RM
AuthorDate: Mon Nov 13 08:46:54 2023 +
Release changelog for version `0.6.0`
---
.../0.6.0/.release-notes.adoc.ftl}| 19 ---
.../{.0.x.x/update-parent.xml => 0.6.0/.release.xml} | 10 --
src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/update-parent.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} | 6 +++---
src/site/_release-notes/_0.x.x.adoc | 12
9 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/src/site/_release-notes/_0.x.x.adoc
b/src/changelog/0.6.0/.release-notes.adoc.ftl
similarity index 83%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/changelog/0.6.0/.release-notes.adoc.ftl
index 6c70f68..8ffd747 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/changelog/0.6.0/.release-notes.adoc.ftl
@@ -33,22 +33,11 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-[#release-notes-0-x-x]
-=== 0.x.x
-
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
+<#if release.date?has_content>Release date:: ${release.date}
This minor release contains various bug fixes and improvements.
-
- Added
-
-* Started generating CycloneDX SBOM with the recent update of `logging-parent`
to version `10.3.0`
-
- Changed
-
-* Update `org.apache.logging:logging-parent` to version `10.3.0`
-
- Fixed
-
-* `log4j-tools-bom` was broken due to removed `parent` during flattening. This
is automatically fixed by the recent `logging-parent` version `10.3.0` update.
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.0.x.x/update-parent.xml
b/src/changelog/0.6.0/.release.xml
similarity index 69%
copy from src/changelog/.0.x.x/update-parent.xml
copy to src/changelog/0.6.0/.release.xml
index ada6ad9..5b4c7e9 100644
--- a/src/changelog/.0.x.x/update-parent.xml
+++ b/src/changelog/0.6.0/.release.xml
@@ -15,9 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-http://www.w3.org/2001/XMLSchema-instance;
- xmlns="http://logging.apache.org/log4j/changelog;
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
- type="changed">
- Update `org.apache.logging:logging-parent` to
version `10.3.0`
-
+http://logging.apache.org/log4j/changelog;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ date="2023-11-13" version="0.6.0"/>
diff --git a/src/changelog/.0.x.x/add-sbom.xml
b/src/changelog/0.6.0/add-sbom.xml
similarity index 100%
rename from src/changelog/.0.x.x/add-sbom.xml
rename to src/changelog/0.6.0/add-sbom.xml
diff --git a/src/changelog/.0.x.x/fix-bom.xml b/src/changelog/0.6.0/fix-bom.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-bom.xml
rename to src/changelog/0.6.0/fix-bom.xml
diff --git a/src/changelog/.0.x.x/update-parent.xml
b/src/changelog/0.6.0/update-parent.xml
similarity index 100%
rename from src/changelog/.0.x.x/update-parent.xml
rename to src/changelog/0.6.0/update-parent.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index f7e9360..0fe2d10 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
:project-github-url: https://github.com/apache/logging-log4j-tools
-:project-version: 0.6.0-SNAPSHOT
+:project-version: 0.6.0
:project-name: Log4j Tools
:project-id: log4j-tools
:java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 33cb92b..3d24771 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::_release-notes/_0.x.x.adoc[]
+include::_release-notes/_0.6.0.adoc[]
include::_release-notes/_0.5.0.adoc[]
include::_release-notes/_0.4.0.adoc[]
include::_release-notes/_0.3.0.adoc[]
diff --git a/src/site/_release-notes/_0.x.x.adoc
b/src/site/_release-notes/_0.6.0.adoc
similarity index 97%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/site/_release-notes/_0.6.0.adoc
index 6c70f68..a1c9454 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/site/_release-notes/_0.6.0.adoc
@@ -33,10 +33,10 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
(logging-log4j-tools) branch release/0.6.0 updated: Remove the redundant `distribution-attachment-count` CI argument
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/release/0.6.0 by this push: new 115de50 Remove the redundant `distribution-attachment-count` CI argument 115de50 is described below commit 115de501de9474a602f9f2287ff685e4d650de9b Author: Volkan Yazıcı AuthorDate: Mon Nov 13 09:57:18 2023 +0100 Remove the redundant `distribution-attachment-count` CI argument --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6e6c40a..6f09693 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,5 +67,4 @@ jobs: contents: write with: project-id: log4j-tools - distribution-attachment-count: 2 site-enabled: true
(logging-log4j-tools) branch main updated: Remove the redundant `distribution-attachment-count` CI argument
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/main by this push: new c2755c1 Remove the redundant `distribution-attachment-count` CI argument c2755c1 is described below commit c2755c135a9238e38ffbca3770672d887816aff6 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 09:57:18 2023 +0100 Remove the redundant `distribution-attachment-count` CI argument --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6e6c40a..6f09693 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,5 +67,4 @@ jobs: contents: write with: project-id: log4j-tools - distribution-attachment-count: 2 site-enabled: true
(logging-parent) branch main updated: Fail release on missing `project.build.outputTimestamp` property
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 856cb1a Fail release on missing `project.build.outputTimestamp`
property
856cb1a is described below
commit 856cb1a71e30eebc38b7610ee3e4f9a82690eda8
Author: Volkan Yazıcı
AuthorDate: Mon Nov 13 09:53:16 2023 +0100
Fail release on missing `project.build.outputTimestamp` property
---
.github/workflows/deploy-release-reusable.yaml | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/deploy-release-reusable.yaml
b/.github/workflows/deploy-release-reusable.yaml
index 27acd75..612e040 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -122,10 +122,14 @@ jobs:
shell: bash
run: |
export PROPERTY="project.build.outputTimestamp"
+ grep -q '^([\t ]+<'$PROPERTY'>' pom.xml || {
+echo "Failed to find the \`$PROPERTY\` Maven property!"
+exit 1
+ }
export TIMESTAMP=$(TZ=UTC0 git show --quiet
--date="format-local:%Y-%m-%dT%H:%M:%SZ" --format="%cd")
sed -r 's|^([\t
]+<'$PROPERTY'>).+()$|\1'$TIMESTAMP'\2|g' -i pom.xml
if [ -n "$(git status --porcelain)" ]; then
-git commit -S pom.xml -m 'Update the
`project.build.outputTimestamp` property'
+git commit -S pom.xml -m "Update the \`$PROPERTY\` property"
git push -f origin
fi
(logging-log4j-tools) branch release/0.6.0 updated: Release changelog for version `0.6.0`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release/0.6.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
The following commit(s) were added to refs/heads/release/0.6.0 by this push:
new aefbc35 Release changelog for version `0.6.0`
aefbc35 is described below
commit aefbc35602f065849cb7ea0e677edf6adf84445d
Author: ASF Logging Services RM
AuthorDate: Mon Nov 13 08:46:54 2023 +
Release changelog for version `0.6.0`
---
.../0.6.0/.release-notes.adoc.ftl}| 19 ---
.../{.0.x.x/update-parent.xml => 0.6.0/.release.xml} | 10 --
src/changelog/{.0.x.x => 0.6.0}/add-sbom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/fix-bom.xml | 0
src/changelog/{.0.x.x => 0.6.0}/update-parent.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
src/site/_release-notes/{_0.x.x.adoc => _0.6.0.adoc} | 6 +++---
src/site/_release-notes/_0.x.x.adoc | 12
9 files changed, 13 insertions(+), 38 deletions(-)
diff --git a/src/site/_release-notes/_0.x.x.adoc
b/src/changelog/0.6.0/.release-notes.adoc.ftl
similarity index 83%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/changelog/0.6.0/.release-notes.adoc.ftl
index 6c70f68..8ffd747 100644
--- a/src/site/_release-notes/_0.x.x.adoc
+++ b/src/changelog/0.6.0/.release-notes.adoc.ftl
@@ -33,22 +33,11 @@
3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
-[#release-notes-0-x-x]
-=== 0.x.x
-
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+=== ${release.version}
+<#if release.date?has_content>Release date:: ${release.date}
This minor release contains various bug fixes and improvements.
-
- Added
-
-* Started generating CycloneDX SBOM with the recent update of `logging-parent`
to version `10.3.0`
-
- Changed
-
-* Update `org.apache.logging:logging-parent` to version `10.3.0`
-
- Fixed
-
-* `log4j-tools-bom` was broken due to removed `parent` during flattening. This
is automatically fixed by the recent `logging-parent` version `10.3.0` update.
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/.0.x.x/update-parent.xml
b/src/changelog/0.6.0/.release.xml
similarity index 69%
copy from src/changelog/.0.x.x/update-parent.xml
copy to src/changelog/0.6.0/.release.xml
index ada6ad9..5b4c7e9 100644
--- a/src/changelog/.0.x.x/update-parent.xml
+++ b/src/changelog/0.6.0/.release.xml
@@ -15,9 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-http://www.w3.org/2001/XMLSchema-instance;
- xmlns="http://logging.apache.org/log4j/changelog;
- xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
- type="changed">
- Update `org.apache.logging:logging-parent` to
version `10.3.0`
-
+http://logging.apache.org/log4j/changelog;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd;
+ date="2023-11-13" version="0.6.0"/>
diff --git a/src/changelog/.0.x.x/add-sbom.xml
b/src/changelog/0.6.0/add-sbom.xml
similarity index 100%
rename from src/changelog/.0.x.x/add-sbom.xml
rename to src/changelog/0.6.0/add-sbom.xml
diff --git a/src/changelog/.0.x.x/fix-bom.xml b/src/changelog/0.6.0/fix-bom.xml
similarity index 100%
rename from src/changelog/.0.x.x/fix-bom.xml
rename to src/changelog/0.6.0/fix-bom.xml
diff --git a/src/changelog/.0.x.x/update-parent.xml
b/src/changelog/0.6.0/update-parent.xml
similarity index 100%
rename from src/changelog/.0.x.x/update-parent.xml
rename to src/changelog/0.6.0/update-parent.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index f7e9360..0fe2d10 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
:project-github-url: https://github.com/apache/logging-log4j-tools
-:project-version: 0.6.0-SNAPSHOT
+:project-version: 0.6.0
:project-name: Log4j Tools
:project-id: log4j-tools
:java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 33cb92b..3d24771 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
[#release-notes]
== Release Notes
-include::_release-notes/_0.x.x.adoc[]
+include::_release-notes/_0.6.0.adoc[]
include::_release-notes/_0.5.0.adoc[]
include::_release-notes/_0.4.0.adoc[]
include::_release-notes/_0.3.0.adoc[]
diff --git a/src/site/_release-notes/_0.x.x.adoc
b/src/site/_release-notes/_0.6.0.adoc
similarity index 97%
copy from src/site/_release-notes/_0.x.x.adoc
copy to src/site/_release-notes/_0.6.0.adoc
index 6c70f68..a1c9454 100644
---
(logging-log4j-tools) branch release/0.6.0 created (now c723677)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git at c723677 Set the version to `0.6.0` This branch includes the following new commits: new c723677 Set the version to `0.6.0` 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-tools) 01/01: Set the version to `0.6.0`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/0.6.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git commit c7236776e68c98f5032040d55496ef63d6487dba Author: Volkan Yazıcı AuthorDate: Mon Nov 13 09:43:32 2023 +0100 Set the version to `0.6.0` --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9cc4fb..5b3273c 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ -0.6.0-SNAPSHOT +0.6.0 true
(logging-log4j-tools) branch main updated: Update `logging-parent` to version `10.3.0` and organize changelog entries
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git The following commit(s) were added to refs/heads/main by this push: new de1e621 Update `logging-parent` to version `10.3.0` and organize changelog entries de1e621 is described below commit de1e621dc9a41b7973ee0cef3f288ebd66b027e8 Author: Volkan Yazıcı AuthorDate: Mon Nov 13 09:41:45 2023 +0100 Update `logging-parent` to version `10.3.0` and organize changelog entries --- pom.xml | 2 +- src/changelog/.0.x.x/add-sbom.xml | 2 +- src/changelog/.0.x.x/fix-bom.xml | 2 +- src/changelog/.0.x.x/update-parent.xml| 2 +- .../.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml | 8 src/site/_release-notes/_0.x.x.adoc | 7 +++ 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 3d2c3f8..d9cc4fb 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.logging logging-parent -10.2.0 +10.3.0 org.apache.logging.log4j diff --git a/src/changelog/.0.x.x/add-sbom.xml b/src/changelog/.0.x.x/add-sbom.xml index fed2bdc..1afbd11 100644 --- a/src/changelog/.0.x.x/add-sbom.xml +++ b/src/changelog/.0.x.x/add-sbom.xml @@ -19,5 +19,5 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; type="added"> - Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0` + Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.3.0` diff --git a/src/changelog/.0.x.x/fix-bom.xml b/src/changelog/.0.x.x/fix-bom.xml index 9e31aa8..fd3d515 100644 --- a/src/changelog/.0.x.x/fix-bom.xml +++ b/src/changelog/.0.x.x/fix-bom.xml @@ -21,6 +21,6 @@ type="fixed"> `log4j-tools-bom` was broken due to removed `parent` during flattening. -This is automatically fixed by the recent `logging-parent` version `10.2.0` update. +This is automatically fixed by the recent `logging-parent` version `10.3.0` update. diff --git a/src/changelog/.0.x.x/update-parent.xml b/src/changelog/.0.x.x/update-parent.xml index 8b82b70..ada6ad9 100644 --- a/src/changelog/.0.x.x/update-parent.xml +++ b/src/changelog/.0.x.x/update-parent.xml @@ -19,5 +19,5 @@ xmlns="http://logging.apache.org/log4j/changelog; xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; type="changed"> - Update `org.apache.logging:logging-parent` to version `10.2.0` + Update `org.apache.logging:logging-parent` to version `10.3.0` diff --git a/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml b/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml deleted file mode 100644 index 206c6e0..000 --- a/src/changelog/.0.x.x/update_org_junit_jupiter_junit_jupiter_engine.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.w3.org/2001/XMLSchema-instance; - xmlns="http://logging.apache.org/log4j/changelog; - xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd; - type="changed"> - https://github.com/apache/logging-log4j-tools/pull/83"/> - Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.1` - diff --git a/src/site/_release-notes/_0.x.x.adoc b/src/site/_release-notes/_0.x.x.adoc index 067b12c..6c70f68 100644 --- a/src/site/_release-notes/_0.x.x.adoc +++ b/src/site/_release-notes/_0.x.x.adoc @@ -43,13 +43,12 @@ This minor release contains various bug fixes and improvements. Added -* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.2.0` +* Started generating CycloneDX SBOM with the recent update of `logging-parent` to version `10.3.0` Changed -* Update `org.apache.logging:logging-parent` to version `10.2.0` -* Update `org.junit.jupiter:junit-jupiter-engine` to version `5.10.1` (https://github.com/apache/logging-log4j-tools/pull/83[83]) +* Update `org.apache.logging:logging-parent` to version `10.3.0` Fixed -* `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.2.0` update. +* `log4j-tools-bom` was broken due to removed `parent` during flattening. This is automatically fixed by the recent `logging-parent` version `10.3.0` update.
(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 e2287322 Automatic Site Publish by Buildbot e2287322 is described below commit e2287322ee4d9b6cf4fada3e8b79b2b5bb08a9e8 Author: buildbot AuthorDate: Mon Nov 13 08:37:44 2023 + Automatic Site Publish by Buildbot --- content/blog/2023/10/11/release.html | 14 +- content/blog/index.html| 14 +- content/charter.html | 14 +- content/dormant.html | 14 +- content/feed.xml | 2 +- content/guidelines.html| 14 +- content/index.html | 14 +- content/mailing-lists.html | 14 +- content/security.html | 14 +- .../10/11/release.html => security/index.html} | 115 +++- content/security/known-vulnerabilities.html| 644 + content/support.html | 426 ++ content/team-list.html | 14 +- content/what-is-logging.html | 14 +- 14 files changed, 1285 insertions(+), 42 deletions(-) diff --git a/content/blog/2023/10/11/release.html b/content/blog/2023/10/11/release.html index 04873f98..1f3f03f6 100644 --- a/content/blog/2023/10/11/release.html +++ b/content/blog/2023/10/11/release.html @@ -27,7 +27,7 @@ Guidelines Charter Team -Mailing lists +Support Help https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki What is logging? @@ -113,7 +113,17 @@ Blog - + + +Security + +Handling Security +Known Vulnerabilities +Activity Monitor + + + + Apache diff --git a/content/blog/index.html b/content/blog/index.html index cd7407b0..aec62493 100644 --- a/content/blog/index.html +++ b/content/blog/index.html @@ -27,7 +27,7 @@ Guidelines Charter Team -Mailing lists +Support Help https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki What is logging? @@ -113,7 +113,17 @@ Blog - + + +Security + +Handling Security +Known Vulnerabilities +Activity Monitor + + + + Apache diff --git a/content/charter.html b/content/charter.html index 73776b75..720f854c 100644 --- a/content/charter.html +++ b/content/charter.html @@ -27,7 +27,7 @@ Guidelines Charter Team -Mailing lists +Support Help https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki What is logging? @@ -113,7 +113,17 @@ Blog - + + +Security + +Handling Security +Known Vulnerabilities +Activity Monitor + + + + Apache diff --git a/content/dormant.html b/content/dormant.html index 753db0c3..0c6d1337 100644 --- a/content/dormant.html +++ b/content/dormant.html @@ -27,7 +27,7 @@ Guidelines Charter Team -Mailing lists +Support Help https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki What is logging? @@ -113,7 +113,17 @@ Blog - + + +Security + +Handling Security +Known
(logging-site) 01/03: added basedir for asciidoc
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git commit bf902d8743c71dded40e4e92af67635a1247717b Author: Christian Grobmeier AuthorDate: Mon Nov 13 09:36:47 2023 +0100 added basedir for asciidoc --- _config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_config.yml b/_config.yml index b4fd5ff1..0422c89e 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,9 @@ plugins: - jekyll-asciidoc - jekyll-feed +asciidoctor: + base_dir: :docdir + permalink: /blog/:year/:month/:day/:title:output_ext sass: sass_dir: _sass
(logging-site) 02/03: reused improved support page from log4j
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git commit caa65e33ed4b93d03c905d10bef4612a1608de72 Author: Christian Grobmeier AuthorDate: Mon Nov 13 09:37:18 2023 +0100 reused improved support page from log4j --- _includes/navbar.html | 2 +- support.adoc | 139 ++ 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/_includes/navbar.html b/_includes/navbar.html index 8534f426..d87fb0cd 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -9,7 +9,7 @@ Guidelines Charter Team -Mailing lists +Support Help https://cwiki.apache.org/confluence/display/LOGGING/Home;>Wiki What is logging? diff --git a/support.adoc b/support.adoc new file mode 100644 index ..181381ae --- /dev/null +++ b/support.adoc @@ -0,0 +1,139 @@ + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + += Support + +The Apache Software Foundation does not employ individuals to develop and support any of its projects. +The individuals who contribute to Apache projects do it either as part of specific tasks assigned to them by their employer, on their own initiative to benefit their employer, or on their own free time. + +[#discussions] +== User support + +If you have questions like: + +* _"How do I configure Log4j with the file appender?"_ +* _"My layout is not working as expected; what should I do?"_ +* _"How can I migrate from Log4j 1 with this custom configuration?"_ + +We urge you to first check our link:faq.html[FAQ] to see if it has already been answered. +If not, you can ask your questions on one of our official user support channels: + +* https://github.com/apache/logging-log4j2/discussions[GitHub Discussions] (**experimental**) +* `log4j-u...@logging.apache.org` mailing list (public | mailto:log4j-user-subscr...@logging.apache.org[subscribe] | mailto:log4j-user-unsubscr...@logging.apache.org[unsubscribe] | mailto:log4j-u...@logging.apache.org[post] | https://lists.apache.org/list.html?log4j-userlogging.apache.org[archive]) + +[WARNING] + +**You are expected to be subscribed** to a mailing list to receive replies to your posted questions! +If you are not subscribed, when you post an email, it will be subject to moderation (hence, will be distributed with a delay) and the only way you would be able to follow the conversation is to use the mailing list archive. + + +[WARNING] + +Messages sent to a public mailing list will be seen by many people and also re-published by 3rd party websites. +It is usually not possible to remove them. +Please **don't send mails containing confidential information** to public mailing lists. +For more information, please see the https://privacy.apache.org/policies/privacy-policy-public.html[privacy policy] + +* http://stackoverflow.com[Stack Overflow] (use http://stackoverflow.com/questions/tagged/log4j[log4j] or http://stackoverflow.com/questions/tagged/log4j2[log4j2] tags) + +== Maintainer discussions + +Apache Log4j project officially uses mailing lists for discussions related to maintenance and development. + +[WARNING] + +**You are expected to be subscribed** to a mailing list to receive replies to your posted questions! +If you are not subscribed, when you post an email, it will be subject to moderation (hence, will be distributed with a delay) and the only way you would be able to follow the conversation is to use the mailing list archive. + + +If you have questions or feedback like: + +* A class should have public visibility instead of package-scoped +* A plugin is missing configuration options +* You found a bug + +then please contact us using the following mailing lists: + +`d...@logging.apache.org` (public | mailto:dev-subscr...@logging.apache.org[subscribe] | mailto:dev-unsubscr...@logging.apache.org[unsubscribe] | mailto:d...@logging.apache.org[post] |
(logging-site) 03/03: added security relevant information
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git commit 40e6432308b3dbccd04f704eaf1e10175d5ae3a6 Author: Christian Grobmeier AuthorDate: Mon Nov 13 09:37:27 2023 +0100 added security relevant information --- _includes/navbar.html | 12 +- security/_log4j1-eol.adoc | 23 +++ security/index.adoc | 62 security/known-vulnerabilities.adoc | 276 4 files changed, 372 insertions(+), 1 deletion(-) diff --git a/_includes/navbar.html b/_includes/navbar.html index d87fb0cd..a46d690c 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -43,7 +43,17 @@ Blog - + + +Security + +Handling Security +Known Vulnerabilities +Activity Monitor + + + + Apache diff --git a/security/_log4j1-eol.adoc b/security/_log4j1-eol.adoc new file mode 100644 index ..e83648d3 --- /dev/null +++ b/security/_log4j1-eol.adoc @@ -0,0 +1,23 @@ + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +[WARNING] + +http://logging.apache.org/log4j/1.x[Log4j 1] has https://blogs.apache.org/foundation/entry/apache_logging_services_project_announces[reached End of Life] in 2015, and is no longer supported. +Vulnerabilities reported after August 2015 against Log4j 1 are not checked and will not be fixed. +Users should xref:manual/migration.html[upgrade to Log4j 2] to obtain security fixes. + \ No newline at end of file diff --git a/security/index.adoc b/security/index.adoc new file mode 100644 index ..67a070ba --- /dev/null +++ b/security/index.adoc @@ -0,0 +1,62 @@ + +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + + +:cve-url-prefix: https://nvd.nist.gov/vuln/detail + +== Security + +The Apache Logging Services Security Team takes security seriously. +This allows our users to place their trust in Log4j for protecting their mission-critical data. +In this page we will help you find guidance on security-related issues and access to known vulnerabilities. + +include::_log4j1-eol.adoc[] + +[#support] +== Getting support + +If you need help on building or configuring any logging component such as Log4j or other help on following the instructions to mitigate the known vulnerabilities listed here, please use our xref:../support.adoc#discussions[user support channels]. + +[TIP] + +If you need to apply a source code patch, use the building instructions for the Log4j version that you are using. +These instructions can be found in `BUILDING.md` distributed with the sources. + + +[#reporting] +== Reporting vulnerabilities + +If you have encountered an unlisted security vulnerability or other unexpected behaviour that has a security impact, or if the descriptions here are incomplete, please report them **privately** to mailto:secur...@logging.apache.org[the Logging Services Security Team]. + +[WARNING] + +The threat model that Log4j uses considers configuration files as safe input controlled by the programmer; **potential vulnerabilities that require the
(logging-site) branch jekyll updated (9dfd5eaf -> 40e64323)
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a change to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git from 9dfd5eaf typo new bf902d87 added basedir for asciidoc new caa65e33 reused improved support page from log4j new 40e64323 added security relevant information The 3 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: _config.yml | 3 + _includes/navbar.html | 14 +- security/_log4j1-eol.adoc | 23 +++ security/index.adoc | 62 security/known-vulnerabilities.adoc | 276 support.adoc| 139 ++ 6 files changed, 515 insertions(+), 2 deletions(-) create mode 100644 security/_log4j1-eol.adoc create mode 100644 security/index.adoc create mode 100644 security/known-vulnerabilities.adoc create mode 100644 support.adoc
