From 2e35d9a8c641f409d1520fa792bd919ec32b1497 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Mon, 15 Mar 2010 02:02:32 +0000
Subject: [PATCH] upgrade to 3.1-dev jars

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/solr@923025 13f79535-47bb-0310-9956-ffa450edef68
---
 common-build.xml                                           | 4 ++--
 lib/lucene-analyzers-3.0.1.jar                             | 2 --
 lib/lucene-analyzers-3.1-dev.jar                           | 2 ++
 lib/lucene-collation-3.0.1.jar                             | 2 --
 lib/lucene-core-3.0.1.jar                                  | 2 --
 lib/lucene-core-3.1-dev.jar                                | 2 ++
 lib/lucene-fast-vector-highlighter-3.0.1.jar               | 2 --
 lib/lucene-fast-vector-highlighter-3.1-dev.jar             | 2 ++
 lib/lucene-highlighter-3.0.1.jar                           | 2 --
 lib/lucene-highlighter-3.1-dev.jar                         | 2 ++
 lib/lucene-memory-3.0.1.jar                                | 2 --
 lib/lucene-memory-3.1-dev.jar                              | 2 ++
 lib/lucene-misc-3.0.1.jar                                  | 2 --
 lib/lucene-misc-3.1-dev.jar                                | 2 ++
 lib/lucene-queries-3.0.1.jar                               | 2 --
 lib/lucene-queries-3.1-dev.jar                             | 2 ++
 lib/lucene-snowball-3.0.1.jar                              | 2 --
 lib/lucene-spatial-3.0.1.jar                               | 2 --
 lib/lucene-spatial-3.1-dev.jar                             | 2 ++
 lib/lucene-spellchecker-3.0.1.jar                          | 2 --
 lib/lucene-spellchecker-3.1-dev.jar                        | 2 ++
 src/java/org/apache/solr/analysis/WordDelimiterFilter.java | 3 ++-
 22 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 lib/lucene-analyzers-3.0.1.jar
 create mode 100644 lib/lucene-analyzers-3.1-dev.jar
 delete mode 100644 lib/lucene-collation-3.0.1.jar
 delete mode 100644 lib/lucene-core-3.0.1.jar
 create mode 100644 lib/lucene-core-3.1-dev.jar
 delete mode 100644 lib/lucene-fast-vector-highlighter-3.0.1.jar
 create mode 100644 lib/lucene-fast-vector-highlighter-3.1-dev.jar
 delete mode 100644 lib/lucene-highlighter-3.0.1.jar
 create mode 100644 lib/lucene-highlighter-3.1-dev.jar
 delete mode 100644 lib/lucene-memory-3.0.1.jar
 create mode 100644 lib/lucene-memory-3.1-dev.jar
 delete mode 100644 lib/lucene-misc-3.0.1.jar
 create mode 100644 lib/lucene-misc-3.1-dev.jar
 delete mode 100644 lib/lucene-queries-3.0.1.jar
 create mode 100644 lib/lucene-queries-3.1-dev.jar
 delete mode 100644 lib/lucene-snowball-3.0.1.jar
 delete mode 100644 lib/lucene-spatial-3.0.1.jar
 create mode 100644 lib/lucene-spatial-3.1-dev.jar
 delete mode 100644 lib/lucene-spellchecker-3.0.1.jar
 create mode 100644 lib/lucene-spellchecker-3.1-dev.jar

diff --git a/common-build.xml b/common-build.xml
index a7b6b2a896e..be17f20d6b7 100644
--- a/common-build.xml
+++ b/common-build.xml
@@ -92,7 +92,7 @@
   <property name="javadoc.link.junit"
             value="http://junit.sourceforge.net/javadoc/"/>
   <property name="javadoc.link.lucene"
-            value="http://lucene.apache.org/java/2_9_0/api/all/"/>
+            value="http://lucene.apache.org/java/3_1_0/api/all/"/>
   <property name="javadoc.packages" value="org.apache.solr.*"/>
   <property name="build.docs" value="${dest}/docs"/>
   <property name="build.javadoc" value="${common.dir}/${build.docs}/api"/>
@@ -114,7 +114,7 @@
        The version suffix of the Lucene artifacts checked into "lib" 
        IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
   -->
-  <property name="lucene_version" value="3.0.1"/>
+  <property name="lucene_version" value="3.1-dev"/>
   <!-- The version number to assign to the Maven artifacts. -->
   <property name="maven_version" value="1.5-SNAPSHOT"/>
 
diff --git a/lib/lucene-analyzers-3.0.1.jar b/lib/lucene-analyzers-3.0.1.jar
deleted file mode 100644
index e02b79dc468..00000000000
--- a/lib/lucene-analyzers-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[9117ad96a4d5290e0731e2fc2fb326899a4999fd] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-analyzers-3.1-dev.jar b/lib/lucene-analyzers-3.1-dev.jar
new file mode 100644
index 00000000000..731762a5eeb
--- /dev/null
+++ b/lib/lucene-analyzers-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[f54b406771bab8fd720fb27279c9a6fca94a9331] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-collation-3.0.1.jar b/lib/lucene-collation-3.0.1.jar
deleted file mode 100644
index 8ca812930ea..00000000000
--- a/lib/lucene-collation-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[876ca004312baada28f235c96ad74c9ee467045a] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-3.0.1.jar b/lib/lucene-core-3.0.1.jar
deleted file mode 100644
index a0ee07e97c1..00000000000
--- a/lib/lucene-core-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[34b447a890e395c06906a75a7567f6fe8197b147] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-3.1-dev.jar b/lib/lucene-core-3.1-dev.jar
new file mode 100644
index 00000000000..2be38db7b13
--- /dev/null
+++ b/lib/lucene-core-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[a3e0b5ba94c0be4f1b90678a3edad30f5bda7bda] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-fast-vector-highlighter-3.0.1.jar b/lib/lucene-fast-vector-highlighter-3.0.1.jar
deleted file mode 100644
index 259b606f21a..00000000000
--- a/lib/lucene-fast-vector-highlighter-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[c156dab2c44abc562f7d061581aeb1aaa1f28a72] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-fast-vector-highlighter-3.1-dev.jar b/lib/lucene-fast-vector-highlighter-3.1-dev.jar
new file mode 100644
index 00000000000..2059a2fdbc5
--- /dev/null
+++ b/lib/lucene-fast-vector-highlighter-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[9a1be03163402a081ca97f77cbc9fb9e0ece9ea8] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-3.0.1.jar b/lib/lucene-highlighter-3.0.1.jar
deleted file mode 100644
index 567ae42e938..00000000000
--- a/lib/lucene-highlighter-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[f897531d6823d0717f65a06e9f3cc648547c2cfe] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-3.1-dev.jar b/lib/lucene-highlighter-3.1-dev.jar
new file mode 100644
index 00000000000..be75c98b37d
--- /dev/null
+++ b/lib/lucene-highlighter-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[80a77c9bf82d5e170629e022160ef33f7328a6d1] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-3.0.1.jar b/lib/lucene-memory-3.0.1.jar
deleted file mode 100644
index 2005459e352..00000000000
--- a/lib/lucene-memory-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[f39bb741c2563c55fe9185f1c32615d75be056be] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-3.1-dev.jar b/lib/lucene-memory-3.1-dev.jar
new file mode 100644
index 00000000000..d491cff09a8
--- /dev/null
+++ b/lib/lucene-memory-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[3b4288125250d3860d6323669c79b9e8a89f642f] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-3.0.1.jar b/lib/lucene-misc-3.0.1.jar
deleted file mode 100644
index e3e482e100c..00000000000
--- a/lib/lucene-misc-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[9139afc9ede79205a745d831b24a4316406710d2] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-3.1-dev.jar b/lib/lucene-misc-3.1-dev.jar
new file mode 100644
index 00000000000..2131ca2451b
--- /dev/null
+++ b/lib/lucene-misc-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[55da71e9537b5d05aee891cdf24abcfeb516ac5b] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-3.0.1.jar b/lib/lucene-queries-3.0.1.jar
deleted file mode 100644
index 2203b381a60..00000000000
--- a/lib/lucene-queries-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[9d9508a2199ff767f7853a0663d62896c60f0654] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-3.1-dev.jar b/lib/lucene-queries-3.1-dev.jar
new file mode 100644
index 00000000000..610dde528ca
--- /dev/null
+++ b/lib/lucene-queries-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[d02ab15d502b54929e9129c923de9d52ae8e2b20] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-snowball-3.0.1.jar b/lib/lucene-snowball-3.0.1.jar
deleted file mode 100644
index 95cc9f0d07d..00000000000
--- a/lib/lucene-snowball-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[017161b212f274b87e3d8ef0809fbdee0c2099ce] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spatial-3.0.1.jar b/lib/lucene-spatial-3.0.1.jar
deleted file mode 100644
index 5565bf93275..00000000000
--- a/lib/lucene-spatial-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[445a216d3341a569cc6f38480fdda9a3c2ee1d10] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spatial-3.1-dev.jar b/lib/lucene-spatial-3.1-dev.jar
new file mode 100644
index 00000000000..0b3173e91df
--- /dev/null
+++ b/lib/lucene-spatial-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[b6add459cd59cde7e7cbf95b56cf57cab172d0e9] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-3.0.1.jar b/lib/lucene-spellchecker-3.0.1.jar
deleted file mode 100644
index c4906125aff..00000000000
--- a/lib/lucene-spellchecker-3.0.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[6f12da563f7f852877998443d9e772579bfcf076] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-3.1-dev.jar b/lib/lucene-spellchecker-3.1-dev.jar
new file mode 100644
index 00000000000..40c3bc32b8d
--- /dev/null
+++ b/lib/lucene-spellchecker-3.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[42b53bd657ba935286f349d24ebb7641bd9e3cc7] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/src/java/org/apache/solr/analysis/WordDelimiterFilter.java b/src/java/org/apache/solr/analysis/WordDelimiterFilter.java
index 386ce6c383b..8e4a1612fb3 100644
--- a/src/java/org/apache/solr/analysis/WordDelimiterFilter.java
+++ b/src/java/org/apache/solr/analysis/WordDelimiterFilter.java
@@ -25,6 +25,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
 import org.apache.lucene.analysis.tokenattributes.TermAttribute;
 import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
 import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.RamUsageEstimator;
 
 import java.io.IOException;
 
@@ -465,7 +466,7 @@ final class WordDelimiterFilter extends TokenFilter {
     savedType = typeAttribute.type();
 
     if (savedBuffer.length < termAtttribute.termLength()) {
-      savedBuffer = new char[ArrayUtil.getNextSize(termAtttribute.termLength())];
+      savedBuffer = new char[ArrayUtil.oversize(termAtttribute.termLength(), RamUsageEstimator.NUM_BYTES_CHAR)];
     }
 
     System.arraycopy(termAtttribute.termBuffer(), 0, savedBuffer, 0, termAtttribute.termLength());