You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2016/05/24 12:46:25 UTC
[1/2] nutch git commit: NUTCH-2089 Move Nutch to compile on JDK 8
Repository: nutch
Updated Branches:
refs/heads/2.x 3f9ad62d5 -> 9a349a1f4
NUTCH-2089 Move Nutch to compile on JDK 8
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/581c5a4d
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/581c5a4d
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/581c5a4d
Branch: refs/heads/2.x
Commit: 581c5a4d1b1db2205f6ffe07cc439b7331dfac2f
Parents: 72a99cf
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Mon May 23 13:27:18 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Mon May 23 13:27:18 2016 -0700
----------------------------------------------------------------------
default.properties | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/581c5a4d/default.properties
----------------------------------------------------------------------
diff --git a/default.properties b/default.properties
index c95435a..ccc0d57 100644
--- a/default.properties
+++ b/default.properties
@@ -43,8 +43,8 @@ test.build.javadoc = ${test.build.dir}/docs/api
# Proxy Host and Port to use for building JavaDoc
javadoc.proxy.host=-J-DproxyHost=
javadoc.proxy.port=-J-DproxyPort=
-javadoc.link.java=http://docs.oracle.com/javase/7/docs/api/
-javadoc.link.hadoop=http://hadoop.apache.org/docs/r1.2.0/api/
+javadoc.link.java=http://docs.oracle.com/javase/8/docs/api/
+javadoc.link.hadoop=http://hadoop.apache.org/docs/r2.5.2/api/
javadoc.packages=org.apache.nutch.*
dist.dir=./dist
@@ -54,7 +54,7 @@ bin.dist.version.dir=${dist.dir}/${final.name}-bin
javac.debug=on
javac.optimize=on
javac.deprecation=on
-javac.version= 1.7
+javac.version= 1.8
runtime.dir=./runtime
runtime.deploy=${runtime.dir}/deploy
@@ -146,7 +146,6 @@ plugins.index=\
org.apache.nutch.indexer.anchor*:\
org.apache.nutch.indexer.basic*:\
org.apache.nutch.indexer.feed*:\
- org.apache.nutch.indexer.html*:\
org.apache.nutch.indexer.metadata*:\
org.apache.nutch.indexer.more*:\
org.apache.nutch.indexer.subcollection*:\
[2/2] nutch git commit: Merge NUTCH-2089 Move Nutch 2.x to compile on
JDK 8
Posted by le...@apache.org.
Merge NUTCH-2089 Move Nutch 2.x to compile on JDK 8
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/9a349a1f
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/9a349a1f
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/9a349a1f
Branch: refs/heads/2.x
Commit: 9a349a1f48b3e3a474eaa4d69d362ee4af612a5d
Parents: 3f9ad62 581c5a4
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Tue May 24 05:51:43 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Tue May 24 05:51:43 2016 -0700
----------------------------------------------------------------------
default.properties | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/9a349a1f/default.properties
----------------------------------------------------------------------
diff --cc default.properties
index 5e5f3dd,ccc0d57..8e11ebf
--- a/default.properties
+++ b/default.properties
@@@ -43,11 -43,8 +43,11 @@@ test.build.javadoc = ${test.build.dir}/
# Proxy Host and Port to use for building JavaDoc
javadoc.proxy.host=-J-DproxyHost=
javadoc.proxy.port=-J-DproxyPort=
- javadoc.link.java=http://docs.oracle.com/javase/7/docs/api/
- javadoc.link.hadoop=http://hadoop.apache.org/docs/r1.2.0/api/
+ javadoc.link.java=http://docs.oracle.com/javase/8/docs/api/
+ javadoc.link.hadoop=http://hadoop.apache.org/docs/r2.5.2/api/
+javadoc.link.lucene.core=https://lucene.apache.org/core/4_6_0/core/
+javadoc.link.lucene.analyzers-common=https://lucene.apache.org/core/4_6_0/analyzers-common/
+javadoc.link.solr-solrj=https://lucene.apache.org/solr/4_6_0/solr-solrj/
javadoc.packages=org.apache.nutch.*
dist.dir=./dist