From 62315979747f20bc2f25961731998951d0421140 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Mon, 18 Mar 2013 12:28:52 +0000 Subject: [PATCH] LUCENE-4747: Move to Java 7 in trunk git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1457734 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 10 +--- .../dot.settings/org.eclipse.jdt.core.prefs | 6 +-- dev-tools/maven/README.maven | 6 +-- dev-tools/maven/pom.xml.template | 2 +- dev-tools/scripts/smokeTestRelease.py | 49 ++----------------- lucene/BUILD.txt | 6 +-- lucene/CHANGES.txt | 5 ++ lucene/SYSTEM_REQUIREMENTS.txt | 2 +- lucene/build.xml | 2 +- lucene/common-build.xml | 31 ++++++------ .../org/apache/lucene/util/Constants.java | 30 +++--------- lucene/tools/javadoc/ecj.javadocs.prefs | 6 +-- .../javadoc/{java6 => java7}/package-list | 6 +++ solr/CHANGES.txt | 2 +- solr/README.txt | 4 +- solr/SYSTEM_REQUIREMENTS.txt | 2 +- solr/build.xml | 2 +- solr/common-build.xml | 6 +-- .../solr/collection1/conf/schema.xml | 2 +- .../handler/dataimport/XPathRecordReader.java | 1 + .../conf/dataimport-solr_id-schema.xml | 2 +- .../uima/solr/collection1/conf/schema.xml | 2 +- .../uima/uima-tokenizers-schema.xml | 2 +- .../DocumentAnalysisRequestHandler.java | 1 + .../apache/solr/handler/loader/XMLLoader.java | 1 + .../solr/collection1/conf/schema-trie.xml | 2 +- .../solr/collection1/conf/schema11.xml | 2 +- .../example-DIH/solr/db/conf/schema.xml | 2 +- .../example-DIH/solr/mail/conf/schema.xml | 2 +- .../example-DIH/solr/rss/conf/schema.xml | 2 +- .../example-DIH/solr/solr/conf/schema.xml | 2 +- solr/example/solr/collection1/conf/schema.xml | 2 +- solr/site/html/tutorial.html | 4 +- .../client/solrj/impl/XMLResponseParser.java | 1 + 34 files changed, 80 insertions(+), 127 deletions(-) rename lucene/tools/javadoc/{java6 => java7}/package-list (97%) diff --git a/build.xml b/build.xml index 03391873d43..464dd363b6d 100644 --- a/build.xml +++ b/build.xml @@ -210,7 +210,7 @@ SUCCESS: You must right-click your project and choose Refresh. - Your project must use a Java 6 JRE. + Your project must use a Java 7 JRE. @@ -274,16 +274,11 @@ - - - - - - JAVA6_HOME property or environment variable is not defined. + JAVA7_HOME property or environment variable is not defined. @@ -309,7 +304,6 @@ - diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs index 4334d56c90c..c8527279444 100644 --- a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs +++ b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ #Sun Sep 23 13:02:27 EDT 2012 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -18,7 +18,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/dev-tools/maven/README.maven b/dev-tools/maven/README.maven index 9f728ed1a5f..ca8a7ca4841 100644 --- a/dev-tools/maven/README.maven +++ b/dev-tools/maven/README.maven @@ -36,7 +36,7 @@ A. How to use nightly Jenkins-built Lucene/Solr Maven artifacts B. How to generate Lucene/Solr Maven artifacts - Prerequisites: JDK 1.6+ and Ant 1.8.2+ + Prerequisites: JDK 1.7+ and Ant 1.8.2+ Run 'ant generate-maven-artifacts' to create an internal Maven repository, including POMs, binary .jars, source .jars, and javadoc @@ -50,7 +50,7 @@ B. How to generate Lucene/Solr Maven artifacts C. How to deploy Maven artifacts to a repository - Prerequisites: JDK 1.6+ and Ant 1.8.2+ + Prerequisites: JDK 1.7+ and Ant 1.8.2+ You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr, as in B. above. To deploy to a Maven repository, the command is the same @@ -77,7 +77,7 @@ D. How to use Maven to build Lucene/Solr The details, followed by some example Maven commands: - 1. Prerequisites: JDK 1.6+ and Maven 2.2.1 or 3.0.X + 1. Prerequisites: JDK 1.7+ and Maven 2.2.1 or 3.0.X 2. Make sure your sources are up to date. If you checked your sources out from the Apache Subversion repository, run "svn update" from the top diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template index 57a7e8f2ba7..bce51c7c299 100644 --- a/dev-tools/maven/pom.xml.template +++ b/dev-tools/maven/pom.xml.template @@ -43,7 +43,7 @@ http://svn.apache.org/viewvc/lucene/dev/trunk 5.0.0 yyyy-MM-dd HH:mm:ss - 1.6 + 1.7 8.1.8.v20121106 1.6.4 1.3 diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index 9b6aa9a7825..631421a4ff5 100644 --- a/dev-tools/scripts/smokeTestRelease.py +++ b/dev-tools/scripts/smokeTestRelease.py @@ -56,9 +56,7 @@ def unshortenURL(url): return url def javaExe(version): - if version == '1.6': - path = JAVA6_HOME - elif version == '1.7': + if version == '1.7': path = JAVA7_HOME else: raise RuntimeError("unknown Java version '%s'" % version) @@ -73,11 +71,6 @@ def verifyJavaVersion(version): # http://s.apache.org/lusolr32rc2 env = os.environ -try: - JAVA6_HOME = env['JAVA6_HOME'] -except KeyError: - JAVA6_HOME = '/usr/local/jdk1.6.0_27' -print('JAVA6_HOME is %s' % JAVA6_HOME) try: JAVA7_HOME = env['JAVA7_HOME'] @@ -85,7 +78,6 @@ except KeyError: JAVA7_HOME = '/usr/local/jdk1.7.0_01' print('JAVA7_HOME is %s' % JAVA7_HOME) -verifyJavaVersion('1.6') verifyJavaVersion('1.7') # TODO @@ -191,10 +183,10 @@ def checkJARMetaData(desc, jarFile, version): for verify in ( 'Implementation-Vendor: The Apache Software Foundation', - # Make sure 1.6 compiler was used to build release bits: - 'X-Compile-Source-JDK: 1.6', - # Make sure .class files are 1.6 format: - 'X-Compile-Target-JDK: 1.6', + # Make sure 1.7 compiler was used to build release bits: + 'X-Compile-Source-JDK: 1.7', + # Make sure .class files are 1.7 format: + 'X-Compile-Target-JDK: 1.7', # Make sure this matches the version we think we are releasing: 'Specification-Version: %s' % version): if s.find(verify) == -1: @@ -655,15 +647,6 @@ def verifyUnpacked(project, artifact, unpackPath, version, tmpDir): run('%s; ant validate' % javaExe('1.7'), '%s/validate.log' % unpackPath) if project == 'lucene': - print(' run tests w/ Java 6...') - run('%s; ant test' % javaExe('1.6'), '%s/test.log' % unpackPath) - run('%s; ant jar' % javaExe('1.6'), '%s/compile.log' % unpackPath) - testDemo(isSrc, version, '1.6') - # test javadocs - print(' generate javadocs w/ Java 6...') - run('%s; ant javadocs' % javaExe('1.6'), '%s/javadocs.log' % unpackPath) - checkJavadocpath('%s/build/docs' % unpackPath) - print(' run tests w/ Java 7...') run('%s; ant clean test' % javaExe('1.7'), '%s/test.log' % unpackPath) run('%s; ant jar' % javaExe('1.7'), '%s/compile.log' % unpackPath) @@ -675,14 +658,6 @@ def verifyUnpacked(project, artifact, unpackPath, version, tmpDir): else: os.chdir('solr') - # DISABLED until solr tests consistently pass - #print(' run tests w/ Java 6...') - #run('%s; ant test' % javaExe('1.6'), '%s/test.log' % unpackPath) - - # test javadocs - print(' generate javadocs w/ Java 6...') - run('%s; ant javadocs' % javaExe('1.6'), '%s/javadocs.log' % unpackPath) - checkJavadocpath('%s/solr/build/docs' % unpackPath, False) # DISABLED until solr tests consistently pass #print(' run tests w/ Java 7...') @@ -693,10 +668,6 @@ def verifyUnpacked(project, artifact, unpackPath, version, tmpDir): run('%s; ant clean javadocs' % javaExe('1.7'), '%s/javadocs.log' % unpackPath) checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False) - print(' test solr example w/ Java 6...') - run('%s; ant clean example' % javaExe('1.6'), '%s/antexample.log' % unpackPath) - testSolrExample(unpackPath, JAVA6_HOME, True) - print(' test solr example w/ Java 7...') run('%s; ant clean example' % javaExe('1.7'), '%s/antexample.log' % unpackPath) testSolrExample(unpackPath, JAVA7_HOME, True) @@ -710,21 +681,11 @@ def verifyUnpacked(project, artifact, unpackPath, version, tmpDir): checkAllJARs(os.getcwd(), project, version) if project == 'lucene': - testDemo(isSrc, version, '1.6') testDemo(isSrc, version, '1.7') else: checkSolrWAR('%s/example/webapps/solr.war' % unpackPath, version) - print(' copying unpacked distribution for Java 6 ...') - java6UnpackPath = '%s-java6' %unpackPath - if os.path.exists(java6UnpackPath): - shutil.rmtree(java6UnpackPath) - shutil.copytree(unpackPath, java6UnpackPath) - os.chdir(java6UnpackPath) - print(' test solr example w/ Java 6...') - testSolrExample(java6UnpackPath, JAVA6_HOME, False) - print(' copying unpacked distribution for Java 7 ...') java7UnpackPath = '%s-java7' %unpackPath if os.path.exists(java7UnpackPath): diff --git a/lucene/BUILD.txt b/lucene/BUILD.txt index 7ccab370c51..5658305de0c 100644 --- a/lucene/BUILD.txt +++ b/lucene/BUILD.txt @@ -1,19 +1,19 @@ Lucene Build Instructions Basic steps: - 0) Install JDK 1.6 (or greater), Ant 1.8.2+, Ivy 2.2.0 + 0) Install JDK 1.7 (or greater), Ant 1.8.2+, Ivy 2.2.0 1) Download Lucene from Apache and unpack it 2) Connect to the top-level of your Lucene installation 3) Install JavaCC (optional) 4) Run ant -Step 0) Set up your development environment (JDK 1.6 or greater, +Step 0) Set up your development environment (JDK 1.7 or greater, Ant 1.8.2+, Ivy 2.2.0) We'll assume that you know how to get and set up the JDK - if you don't, then we suggest starting at http://java.sun.com and learning more about Java, before returning to this README. Lucene runs with -JDK 1.6 and later. +JDK 1.7 and later. Like many Open Source java projects, Lucene uses Apache Ant for build control. Specifically, you MUST use Ant version 1.8.2+. diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index e05587ca883..206052b58e1 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -19,6 +19,11 @@ Changes in backwards compatibility policy (Nikola Tanković, Uwe Schindler, Chris Male, Mike McCandless, Robert Muir) +New Features + +* LUCENE-4747: Move to Java 7 as minimum Java version. + (Robert Muir, Uwe Schindler) + ======================= Lucene 4.3.0 ======================= Changes in backwards compatibility policy diff --git a/lucene/SYSTEM_REQUIREMENTS.txt b/lucene/SYSTEM_REQUIREMENTS.txt index d5edcc6766e..7973b70c72f 100644 --- a/lucene/SYSTEM_REQUIREMENTS.txt +++ b/lucene/SYSTEM_REQUIREMENTS.txt @@ -1,6 +1,6 @@ # System Requirements -Apache Lucene runs of Java 6 or greater. When using Java 7, be sure to +Apache Lucene runs of Java 7 or greater. When using Java 7, be sure to install at least Update 1! With all Java versions it is strongly recommended to not use experimental `-XX` JVM options. It is also recommended to always use the latest update version of your Java VM, diff --git a/lucene/build.xml b/lucene/build.xml index 9ba696fee1a..e0af8ffba77 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -439,7 +439,7 @@ - + diff --git a/lucene/common-build.xml b/lucene/common-build.xml index 3ef60df4220..cf7aaa308e3 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -143,16 +143,16 @@ - - - - + + + + - + - + @@ -253,7 +253,7 @@ @@ -282,10 +282,7 @@ - - - - + @@ -1662,7 +1659,7 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites - + @@ -1691,8 +1688,8 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites description="WARNING: This API is experimental and might change in incompatible ways in the next release."/> - - + + Copyright © ${year} Apache Software Foundation. All Rights Reserved. @@ -1762,10 +1759,10 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites - - + + + dest="${javadoc.packagelist.dir}/java7/package-list" ignoreerrors="true"/> diff --git a/lucene/core/src/java/org/apache/lucene/util/Constants.java b/lucene/core/src/java/org/apache/lucene/util/Constants.java index 086ba2b4b75..1bbfb6a96d1 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Constants.java +++ b/lucene/core/src/java/org/apache/lucene/util/Constants.java @@ -51,12 +51,11 @@ public final class Constants { public static final String OS_VERSION = System.getProperty("os.version"); public static final String JAVA_VENDOR = System.getProperty("java.vendor"); - /** @deprecated With Lucene 4.0, we are always on Java 6 */ + /** @deprecated With Lucene 5.0, we are always on Java 7 */ @Deprecated - public static final boolean JRE_IS_MINIMUM_JAVA6 = + public static final boolean JRE_IS_MINIMUM_JAVA7 = new Boolean(true).booleanValue(); // prevent inlining in foreign class files - - public static final boolean JRE_IS_MINIMUM_JAVA7; + public static final boolean JRE_IS_MINIMUM_JAVA8; /** True iff running on a 64bit JVM */ @@ -87,27 +86,14 @@ public final class Constants { } JRE_IS_64BIT = is64Bit; - // this method only exists in Java 7: - boolean v7 = true; + // this method only exists in Java 8: + boolean v8 = true; try { - Throwable.class.getMethod("getSuppressed"); + Collections.class.getMethod("emptySortedSet"); } catch (NoSuchMethodException nsme) { - v7 = false; - } - JRE_IS_MINIMUM_JAVA7 = v7; - - if (JRE_IS_MINIMUM_JAVA7) { - // this method only exists in Java 8: - boolean v8 = true; - try { - Collections.class.getMethod("emptySortedSet"); - } catch (NoSuchMethodException nsme) { - v8 = false; - } - JRE_IS_MINIMUM_JAVA8 = v8; - } else { - JRE_IS_MINIMUM_JAVA8 = false; + v8 = false; } + JRE_IS_MINIMUM_JAVA8 = v8; } // this method prevents inlining the final version constant in compiled classes, diff --git a/lucene/tools/javadoc/ecj.javadocs.prefs b/lucene/tools/javadoc/ecj.javadocs.prefs index c4952058f69..b7398861cc4 100644 --- a/lucene/tools/javadoc/ecj.javadocs.prefs +++ b/lucene/tools/javadoc/ecj.javadocs.prefs @@ -1,7 +1,7 @@ #Sun Sep 23 20:55:03 EDT 2012 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -88,4 +88,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/lucene/tools/javadoc/java6/package-list b/lucene/tools/javadoc/java7/package-list similarity index 97% rename from lucene/tools/javadoc/java6/package-list rename to lucene/tools/javadoc/java7/package-list index 3e918cda54a..b52fe94b6a1 100644 --- a/lucene/tools/javadoc/java6/package-list +++ b/lucene/tools/javadoc/java7/package-list @@ -17,6 +17,7 @@ java.io java.lang java.lang.annotation java.lang.instrument +java.lang.invoke java.lang.management java.lang.ref java.lang.reflect @@ -27,6 +28,9 @@ java.nio.channels java.nio.channels.spi java.nio.charset java.nio.charset.spi +java.nio.file +java.nio.file.attribute +java.nio.file.spi java.rmi java.rmi.activation java.rmi.dgc @@ -120,6 +124,7 @@ javax.swing.plaf javax.swing.plaf.basic javax.swing.plaf.metal javax.swing.plaf.multi +javax.swing.plaf.nimbus javax.swing.plaf.synth javax.swing.table javax.swing.text @@ -163,6 +168,7 @@ javax.xml.ws.handler.soap javax.xml.ws.http javax.xml.ws.soap javax.xml.ws.spi +javax.xml.ws.spi.http javax.xml.ws.wsaddressing javax.xml.xpath org.ietf.jgss diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 702eca293a5..7045a49a83e 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -12,7 +12,7 @@ See http://lucene.apache.org/solr for more information. Getting Started --------------- -You need a Java 1.6 VM or later installed. +You need a Java 1.7 VM or later installed. In this release, there is an example Solr server including a bundled servlet container in the directory named "example". See the tutorial at http://lucene.apache.org/solr/tutorial.html diff --git a/solr/README.txt b/solr/README.txt index 7b5ec4790c8..2872300cbde 100644 --- a/solr/README.txt +++ b/solr/README.txt @@ -62,10 +62,10 @@ docs/index.html Instructions for Building Apache Solr from Source ------------------------------------------------- -1. Download the Java SE 6 JDK (Java Development Kit) or later from http://java.sun.com/ +1. Download the Java SE 7 JDK (Java Development Kit) or later from http://java.sun.com/ You will need the JDK installed, and the $JAVA_HOME/bin (Windows: %JAVA_HOME%\bin) folder included on your command path. To test this, issue a "java -version" command - from your shell (command prompt) and verify that the Java version is 1.6 or later. + from your shell (command prompt) and verify that the Java version is 1.7 or later. 2. Download the Apache Ant binary distribution (1.8.2+) from http://ant.apache.org/ You will need Ant installed and the $ANT_HOME/bin (Windows: diff --git a/solr/SYSTEM_REQUIREMENTS.txt b/solr/SYSTEM_REQUIREMENTS.txt index 9b38cbf24f6..f06ce37b6b9 100644 --- a/solr/SYSTEM_REQUIREMENTS.txt +++ b/solr/SYSTEM_REQUIREMENTS.txt @@ -1,6 +1,6 @@ # System Requirements -Apache Solr runs of Java 6 or greater. When using Java 7, be sure to +Apache Solr runs of Java 7 or greater. When using Java 7, be sure to install at least Update 1! With all Java versions it is strongly recommended to not use experimental `-XX` JVM options. It is also recommended to always use the latest update version of your Java VM, diff --git a/solr/build.xml b/solr/build.xml index 8ef54fea7d3..4985f48575a 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -409,7 +409,7 @@ - + diff --git a/solr/common-build.xml b/solr/common-build.xml index 0c07a698603..f33f49565ab 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -29,9 +29,9 @@ - - - + + + diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml index 64ca87a3be5..9afe1f086eb 100644 --- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml +++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml @@ -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.6.0/docs/api/java/util/regex/package-summary.html + http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html --> diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml index 6a1dddbfade..cd9a0bc3d87 100644 --- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml +++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml @@ -402,7 +402,7 @@ documentation for more information on pattern and replacement string syntax. - http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html + http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html --> diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java index c1602a05fdf..3f44296b0cc 100644 --- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java @@ -91,6 +91,7 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase { inputFactory = XMLInputFactory.newInstance(); try { + // nocommit: still true in 1.7? // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe // XMLInputFactory, as that implementation tries to cache and reuse the // XMLStreamReader. Setting the parser-specific "reuse-instance" property to false diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java index 6211322cef7..9e4940981f7 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java @@ -86,6 +86,7 @@ public class XMLLoader extends ContentStreamLoader { EmptyEntityResolver.configureXMLInputFactory(inputFactory); inputFactory.setXMLReporter(xmllog); try { + // nocommit: still true in 1.7? // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe // XMLInputFactory, as that implementation tries to cache and reuse the // XMLStreamReader. Setting the parser-specific "reuse-instance" property to false diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml index 5c7b4cce0a4..6a8bc6e6208 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml @@ -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.6.0/docs/api/java/util/regex/package-summary.html + http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html -->
    -
  1. Java 1.6 or greater. Some places you can get it are from +
  2. Java 1.7 or greater. Some places you can get it are from Oracle, Open JDK, or IBM.
    • Running java -version at the command - line should indicate a version number starting with 1.6. + line should indicate a version number starting with 1.7.
    • Gnu's GCJ is not supported and does not work with Solr.
    diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java index 5e11e2e91dc..26ec6786296 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java @@ -55,6 +55,7 @@ public class XMLResponseParser extends ResponseParser static { factory = XMLInputFactory.newInstance(); try { + // nocommit: still true for 1.7? // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe // XMLInputFactory, as that implementation tries to cache and reuse the // XMLStreamReader. Setting the parser-specific "reuse-instance" property to false