3.4 -> 3.5
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x@1169461 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index a9522af..48b5991 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -45,8 +45,8 @@
<property name="name" value="${ant.project.name}"/>
<property name="Name" value="Lucene"/>
- <property name="dev.version" value="3.4-SNAPSHOT"/>
- <property name="tests.luceneMatchVersion" value="3.4"/>
+ <property name="dev.version" value="3.5-SNAPSHOT"/>
+ <property name="tests.luceneMatchVersion" value="3.5"/>
<property name="version" value="${dev.version}"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>
diff --git a/lucene/src/java/org/apache/lucene/util/Constants.java b/lucene/src/java/org/apache/lucene/util/Constants.java
index 42a2a10..866aab3 100644
--- a/lucene/src/java/org/apache/lucene/util/Constants.java
+++ b/lucene/src/java/org/apache/lucene/util/Constants.java
@@ -75,7 +75,7 @@
// NOTE: we track per-segment version as a String with the "X.Y" format, e.g.
// "4.0", "3.1", "3.0". Therefore when we change this constant, we should keep
// the format.
- public static final String LUCENE_MAIN_VERSION = ident("3.4");
+ public static final String LUCENE_MAIN_VERSION = ident("3.5");
public static final String LUCENE_VERSION;
static {
diff --git a/lucene/src/java/org/apache/lucene/util/Version.java b/lucene/src/java/org/apache/lucene/util/Version.java
index 2d1aa86..b00c2dc 100644
--- a/lucene/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/src/java/org/apache/lucene/util/Version.java
@@ -80,13 +80,16 @@
/** Match settings and bugs in Lucene's 3.3 release. */
LUCENE_33,
+ /** Match settings and bugs in Lucene's 3.4 release. */
+ LUCENE_34,
+
/**
- * Match settings and bugs in Lucene's 3.4 release.
+ * Match settings and bugs in Lucene's 3.5 release.
* <p>
* Use this to get the latest & greatest settings, bug
* fixes, etc, for Lucene.
*/
- LUCENE_34,
+ LUCENE_35,
/* Add new constants for later versions **here** to respect order! */
diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
index 55ea4e1..21b737a 100644
--- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
@@ -106,7 +106,7 @@
/** Use this constant when creating Analyzers and any other version-dependent stuff.
* <p><b>NOTE:</b> Change this when development starts for new Lucene version:
*/
- public static final Version TEST_VERSION_CURRENT = Version.LUCENE_34;
+ public static final Version TEST_VERSION_CURRENT = Version.LUCENE_35;
/**
* If this is set, it is the only method that should run.
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 32fa6e6..36322cd 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -24,7 +24,7 @@
<dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
<property name="Name" value="Solr" />
- <property name="version" value="3.4-SNAPSHOT"/>
+ <property name="version" value="3.5-SNAPSHOT"/>
<property name="fullname" value="apache-${ant.project.name}"/>
<property name="fullnamever" value="${fullname}-${version}"/>
<property name="final.name" value="${fullnamever}"/>
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 97c80c4..caa5c59 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<jmx />
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index b0e2391..8c8cd89 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index 8fc1e77..ef01eb9 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<jmx />
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index 0605086..3c260d9 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -18,7 +18,7 @@
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<!-- Set this to 'false' if you want solr to continue working after it has
encountered an severe configuration error. In a production environment,
diff --git a/solr/example/multicore/core0/conf/solrconfig.xml b/solr/example/multicore/core0/conf/solrconfig.xml
index fdcc48f..7577a28 100644
--- a/solr/example/multicore/core0/conf/solrconfig.xml
+++ b/solr/example/multicore/core0/conf/solrconfig.xml
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
diff --git a/solr/example/multicore/core1/conf/solrconfig.xml b/solr/example/multicore/core1/conf/solrconfig.xml
index de3dc84..f2ef0fb 100644
--- a/solr/example/multicore/core1/conf/solrconfig.xml
+++ b/solr/example/multicore/core1/conf/solrconfig.xml
@@ -21,7 +21,7 @@
It is *not* a good example to work from.
-->
<config>
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<!-- The DirectoryFactory to use for indexes.
solr.StandardDirectoryFactory, the default, is filesystem based.
solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
diff --git a/solr/example/solr/conf/solrconfig.xml b/solr/example/solr/conf/solrconfig.xml
index 6e29cc8..e5665ad 100755
--- a/solr/example/solr/conf/solrconfig.xml
+++ b/solr/example/solr/conf/solrconfig.xml
@@ -47,7 +47,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>LUCENE_34</luceneMatchVersion>
+ <luceneMatchVersion>LUCENE_35</luceneMatchVersion>
<!-- lib directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
