You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2020/01/26 10:49:48 UTC

[lucene-solr] branch branch_8x updated: Fix Windows Line endings in the source-patterns checker (silly bug: it's \r\n on windows not the other way round)

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new dea6f38  Fix Windows Line endings in the source-patterns checker (silly bug: it's \r\n on windows not the other way round)
dea6f38 is described below

commit dea6f38d54b0013e59f0f75e984fb6373867bbe9
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Jan 26 11:48:24 2020 +0100

    Fix Windows Line endings in the source-patterns checker (silly bug: it's \r\n on windows not the other way round)
---
 lucene/tools/src/groovy/check-source-patterns.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lucene/tools/src/groovy/check-source-patterns.groovy b/lucene/tools/src/groovy/check-source-patterns.groovy
index 62565e6..4688584 100644
--- a/lucene/tools/src/groovy/check-source-patterns.groovy
+++ b/lucene/tools/src/groovy/check-source-patterns.groovy
@@ -71,7 +71,7 @@ def javadocsPattern = ~$/(?sm)^\Q/**\E(.*?)\Q*/\E/$;
 def javaCommentPattern = ~$/(?sm)^\Q/*\E(.*?)\Q*/\E/$;
 def xmlCommentPattern = ~$/(?sm)\Q<!--\E(.*?)\Q-->\E/$;
 def lineSplitter = ~$/[\r\n]+/$;
-def singleLineSplitter = ~$/\n\r?/$;
+def singleLineSplitter = ~$/\r?\n/$;
 def licenseMatcher = Defaults.createDefaultMatcher();
 def validLoggerPattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+\p{javaJavaIdentifierStart}+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;
 def validLoggerNamePattern = ~$/(?s)\b(private\s|static\s|final\s){3}+\s*Logger\s+log+\s+=\s+\QLoggerFactory.getLogger(MethodHandles.lookup().lookupClass());\E/$;