Skip to content

Fix regex error in Log4j-config.xsd #2357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix regex error in Log4j-config.xsd #2357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions log4j-core-test/src/main/resources/Log4j-config.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</annotation>
<simpleType>
<restriction base="string">
<pattern value="(|disable|\$\{[^{}]+\})" />
<pattern value="(|disable|\\$\{[^{}]+\})" />
</restriction>
</simpleType>
</attribute>
Expand All @@ -148,7 +148,7 @@
<simpleType>
<restriction base="string">
<pattern
value="([Tt][Rr][Aa][Cc][Ee]|[Dd][Ee][Bb][Uu][Gg]|[Ii][Nn][Ff][Oo]|[Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr]|[Ff][Aa][Tt][Aa][Ll]|[Oo][Ff][Ff]|\$\{[^{}]+\})" />
value="([Tt][Rr][Aa][Cc][Ee]|[Dd][Ee][Bb][Uu][Gg]|[Ii][Nn][Ff][Oo]|[Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr]|[Ff][Aa][Tt][Aa][Ll]|[Oo][Ff][Ff]|\\$\{[^{}]+\})" />
</restriction>
</simpleType>
</attribute>
Expand Down Expand Up @@ -1389,7 +1389,7 @@
<documentation>Allow boolean values or variable place holders in the form of ${variablename}</documentation>
</annotation>
<restriction base="string">
<pattern value="(true|false|\$\{[^{}]+\})" />
<pattern value="(true|false|\\$\{[^{}]+\})" />
</restriction>
</simpleType>

Expand All @@ -1398,7 +1398,7 @@
<documentation>Allow long values or variable place holders in the form of ${variablename}</documentation>
</annotation>
<restriction base="string">
<pattern value="-?([0-9]+|\$\{[^{}]+\})" />
<pattern value="-?([0-9]+|\\$\{[^{}]+\})" />
</restriction>
</simpleType>

Expand Down
8 changes: 4 additions & 4 deletions log4j-core/src/main/resources/Log4j-config.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
</annotation>
<simpleType>
<restriction base="string">
<pattern value="(|disable|\$\{[^{}]+\})" />
<pattern value="(|disable|\\$\{[^{}]+\})" />
</restriction>
</simpleType>
</attribute>
Expand All @@ -148,7 +148,7 @@
<simpleType>
<restriction base="string">
<pattern
value="([Tt][Rr][Aa][Cc][Ee]|[Dd][Ee][Bb][Uu][Gg]|[Ii][Nn][Ff][Oo]|[Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr]|[Ff][Aa][Tt][Aa][Ll]|[Oo][Ff][Ff]|\$\{[^{}]+\})" />
value="([Tt][Rr][Aa][Cc][Ee]|[Dd][Ee][Bb][Uu][Gg]|[Ii][Nn][Ff][Oo]|[Ww][Aa][Rr][Nn]|[Ee][Rr][Rr][Oo][Rr]|[Ff][Aa][Tt][Aa][Ll]|[Oo][Ff][Ff]|\\$\{[^{}]+\})" />
</restriction>
</simpleType>
</attribute>
Expand Down Expand Up @@ -1389,7 +1389,7 @@
<documentation>Allow boolean values or variable place holders in the form of ${variablename}</documentation>
</annotation>
<restriction base="string">
<pattern value="(true|false|\$\{[^{}]+\})" />
<pattern value="(true|false|\\$\{[^{}]+\})" />
</restriction>
</simpleType>

Expand All @@ -1398,7 +1398,7 @@
<documentation>Allow long values or variable place holders in the form of ${variablename}</documentation>
</annotation>
<restriction base="string">
<pattern value="-?([0-9]+|\$\{[^{}]+\})" />
<pattern value="-?([0-9]+|\\$\{[^{}]+\})" />
</restriction>
</simpleType>

Expand Down