Author: kwright
Date: Sat Aug 11 08:40:39 2018
New Revision: 1837849
URL: http://svn.apache.org/viewvc?rev=1837849&view=rev
Log:
Get forbidden checks working against framework code
Modified:
manifoldcf/trunk/build.xml
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1837849&r1=1837848&r2=1837849&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Aug 11 08:40:39 2018
@@ -2926,14 +2926,25 @@ Use Apache Forrest version forrest-0.9-d
<ant dir="site" target="download-cleanup"/>
</target>
- <!--taskdef name="forbiddenapis"
classname="de.thetaphi.forbiddenapis.ant.AntTask"
classpath="lib/forbiddenapis-2.2.jar"/>
-
- <target name="forbidden-checks" depends="build">
+ <target name="forbidden-taskdef">
+ <taskdef name="forbiddenapis"
classname="de.thetaphi.forbiddenapis.ant.AntTask"
classpath="lib/forbiddenapis-2.2.jar"/>
+ </target>
+
+ <target name="forbidden-checks" depends="forbidden-taskdef,build">
<forbiddenapis failOnMissingClasses="false" targetVersion="1.7">
<classpath>
+ <fileset dir="lib">
+ <include name="less4j*.jar"/>
+ </fileset>
<fileset dir="dist/lib">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="dist/connector-common-lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="dist/test-lib">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
<bundledsignatures name="jdk-unsafe"/>
<bundledsignatures name="jdk-non-portable"/>
@@ -2941,8 +2952,8 @@ Use Apache Forrest version forrest-0.9-d
<include name="**/*.class"/>
</fileset>
</forbiddenapis>
- </target -->
+ </target>
- <target name="precommit" description="Run basic checks before committing"
depends="rat-sources"/>
+ <target name="precommit" description="Run basic checks before committing"
depends="rat-sources,forbidden-checks"/>
</project>
