You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/05 05:42:43 UTC
svn commit: r1380968 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/build.xml
lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
lucene/build.xml
Author: rmuir
Date: Wed Sep 5 03:42:43 2012
New Revision: 1380968
URL: http://svn.apache.org/viewvc?rev=1380968&view=rev
Log:
LUCENE-4357: icu tools/ use forbidden apis
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/build.xml
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
lucene/dev/branches/branch_4x/lucene/build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/build.xml?rev=1380968&r1=1380967&r2=1380968&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/build.xml Wed Sep 5 03:42:43 2012
@@ -97,6 +97,9 @@
<target name="compile-test">
<forall-analyzers target="compile-test"/>
</target>
+ <target name="compile-tools">
+ <forall-analyzers target="compile-tools"/>
+ </target>
<target name="test">
<forall-analyzers target="test"/>
</target>
Modified: lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java?rev=1380968&r1=1380967&r2=1380968&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java Wed Sep 5 03:42:43 2012
@@ -37,6 +37,7 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -252,15 +253,15 @@ public class GenerateUTR30DataFiles {
if (it.codepoint != UnicodeSetIterator.IS_STRING) {
if (numericValue) {
for (int cp = it.codepoint ; cp <= it.codepointEnd ; ++cp) {
- builder.append(String.format("%04X", cp)).append('>');
- builder.append(String.format("%04X", 0x30 + UCharacter.getNumericValue(cp)));
+ builder.append(String.format(Locale.ROOT, "%04X", cp)).append('>');
+ builder.append(String.format(Locale.ROOT, "%04X", 0x30 + UCharacter.getNumericValue(cp)));
builder.append(" # ").append(UCharacter.getName(cp));
builder.append("\n");
}
} else {
- builder.append(String.format("%04X", it.codepoint));
+ builder.append(String.format(Locale.ROOT, "%04X", it.codepoint));
if (it.codepointEnd > it.codepoint) {
- builder.append("..").append(String.format("%04X", it.codepointEnd));
+ builder.append("..").append(String.format(Locale.ROOT, "%04X", it.codepointEnd));
}
builder.append('>').append(rightHandSide).append("\n");
}
Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1380968&r1=1380967&r2=1380968&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Wed Sep 5 03:42:43 2012
@@ -146,6 +146,11 @@
<!-- Validation (license/notice/api checks). -->
<target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
+ <!-- Validation here depends on compile-tools: but we want to compile modules' tools too -->
+ <target name="compile-tools" depends="common.compile-tools">
+ <modules-crawl target="compile-tools" failonerror="true"/>
+ </target>
+
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
<license-check-macro dir="${basedir}" licensedir="${common.dir}/licenses" />
</target>