Author: jnioche
Date: Tue Jun 17 14:11:23 2014
New Revision: 1603179
URL: http://svn.apache.org/r1603179
Log:
NUTCH-1590 [SECURITY] Frame injection vulnerability in published Javadoc
(jnioche)
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/build.xml
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1603179&r1=1603178&r2=1603179&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Tue Jun 17 14:11:23 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development
+* NUTCH-1590 [SECURITY] Frame injection vulnerability in published Javadoc
(jnioche)
+
* NUTCH-1793 HttpRobotRulesParser not configured properly (jnioche)
* NUTCH-1647 protocol-http throws 'unzipBestEffort returned null' for
redirected pages (jnioche)
Modified: nutch/trunk/build.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1603179&r1=1603178&r2=1603179&view=diff
==============================================================================
--- nutch/trunk/build.xml (original)
+++ nutch/trunk/build.xml Tue Jun 17 14:11:23 2014
@@ -138,6 +138,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"
@@ -528,6 +539,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"
