Author: rohini
Date: Sun Jun 15 06:24:19 2025
New Revision: 1926432
URL: http://svn.apache.org/viewvc?rev=1926432&view=rev
Log:
PIG-5470: Make owasp data dependency location configurable (rohini)
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=1926432&r1=1926431&r2=1926432&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Jun 15 06:24:19 2025
@@ -37,6 +37,8 @@ PIG-5282: Upgrade to Java 8 (satishsaley
IMPROVEMENTS
+PIG-5470: Make owasp data dependency location configurable (rohini)
+
PIG-5419: Upgrade Joda time version (vnarayanan7 via rohini)
PIG-5465: Owasp filter out false positives (knoguchi)
Modified: pig/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1926432&r1=1926431&r2=1926432&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Sun Jun 15 06:24:19 2025
@@ -273,7 +273,6 @@
<property name="ivy.lib.dir.spark" location="${ivy.lib.dir}/spark" />
<property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
<property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
- <property name="build.ivy.owasp.dir" location="${build.ivy.dir}/owasp" />
<property name="pom.xml" location="${build.ivy.maven.dir}/pom.xml"/>
<property name="build.ivy.maven.pom"
location="${build.ivy.maven.dir}/pig-${version}.pom" />
<property name="build.ivy.maven.jar"
location="${build.ivy.maven.dir}/pig-${version}-core.jar" />
@@ -292,6 +291,11 @@
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="[artifact]-[revision].[ext]"/>
+ <!-- owasp properties -->
+ <property name="build.ivy.owasp.dir" location="${build.ivy.dir}/owasp" />
+ <property name="owasp.data.directory" location=""/>
+ <property name="owasp.auto.update" value="true" />
+
<!-- jdiff properties -->
<property name="jdiff.jar"
value="${ivy.lib.dir}/jdiff-${jdiff.version}.jar"/>
<property name="xerces.jar"
value="${ivy.lib.dir}/xercesImpl-${xerces.version}.jar"/>
@@ -1219,10 +1223,6 @@
<fileset dir="${basedir}/shims" />
</copy>
- <copy todir="${tar.dist.dir}/hive-shims" includeEmptyDirs="true">
- <fileset dir="${basedir}/hive-shims" />
- </copy>
-
<copy todir="${tar.dist.dir}/lib-src" includeEmptyDirs="true">
<fileset dir="${src.lib.dir}" />
</copy>
@@ -1532,6 +1532,8 @@
reportoutputdirectory="${build.dir}/owasp"
reportformat="ALL"
failBuildOnCVSS="0"
+ autoUpdate="${owasp.auto.update}"
+ dataDirectory="${owasp.data.directory}"
suppressionFile="conf/owasp-dependency-check-suppressions.xml">
<fileset dir="${ivy.lib.dir}">
