You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2017/02/14 14:29:11 UTC
[1/2] logging-log4j2 git commit: Refactors minOccur to minOccurs in
Log4j-config.xsd
Repository: logging-log4j2
Updated Branches:
refs/heads/master 850636a20 -> 69b14f96e
Refactors minOccur to minOccurs in Log4j-config.xsd
Closes #58
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2cb99494
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2cb99494
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2cb99494
Branch: refs/heads/master
Commit: 2cb9949486c8c9494d5a365d15fda12891af1c45
Parents: c826beb
Author: rpopma <rp...@apache.org>
Authored: Tue Feb 14 23:28:48 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Feb 14 23:28:48 2017 +0900
----------------------------------------------------------------------
log4j-core/src/main/resources/Log4j-config.xsd | 4 ++--
src/changes/changes.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cb99494/log4j-core/src/main/resources/Log4j-config.xsd
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/resources/Log4j-config.xsd b/log4j-core/src/main/resources/Log4j-config.xsd
index a7122ef..d4cfee4 100644
--- a/log4j-core/src/main/resources/Log4j-config.xsd
+++ b/log4j-core/src/main/resources/Log4j-config.xsd
@@ -82,12 +82,12 @@
<xs:complexType name="AppendersType">
<xs:sequence>
<xs:element name="Appender" type="AppenderType" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element name="Console" type="ConsoleType" minOccur="0"/>
+ <xs:element name="Console" type="ConsoleType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ConsoleType">
<xs:sequence>
- <xs:element name="PatternLayout" type="PatternLayoutType" minOccur="1" maxOccurs="unbounded"/>
+ <xs:element name="PatternLayout" type="PatternLayoutType" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute type="xs:string" name="name" use="required"/>
<xs:attribute type="xs:string" name="target" use="required"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cb99494/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2332570..61b80dd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.8.1" date="2017-MM-DD" description="GA Release 2.8.1">
+ <action issue="LOG4J2-1816" dev="rpopma" type="fix" due-to="shubhankar1100">
+ Change minOccur to minOccurs in Log4j-config.xsd.
+ </action>
<action issue="LOG4J2-1812" dev="rpopma" type="update">
Improved error message when log4j 2 configuration file not found.
</action>
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/69b14f96
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/69b14f96
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/69b14f96
Branch: refs/heads/master
Commit: 69b14f96e22f5b79a9a6e20552515f0b5edaa3e3
Parents: 2cb9949 850636a
Author: rpopma <rp...@apache.org>
Authored: Tue Feb 14 23:29:04 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Tue Feb 14 23:29:04 2017 +0900
----------------------------------------------------------------------
.gitattributes | 1 +
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49519 bytes
.mvn/wrapper/maven-wrapper.properties | 1 +
mvnw | 236 +++++++++++++++++++++++++++++
mvnw.cmd | 146 ++++++++++++++++++
5 files changed, 384 insertions(+)
----------------------------------------------------------------------