You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2021/12/16 16:57:26 UTC
[logging-log4j2] branch release-2.x updated (2f59d2c -> 8d064dd)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 2f59d2c Fix Javadoc RuntimeException.
new fb4b543 Slightly better text.
new a389c3c Add missing package-info.java.
new 982dd42 Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
new f56d663 Ignore Eclipse metadata folder.
new 8d064dd Removed unused imports.
The 5 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:
.gitignore | 1 +
.../org/apache/log4j/xml/XmlConfiguration.java | 25 +++++++++++-----------
.../logging/log4j/internal}/package-info.java | 4 ++--
src/site/markdown/manual/compatibility.md | 2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
copy {log4j-1.2-api/src/main/java/org/apache/log4j/helpers => log4j-api/src/main/java/org/apache/logging/log4j/internal}/package-info.java (90%)
[logging-log4j2] 03/05: Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 982dd42fae6e5db21725c8220c77e2a9e3cd1531
Merge: a389c3c 2f59d2c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 11:36:55 2021 -0500
Merge branch 'release-2.x' of https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
log4j-1.2-api/src/site/markdown/index.md | 2 +-
log4j-api/pom.xml | 6 -
log4j-core/pom.xml | 7 -
log4j-core/revapi.json | 30 ++
.../log4j/core/appender/mom/JmsAppender.java | 42 +--
.../rolling/action/IfAccumulatedFileCount.java | 2 +-
.../rolling/action/IfAccumulatedFileSize.java | 2 +-
.../core/appender/rolling/action/IfFileName.java | 2 +-
.../appender/rolling/action/PathCondition.java | 4 +-
.../logging/log4j/core/lookup/Interpolator.java | 2 +-
.../apache/logging/log4j/core/net/JndiManager.java | 125 +-------
.../appender/rolling/action/PathConditionTest.java | 43 +++
.../core/lookup/JndiRestrictedLookupTest.java | 145 +--------
.../logging/log4j/core/net/JndiManagerTest.java | 33 ++
.../pom.xml | 16 +
pom.xml | 14 +-
src/changes/changes.xml | 9 +
src/site/markdown/download.md.vm | 62 +++-
src/site/markdown/index.md.vm | 79 +++--
src/site/markdown/security.md | 333 +++++++++++++++------
src/site/site.xml | 2 +-
src/site/xdoc/manual/appenders.xml | 4 +-
src/site/xdoc/manual/configuration.xml.vm | 2 +-
src/site/xdoc/manual/lookups.xml | 4 +-
src/site/xdoc/manual/migration.xml | 14 +
25 files changed, 539 insertions(+), 445 deletions(-)
[logging-log4j2] 01/05: Slightly better text.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fb4b543a79545cebf51f45933e1a0a2718a6e456
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 11:05:33 2021 -0500
Slightly better text.
End file in an EOL.
---
src/site/markdown/manual/compatibility.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/markdown/manual/compatibility.md b/src/site/markdown/manual/compatibility.md
index 69a1b30..2b7345f 100644
--- a/src/site/markdown/manual/compatibility.md
+++ b/src/site/markdown/manual/compatibility.md
@@ -91,4 +91,4 @@ files must have a file extension of either ".properties" or ".xml".
* Custom rewrite policies since LoggingEvent is currently a no-op.
### Renderers
-Log4j 2 currently will ignore renderers.
\ No newline at end of file
+Log4j 2 currently ignores renderers.
[logging-log4j2] 04/05: Ignore Eclipse metadata folder.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit f56d663974c7e5edcb9a190b3483d4d326edf3ae
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 11:56:51 2021 -0500
Ignore Eclipse metadata folder.
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index fce0e91..93ed3a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ target/
velocity.log
felix-cache/
bin/
+/.metadata/
[logging-log4j2] 05/05: Removed unused imports.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8d064dd9adbd3fedd4d0339474b529b30408c49f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 11:57:11 2021 -0500
Removed unused imports.
---
.../org/apache/log4j/xml/XmlConfiguration.java | 25 +++++++++++-----------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
index 2a9de0b..7020349 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
@@ -16,14 +16,24 @@
*/
package org.apache.log4j.xml;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.function.Consumer;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+
import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
import org.apache.log4j.Level;
import org.apache.log4j.bridge.AppenderAdapter;
import org.apache.log4j.bridge.AppenderWrapper;
import org.apache.log4j.config.Log4j1Configuration;
-import org.apache.log4j.config.PropertiesConfiguration;
-import org.apache.log4j.config.PropertiesConfigurationFactory;
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.rewrite.RewritePolicy;
@@ -46,17 +56,6 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.function.Consumer;
-
/**
* Class Description goes here.
*/
[logging-log4j2] 02/05: Add missing package-info.java.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a389c3cf4f3040334ae733c16ebcef504fb15ac3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 16 11:19:53 2021 -0500
Add missing package-info.java.
---
.../apache/logging/log4j/internal/package-info.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/internal/package-info.java b/log4j-api/src/main/java/org/apache/logging/log4j/internal/package-info.java
new file mode 100644
index 0000000..cc9a920
--- /dev/null
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/internal/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+/**
+ * This package should be considered private.
+ */
+package org.apache.logging.log4j.internal;