trunk has been labeled 'version 4.0-dev' for a while now, so making CHANGES.txt reflect that. also updating various old refrences to Java 1.5 since recent changes actually require Java 1.6

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@945897 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2010-05-18 21:30:41 +00:00
parent 0ddd505d9a
commit 8ae84e0122
3 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@ See http://lucene.apache.org/solr for more information.
Getting Started Getting Started
--------------- ---------------
You need a Java 1.5 VM or later installed. You need a Java 1.6 VM or later installed.
In this release, there is an example Solr server including a bundled In this release, there is an example Solr server including a bundled
servlet container in the directory named "example". servlet container in the directory named "example".
See the tutorial at http://lucene.apache.org/solr/tutorial.html See the tutorial at http://lucene.apache.org/solr/tutorial.html
@ -21,7 +21,7 @@ See the tutorial at http://lucene.apache.org/solr/tutorial.html
$Id$ $Id$
================== 3.1.0-dev ================== ================== 4.0.0-dev ==================
Versions of Major Components Versions of Major Components
--------------------- ---------------------
Apache Lucene trunk Apache Lucene trunk

View File

@ -65,10 +65,10 @@ src/
Instructions for Building Apache Solr from Source Instructions for Building Apache Solr from Source
------------------------------------------------- -------------------------------------------------
1. Download the J2SE 5.0 JDK (Java Development Kit) or later from http://java.sun.com. 1. Download the Java SE 6 JDK (Java Development Kit) or later from http://java.sun.com.
You will need the JDK installed, and the %JAVA_HOME%\bin directory included You will need the JDK installed, and the %JAVA_HOME%\bin directory included
on your command path. To test this, issue a "java -version" command from your on your command path. To test this, issue a "java -version" command from your
shell and verify that the Java version is 5.0 or later. shell and verify that the Java version is 1.6 or later.
2. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org. 2. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
You will need Ant installed and the %ANT_HOME%\bin directory included on your You will need Ant installed and the %ANT_HOME%\bin directory included on your

View File

@ -55,7 +55,7 @@
<property name="svnversion.exe" value="svnversion" /> <property name="svnversion.exe" value="svnversion" />
<!-- Java Version we are compatible with --> <!-- Java Version we are compatible with -->
<property name="java.compat.version" value="1.5" /> <property name="java.compat.version" value="1.6" />
<!-- Solr Implementation Version --> <!-- Solr Implementation Version -->
<!-- <!--
@ -94,7 +94,7 @@
<property name="javadoc.years" value="2006 - ${year}" /> <property name="javadoc.years" value="2006 - ${year}" />
<property name="javadoc.access" value="protected"/> <property name="javadoc.access" value="protected"/>
<property name="javadoc.link.java" <property name="javadoc.link.java"
value="http://java.sun.com/j2se/1.5.0/docs/api/"/> value="http://java.sun.com/javase/6/docs/api/"/>
<property name="javadoc.link.junit" <property name="javadoc.link.junit"
value="http://junit.sourceforge.net/javadoc/"/> value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.link.lucene" <property name="javadoc.link.lucene"