Index: build.xml =================================================================== --- build.xml (revision 1457695) +++ build.xml (working copy) @@ -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 @@ - Index: dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs =================================================================== --- dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs (revision 1457695) +++ dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs (working copy) @@ -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.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 Index: dev-tools/maven/pom.xml.template =================================================================== --- dev-tools/maven/pom.xml.template (revision 1457695) +++ dev-tools/maven/pom.xml.template (working copy) @@ -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 Index: dev-tools/maven/README.maven =================================================================== --- dev-tools/maven/README.maven (revision 1457695) +++ dev-tools/maven/README.maven (working copy) @@ -36,7 +36,7 @@ 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 @@ 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 @@ 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 Index: dev-tools/scripts/smokeTestRelease.py =================================================================== --- dev-tools/scripts/smokeTestRelease.py (revision 1457695) +++ dev-tools/scripts/smokeTestRelease.py (working copy) @@ -56,9 +56,7 @@ 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 @@ # 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 @@ 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 @@ 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 @@ 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,15 +658,7 @@ 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...') #run('%s; ant test' % javaExe('1.7'), '%s/test.log' % unpackPath) @@ -693,10 +668,6 @@ 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 @@ 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): Index: lucene/BUILD.txt =================================================================== --- lucene/BUILD.txt (revision 1457695) +++ lucene/BUILD.txt (working copy) @@ -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+. Index: lucene/build.xml =================================================================== --- lucene/build.xml (revision 1457695) +++ lucene/build.xml (working copy) @@ -439,7 +439,7 @@ - + Index: lucene/common-build.xml =================================================================== --- lucene/common-build.xml (revision 1457695) +++ lucene/common-build.xml (working copy) @@ -143,16 +143,16 @@ - - - - + + + + - + - + @@ -253,7 +253,7 @@ @@ -282,10 +282,7 @@ - - - - + @@ -1662,7 +1659,7 @@ - + @@ -1691,8 +1688,8 @@ 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 @@ - - + + + dest="${javadoc.packagelist.dir}/java7/package-list" ignoreerrors="true"/> Index: lucene/core/src/java/org/apache/lucene/util/Constants.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/Constants.java (revision 1457695) +++ lucene/core/src/java/org/apache/lucene/util/Constants.java (working copy) @@ -51,12 +51,11 @@ 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 @@ } 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; + v8 = 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; - } + JRE_IS_MINIMUM_JAVA8 = v8; } // this method prevents inlining the final version constant in compiled classes, Index: lucene/SYSTEM_REQUIREMENTS.txt =================================================================== --- lucene/SYSTEM_REQUIREMENTS.txt (revision 1457695) +++ lucene/SYSTEM_REQUIREMENTS.txt (working copy) @@ -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, Index: lucene/tools/javadoc/ecj.javadocs.prefs =================================================================== --- lucene/tools/javadoc/ecj.javadocs.prefs (revision 1457695) +++ lucene/tools/javadoc/ecj.javadocs.prefs (working copy) @@ -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.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 Index: lucene/tools/javadoc/java6/package-list =================================================================== --- lucene/tools/javadoc/java6/package-list (revision 1457695) +++ lucene/tools/javadoc/java6/package-list (working copy) @@ -1,203 +0,0 @@ -java.applet -java.awt -java.awt.color -java.awt.datatransfer -java.awt.dnd -java.awt.event -java.awt.font -java.awt.geom -java.awt.im -java.awt.im.spi -java.awt.image -java.awt.image.renderable -java.awt.print -java.beans -java.beans.beancontext -java.io -java.lang -java.lang.annotation -java.lang.instrument -java.lang.management -java.lang.ref -java.lang.reflect -java.math -java.net -java.nio -java.nio.channels -java.nio.channels.spi -java.nio.charset -java.nio.charset.spi -java.rmi -java.rmi.activation -java.rmi.dgc -java.rmi.registry -java.rmi.server -java.security -java.security.acl -java.security.cert -java.security.interfaces -java.security.spec -java.sql -java.text -java.text.spi -java.util -java.util.concurrent -java.util.concurrent.atomic -java.util.concurrent.locks -java.util.jar -java.util.logging -java.util.prefs -java.util.regex -java.util.spi -java.util.zip -javax.accessibility -javax.activation -javax.activity -javax.annotation -javax.annotation.processing -javax.crypto -javax.crypto.interfaces -javax.crypto.spec -javax.imageio -javax.imageio.event -javax.imageio.metadata -javax.imageio.plugins.bmp -javax.imageio.plugins.jpeg -javax.imageio.spi -javax.imageio.stream -javax.jws -javax.jws.soap -javax.lang.model -javax.lang.model.element -javax.lang.model.type -javax.lang.model.util -javax.management -javax.management.loading -javax.management.modelmbean -javax.management.monitor -javax.management.openmbean -javax.management.relation -javax.management.remote -javax.management.remote.rmi -javax.management.timer -javax.naming -javax.naming.directory -javax.naming.event -javax.naming.ldap -javax.naming.spi -javax.net -javax.net.ssl -javax.print -javax.print.attribute -javax.print.attribute.standard -javax.print.event -javax.rmi -javax.rmi.CORBA -javax.rmi.ssl -javax.script -javax.security.auth -javax.security.auth.callback -javax.security.auth.kerberos -javax.security.auth.login -javax.security.auth.spi -javax.security.auth.x500 -javax.security.cert -javax.security.sasl -javax.sound.midi -javax.sound.midi.spi -javax.sound.sampled -javax.sound.sampled.spi -javax.sql -javax.sql.rowset -javax.sql.rowset.serial -javax.sql.rowset.spi -javax.swing -javax.swing.border -javax.swing.colorchooser -javax.swing.event -javax.swing.filechooser -javax.swing.plaf -javax.swing.plaf.basic -javax.swing.plaf.metal -javax.swing.plaf.multi -javax.swing.plaf.synth -javax.swing.table -javax.swing.text -javax.swing.text.html -javax.swing.text.html.parser -javax.swing.text.rtf -javax.swing.tree -javax.swing.undo -javax.tools -javax.transaction -javax.transaction.xa -javax.xml -javax.xml.bind -javax.xml.bind.annotation -javax.xml.bind.annotation.adapters -javax.xml.bind.attachment -javax.xml.bind.helpers -javax.xml.bind.util -javax.xml.crypto -javax.xml.crypto.dom -javax.xml.crypto.dsig -javax.xml.crypto.dsig.dom -javax.xml.crypto.dsig.keyinfo -javax.xml.crypto.dsig.spec -javax.xml.datatype -javax.xml.namespace -javax.xml.parsers -javax.xml.soap -javax.xml.stream -javax.xml.stream.events -javax.xml.stream.util -javax.xml.transform -javax.xml.transform.dom -javax.xml.transform.sax -javax.xml.transform.stax -javax.xml.transform.stream -javax.xml.validation -javax.xml.ws -javax.xml.ws.handler -javax.xml.ws.handler.soap -javax.xml.ws.http -javax.xml.ws.soap -javax.xml.ws.spi -javax.xml.ws.wsaddressing -javax.xml.xpath -org.ietf.jgss -org.omg.CORBA -org.omg.CORBA.DynAnyPackage -org.omg.CORBA.ORBPackage -org.omg.CORBA.TypeCodePackage -org.omg.CORBA.portable -org.omg.CORBA_2_3 -org.omg.CORBA_2_3.portable -org.omg.CosNaming -org.omg.CosNaming.NamingContextExtPackage -org.omg.CosNaming.NamingContextPackage -org.omg.Dynamic -org.omg.DynamicAny -org.omg.DynamicAny.DynAnyFactoryPackage -org.omg.DynamicAny.DynAnyPackage -org.omg.IOP -org.omg.IOP.CodecFactoryPackage -org.omg.IOP.CodecPackage -org.omg.Messaging -org.omg.PortableInterceptor -org.omg.PortableInterceptor.ORBInitInfoPackage -org.omg.PortableServer -org.omg.PortableServer.CurrentPackage -org.omg.PortableServer.POAManagerPackage -org.omg.PortableServer.POAPackage -org.omg.PortableServer.ServantLocatorPackage -org.omg.PortableServer.portable -org.omg.SendingContext -org.omg.stub.java.rmi -org.w3c.dom -org.w3c.dom.bootstrap -org.w3c.dom.events -org.w3c.dom.ls -org.xml.sax -org.xml.sax.ext -org.xml.sax.helpers Index: lucene/tools/javadoc/java7/package-list =================================================================== --- lucene/tools/javadoc/java7/package-list (revision 0) +++ lucene/tools/javadoc/java7/package-list (working copy) @@ -0,0 +1,209 @@ +java.applet +java.awt +java.awt.color +java.awt.datatransfer +java.awt.dnd +java.awt.event +java.awt.font +java.awt.geom +java.awt.im +java.awt.im.spi +java.awt.image +java.awt.image.renderable +java.awt.print +java.beans +java.beans.beancontext +java.io +java.lang +java.lang.annotation +java.lang.instrument +java.lang.invoke +java.lang.management +java.lang.ref +java.lang.reflect +java.math +java.net +java.nio +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 +java.rmi.registry +java.rmi.server +java.security +java.security.acl +java.security.cert +java.security.interfaces +java.security.spec +java.sql +java.text +java.text.spi +java.util +java.util.concurrent +java.util.concurrent.atomic +java.util.concurrent.locks +java.util.jar +java.util.logging +java.util.prefs +java.util.regex +java.util.spi +java.util.zip +javax.accessibility +javax.activation +javax.activity +javax.annotation +javax.annotation.processing +javax.crypto +javax.crypto.interfaces +javax.crypto.spec +javax.imageio +javax.imageio.event +javax.imageio.metadata +javax.imageio.plugins.bmp +javax.imageio.plugins.jpeg +javax.imageio.spi +javax.imageio.stream +javax.jws +javax.jws.soap +javax.lang.model +javax.lang.model.element +javax.lang.model.type +javax.lang.model.util +javax.management +javax.management.loading +javax.management.modelmbean +javax.management.monitor +javax.management.openmbean +javax.management.relation +javax.management.remote +javax.management.remote.rmi +javax.management.timer +javax.naming +javax.naming.directory +javax.naming.event +javax.naming.ldap +javax.naming.spi +javax.net +javax.net.ssl +javax.print +javax.print.attribute +javax.print.attribute.standard +javax.print.event +javax.rmi +javax.rmi.CORBA +javax.rmi.ssl +javax.script +javax.security.auth +javax.security.auth.callback +javax.security.auth.kerberos +javax.security.auth.login +javax.security.auth.spi +javax.security.auth.x500 +javax.security.cert +javax.security.sasl +javax.sound.midi +javax.sound.midi.spi +javax.sound.sampled +javax.sound.sampled.spi +javax.sql +javax.sql.rowset +javax.sql.rowset.serial +javax.sql.rowset.spi +javax.swing +javax.swing.border +javax.swing.colorchooser +javax.swing.event +javax.swing.filechooser +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 +javax.swing.text.html +javax.swing.text.html.parser +javax.swing.text.rtf +javax.swing.tree +javax.swing.undo +javax.tools +javax.transaction +javax.transaction.xa +javax.xml +javax.xml.bind +javax.xml.bind.annotation +javax.xml.bind.annotation.adapters +javax.xml.bind.attachment +javax.xml.bind.helpers +javax.xml.bind.util +javax.xml.crypto +javax.xml.crypto.dom +javax.xml.crypto.dsig +javax.xml.crypto.dsig.dom +javax.xml.crypto.dsig.keyinfo +javax.xml.crypto.dsig.spec +javax.xml.datatype +javax.xml.namespace +javax.xml.parsers +javax.xml.soap +javax.xml.stream +javax.xml.stream.events +javax.xml.stream.util +javax.xml.transform +javax.xml.transform.dom +javax.xml.transform.sax +javax.xml.transform.stax +javax.xml.transform.stream +javax.xml.validation +javax.xml.ws +javax.xml.ws.handler +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 +org.omg.CORBA +org.omg.CORBA.DynAnyPackage +org.omg.CORBA.ORBPackage +org.omg.CORBA.TypeCodePackage +org.omg.CORBA.portable +org.omg.CORBA_2_3 +org.omg.CORBA_2_3.portable +org.omg.CosNaming +org.omg.CosNaming.NamingContextExtPackage +org.omg.CosNaming.NamingContextPackage +org.omg.Dynamic +org.omg.DynamicAny +org.omg.DynamicAny.DynAnyFactoryPackage +org.omg.DynamicAny.DynAnyPackage +org.omg.IOP +org.omg.IOP.CodecFactoryPackage +org.omg.IOP.CodecPackage +org.omg.Messaging +org.omg.PortableInterceptor +org.omg.PortableInterceptor.ORBInitInfoPackage +org.omg.PortableServer +org.omg.PortableServer.CurrentPackage +org.omg.PortableServer.POAManagerPackage +org.omg.PortableServer.POAPackage +org.omg.PortableServer.ServantLocatorPackage +org.omg.PortableServer.portable +org.omg.SendingContext +org.omg.stub.java.rmi +org.w3c.dom +org.w3c.dom.bootstrap +org.w3c.dom.events +org.w3c.dom.ls +org.xml.sax +org.xml.sax.ext +org.xml.sax.helpers Index: lucene/tools/javadoc/java7/package-list =================================================================== --- lucene/tools/javadoc/java7/package-list (revision 0) +++ lucene/tools/javadoc/java7/package-list (working copy) Property changes on: lucene/tools/javadoc/java7/package-list ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: solr/build.xml =================================================================== --- solr/build.xml (revision 1457695) +++ solr/build.xml (working copy) @@ -409,7 +409,7 @@ - + Index: solr/CHANGES.txt =================================================================== --- solr/CHANGES.txt (revision 1457695) +++ solr/CHANGES.txt (working copy) @@ -12,7 +12,7 @@ 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 Index: solr/common-build.xml =================================================================== --- solr/common-build.xml (revision 1457695) +++ solr/common-build.xml (working copy) @@ -29,9 +29,9 @@ - - - + + + Index: solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml =================================================================== --- solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml (revision 1457695) +++ solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml (working copy) @@ -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 --> Index: solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml =================================================================== --- solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml (revision 1457695) +++ solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml (working copy) @@ -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 --> Index: solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java =================================================================== --- solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (revision 1457695) +++ solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (working copy) @@ -91,6 +91,7 @@ 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 Index: solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (revision 1457695) +++ solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (working copy) @@ -86,6 +86,7 @@ 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 Index: solr/core/src/test-files/solr/collection1/conf/schema-trie.xml =================================================================== --- solr/core/src/test-files/solr/collection1/conf/schema-trie.xml (revision 1457695) +++ solr/core/src/test-files/solr/collection1/conf/schema-trie.xml (working copy) @@ -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.
    Index: solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java =================================================================== --- solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (revision 1457695) +++ solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java (working copy) @@ -55,6 +55,7 @@ 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 Index: solr/SYSTEM_REQUIREMENTS.txt =================================================================== --- solr/SYSTEM_REQUIREMENTS.txt (revision 1457695) +++ solr/SYSTEM_REQUIREMENTS.txt (working copy) @@ -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,