You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/06/30 13:40:55 UTC
svn commit: r1141489 - in /lucene/dev/trunk: dev-tools/eclipse/ lucene/
lucene/src/site/build/site/
lucene/src/site/src/documentation/content/xdocs/ solr/
solr/contrib/clustering/src/test/resources/solr-clustering/conf/
solr/contrib/dataimporthandler/s...
Author: simonw
Date: Thu Jun 30 11:40:55 2011
New Revision: 1141489
URL: http://svn.apache.org/viewvc?rev=1141489&view=rev
Log:
LUCENE-3239: Drop Java 5 support on trunk
Modified:
lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml
lucene/dev/trunk/lucene/common-build.xml
lucene/dev/trunk/lucene/src/site/build/site/systemrequirements.html
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/schema.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-schema.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solr_id-schema.xml
lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/trunk/solr/example/solr/conf/schema.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/schema-trie.xml
lucene/dev/trunk/solr/src/test-files/solr/conf/schema11.xml
Modified: lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml (original)
+++ lucene/dev/trunk/dev-tools/eclipse/lucene-codestyle.xml Thu Jun 30 11:40:55 2011
@@ -158,7 +158,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
@@ -167,7 +167,7 @@
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
@@ -203,7 +203,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.6"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Jun 30 11:40:55 2011
@@ -95,15 +95,15 @@
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
- <property name="javac.source" value="1.5"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source.backwards" value="1.5"/>
- <property name="javac.target.backwards" value="1.5"/>
+ <property name="javac.source" value="1.6"/>
+ <property name="javac.target" value="1.6"/>
+ <property name="javac.source.backwards" value="1.6"/>
+ <property name="javac.target.backwards" value="1.6"/>
<!-- clover wants to run with -lib, otherwise we prefer a repeatable
classpath -->
<property name="javac.includeAntRuntime" value="${run.clover}"/>
- <property name="javadoc.link" value="http://java.sun.com/j2se/1.5/docs/api/"/>
+ <property name="javadoc.link" value="http://java.sun.com/j2se/1.6/docs/api/"/>
<property name="javadoc.access" value="protected"/>
<property name="javadoc.charset" value="utf-8"/>
<property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
Modified: lucene/dev/trunk/lucene/src/site/build/site/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/site/build/site/systemrequirements.html?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/site/build/site/systemrequirements.html (original)
+++ lucene/dev/trunk/lucene/src/site/build/site/systemrequirements.html Thu Jun 30 11:40:55 2011
@@ -236,7 +236,7 @@ document.write("Last Published: " + docu
Lucene Java has the following minimum requirements:
<ul>
-<li>Java 1.5.x or greater.</li>
+<li>Java 1.6.x or greater.</li>
<li>ANT 1.7.0 or greater.</li>
Modified: lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml (original)
+++ lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml Thu Jun 30 11:40:55 2011
@@ -13,7 +13,7 @@
<p>
Lucene Java has the following minimum requirements:
<ul>
- <li>Java 1.5.x or greater.</li>
+ <li>Java 1.6.x or greater.</li>
<li>ANT 1.7.0 or greater.</li>
<li>CPU, Disk and Memory requirements are based on the many choices made in implementing Lucene (document size, number of documents, and number of hits retrieved to name a few.)</li>
</ul>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Jun 30 11:40:55 2011
@@ -570,10 +570,10 @@
<mkdir dir="${dest}/META-INF/" />
<manifest mode="replace" file="${dest}/META-INF/MANIFEST.MF">
<!--
- http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#JAR%20Manifest
- http://java.sun.com/j2se/1.5.0/docs/guide/versioning/spec/versioning2.html
- http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Package.html
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/jar/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/guide/jar/jar.html#JAR%20Manifest
+ http://java.sun.com/j2se/1.6.0/docs/guide/versioning/spec/versioning2.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/lang/Package.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/jar/package-summary.html
http://java.sun.com/developer/Books/javaprogramming/JAR/basics/manifest.html
-->
<!-- Don't set 'Manifest-Version' it identifies the version of the
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -243,7 +243,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-schema.xml Thu Jun 30 11:40:55 2011
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solr_id-schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solr_id-schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solr_id-schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/resources/solr-dih/conf/dataimport-solr_id-schema.xml Thu Jun 30 11:40:55 2011
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/test/resources/solr-uima/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -406,7 +406,7 @@
documentation for more information on pattern and replacement
string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z])"
replacement="" replace="all" />
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/db/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/mail/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -294,7 +294,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/rss/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/schema.xml (original)
+++ lucene/dev/trunk/solr/example/solr/conf/schema.xml Thu Jun 30 11:40:55 2011
@@ -376,7 +376,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/schema-trie.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/schema-trie.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/schema-trie.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/schema-trie.xml Thu Jun 30 11:40:55 2011
@@ -233,7 +233,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/trunk/solr/src/test-files/solr/conf/schema11.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test-files/solr/conf/schema11.xml?rev=1141489&r1=1141488&r2=1141489&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test-files/solr/conf/schema11.xml (original)
+++ lucene/dev/trunk/solr/src/test-files/solr/conf/schema11.xml Thu Jun 30 11:40:55 2011
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
+ http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"