commit 20039228a783f5defc04b537e8507a892c1bb3c6
author Ádám Szita <szita@apache.org> Wed Jun 21 09:59:36 2017 +0000
committer Ádám Szita <szita@apache.org> Wed Jun 21 09:59:36 2017 +0000
tree 2607da7a7337216ab683e9d949fa10ce3122742e
parent a14e189a92933bb6a718ccf76fc8f56960c35254

PIG-5262: Fix jdiff related issues: fail build upon error, correct xml character escaping (szita)

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1799421 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 48f37bd..6a267c2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,6 +32,8 @@
  
 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)
 
 

build.xml

diff --git a/build.xml b/build.xml
index ec3a7f2..d274af9 100644
--- a/build.xml
+++ b/build.xml
@@ -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">