You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by jn...@apache.org on 2014/06/17 16:16:39 UTC
svn commit: r1603181 - in /nutch/branches/2.x: CHANGES.txt build.xml
Author: jnioche
Date: Tue Jun 17 14:16:39 2014
New Revision: 1603181
URL: http://svn.apache.org/r1603181
Log:
NUTCH-1590 [SECURITY] Frame injection vulnerability in published Javadoc (jnioche)
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/build.xml
Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1603181&r1=1603180&r2=1603181&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Tue Jun 17 14:16:39 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Current Development
+* NUTCH-1590 [SECURITY] Frame injection vulnerability in published Javadoc (jnioche)
+
* NUTCH-1736 Can't fetch page if http response header contains Transfer-Encodingï¼chunked (ysc via jnioche)
* NUTCH-1782 NodeWalker to return current node (markus)
Modified: nutch/branches/2.x/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/build.xml?rev=1603181&r1=1603180&r2=1603181&view=diff
==============================================================================
--- nutch/branches/2.x/build.xml (original)
+++ nutch/branches/2.x/build.xml Tue Jun 17 14:16:39 2014
@@ -135,6 +135,17 @@
<!-- build the main artifact -->
<jar jarfile="${maven-jar}" basedir="${build.classes}" />
+ <fail message="Unsupported Java version: ${java.version}. Javadoc requires Java version 7u25 or greater. See https://issues.apache.org/jira/browse/NUTCH-1590">
+ <condition>
+ <or>
+ <matches string="${java.version}" pattern="1.7.0_2[01234].+" casesensitive="false" />
+ <matches string="${java.version}" pattern="1.7.0_1.+" casesensitive="false" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </or>
+ </condition>
+ </fail>
+
<!-- build the javadoc artifact -->
<javadoc
destdir="${release.dir}/javadoc"
@@ -552,6 +563,16 @@
<!-- Documentation -->
<!-- ================================================================== -->
<target name="javadoc" depends="compile" description="--> generate Javadoc">
+ <fail message="Unsupported Java version: ${java.version}. Javadoc requires Java version 7u25 or greater. See https://issues.apache.org/jira/browse/NUTCH-1590">
+ <condition>
+ <or>
+ <matches string="${java.version}" pattern="1.7.0_2[01234].+" casesensitive="false" />
+ <matches string="${java.version}" pattern="1.7.0_1.+" casesensitive="false" />
+ <equals arg1="${ant.java.version}" arg2="1.6" />
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </or>
+ </condition>
+ </fail>
<mkdir dir="${build.javadoc}" />
<javadoc
overview="${src.dir}/overview.html"