You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2010/05/18 23:30:41 UTC
svn commit: r945897 - in /lucene/dev/trunk/solr: CHANGES.txt README.txt
common-build.xml
Author: hossman
Date: Tue May 18 21:30:41 2010
New Revision: 945897
URL: http://svn.apache.org/viewvc?rev=945897&view=rev
Log:
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
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/README.txt
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=945897&r1=945896&r2=945897&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue May 18 21:30:41 2010
@@ -13,7 +13,7 @@ See http://lucene.apache.org/solr for mo
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
servlet container in the directory named "example".
See the tutorial at http://lucene.apache.org/solr/tutorial.html
@@ -21,7 +21,7 @@ See the tutorial at http://lucene.apache
$Id$
-================== 3.1.0-dev ==================
+================== 4.0.0-dev ==================
Versions of Major Components
---------------------
Apache Lucene trunk
Modified: lucene/dev/trunk/solr/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/README.txt?rev=945897&r1=945896&r2=945897&view=diff
==============================================================================
--- lucene/dev/trunk/solr/README.txt (original)
+++ lucene/dev/trunk/solr/README.txt Tue May 18 21:30:41 2010
@@ -65,10 +65,10 @@ src/
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
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.
You will need Ant installed and the %ANT_HOME%\bin directory included on your
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=945897&r1=945896&r2=945897&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Tue May 18 21:30:41 2010
@@ -55,7 +55,7 @@
<property name="svnversion.exe" value="svnversion" />
<!-- 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 -->
<!--
@@ -94,7 +94,7 @@
<property name="javadoc.years" value="2006 - ${year}" />
<property name="javadoc.access" value="protected"/>
<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"
value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.link.lucene"