svn commit: r1799421 - in /pig/trunk: CHANGES.txt build.xml

[szita]

Author: szita
Date: Wed Jun 21 09:59:36 2017
New Revision: 1799421

URL: http://svn.apache.org/viewvc?rev=1799421&view=rev
Log:
PIG-5262: Fix jdiff related issues: fail build upon error, correct xml 
character escaping (szita)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1799421&r1=1799420&r2=1799421&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jun 21 09:59:36 2017
@@ -32,6 +32,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5262: Fix jdiff related issues: fail build upon error, correct xml 
character escaping (szita)
+
 PIG-5225: Several unit tests are not annotated with @Test (nkollar via rohini)
 
 

Modified: pig/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1799421&r1=1799420&r2=1799421&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Wed Jun 21 09:59:36 2017
@@ -1574,6 +1574,8 @@
                 <pathelement path="${output.jarfile.core}" />
             </classpath>
         </javadoc>
+        <!-- For some Scala classes <any> is recorded in the jdiff xml as 
return type. Need to xml-escape this properly -->
+        <replace file="${jdiff.xml.dir}/${name}_${version}.xml" 
token="&quot;&lt;any&gt;&quot;" value="&quot;&amp;lt;any&amp;gt;&quot;" />
     </target>
 
     <target name="write-null">
@@ -1601,6 +1603,10 @@
               <pathelement path="${output.jarfile.core}" />
            </classpath>
         </javadoc>
+        <fail message="Failed to generate jdiff change docs">
+            <!-- JDiff errors don't fail the build, have to take care of it 
manually -->
+           <condition><not><available file="${jdiff.build.dir}/changes" 
type="dir" /></not></condition>
+        </fail>
      </target>
 
      <target name="ivy-init-dirs">