svn commit: r1652556 - in /nutch/trunk: CHANGES.txt default.properties

[le...@apache.org]

Author: lewismc
Date: Sat Jan 17 02:20:13 2015
New Revision: 1652556

URL: http://svn.apache.org/r1652556
Log:
NUTCH-1920 Upgrade Nutch to use Java 1.7

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/default.properties

Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1652556&r1=1652555&r2=1652556&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Sat Jan 17 02:20:13 2015
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Nutch Current Development 1.10-SNAPSHOT
 
+* NUTCH-1920 Upgrade Nutch to use Java 1.7 (lewismc)
+
 * NUTCH-1919 Getting timeout when server returns Content-Length: 0 (jnioche)
 
 * NUTCH-1912 Dump tool -mimetype parameter needs to be optional to prevent NPE (Tyler Palsulich via lewismc)

Modified: nutch/trunk/default.properties
URL: http://svn.apache.org/viewvc/nutch/trunk/default.properties?rev=1652556&r1=1652555&r2=1652556&view=diff
==============================================================================
--- nutch/trunk/default.properties (original)
+++ nutch/trunk/default.properties Sat Jan 17 02:20:13 2015
@@ -16,7 +16,7 @@
 name=apache-nutch
 version=1.10-SNAPSHOT
 final.name=${name}-${version}
-year=2014
+year=2015
 
 basedir = ./
 src.dir = ./src/java
@@ -42,9 +42,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.1/api/
 javadoc.packages=org.apache.nutch.*
 
 dist.dir=./dist
@@ -54,7 +53,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