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 2012/10/02 00:46:05 UTC
svn commit: r1392679 - in /lucene/dev/branches/branch_4x: ./
extra-targets.xml lucene/ lucene/common-build.xml
Author: uschindler
Date: Mon Oct 1 22:46:05 2012
New Revision: 1392679
URL: http://svn.apache.org/viewvc?rev=1392679&view=rev
Log:
Merged revision(s) 1392678 from lucene/dev/trunk:
Make scripts more Groovy (remove relicts from JavaScript)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/extra-targets.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/extra-targets.xml?rev=1392679&r1=1392678&r2=1392679&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/extra-targets.xml (original)
+++ lucene/dev/branches/branch_4x/extra-targets.xml Mon Oct 1 22:46:05 2012
@@ -108,7 +108,7 @@
} as ISVNPropertyHandler);
def convertSet2String = {
- set -> set.isEmpty() ? null : ('* ' + set.toArray().join(project.getProperty('line.separator') + '* '))
+ set -> set ? ('* ' + set.join(project.getProperty('line.separator') + '* ')) : null
};
project.setProperty('svn.checkprops.failed', convertSet2String(missingProps));
project.setProperty('svn.unversioned.failed', convertSet2String(unversioned));
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1392679&r1=1392678&r2=1392679&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Mon Oct 1 22:46:05 2012
@@ -1859,9 +1859,8 @@ ${tests-output}/junit4-*.suites - pe
);
StringBuilder html = new StringBuilder('<html>\n<head>\n');
// match the first heading in markdown and use as title:
- def matcher = (markdownSource =~ /(?m)^#+\s*(.+)$/);
- if (matcher.find()) {
- html.append('<title>').append(FastEncoder.encode(matcher.group(1))).append('</title>\n');
+ markdownSource.find(~/(?m)^#+\s*(.+)$/) {
+ match, title -> html.append('<title>').append(FastEncoder.encode(title)).append('</title>\n');
}
html.append('<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n')
.append('</head>\n<body>\n')