Author: lewismc
Date: Wed Jan 28 00:25:58 2015
New Revision: 1655198
URL: http://svn.apache.org/r1655198
Log:
NUTCH-1920 Upgrade Nutch to use Java 1.7
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/default.properties
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1655198&r1=1655197&r2=1655198&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Wed Jan 28 00:25:58 2015
@@ -2,6 +2,8 @@ Nutch Change Log
Current Development 2.4-SNAPSHOT
+* NUTCH-1920 Upgrade Nutch to use Java 1.7 (lewismc)
+
* NUTCH-1893 Parse-tika failes to parse feed files (Mengying Wang via snagel)
Nutch 2.3 Release 08012015 (ddmmyyyy)
Modified: nutch/branches/2.x/default.properties
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/default.properties?rev=1655198&r1=1655197&r2=1655198&view=diff
==============================================================================
--- nutch/branches/2.x/default.properties (original)
+++ nutch/branches/2.x/default.properties Wed Jan 28 00:25:58 2015
@@ -43,9 +43,8 @@ test.build.javadoc = ${test.build.dir}/d
# Proxy Host and Port to use for building JavaDoc
javadoc.proxy.host=-J-DproxyHost=
javadoc.proxy.port=-J-DproxyPort=
-javadoc.link.java=http://java.sun.com/javase/6/docs/api/
-javadoc.link.lucene=http://lucene.apache.org/java/2_9_1/api/all
-javadoc.link.hadoop=http://hadoop.apache.org/common/docs/r0.20.2/api/
+javadoc.link.java=http://docs.oracle.com/javase/7/docs/api/
+javadoc.link.hadoop=http://hadoop.apache.org/docs/r1.2.0/api/
javadoc.packages=org.apache.nutch.*
dist.dir=./dist
@@ -55,7 +54,7 @@ bin.dist.version.dir=${dist.dir}/${final
javac.debug=on
javac.optimize=on
javac.deprecation=on
-javac.version= 1.6
+javac.version= 1.7
runtime.dir=./runtime
runtime.deploy=${runtime.dir}/deploy