manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1756385 - in /manifoldcf/trunk: build.xml framework/build.xml
Date Mon, 15 Aug 2016 14:07:19 GMT
Author: kwright
Date: Mon Aug 15 14:07:19 2016
New Revision: 1756385

URL: http://svn.apache.org/viewvc?rev=1756385&view=rev
Log:
Remove forbidden API checks targets for now, since they do not work in the way we'd like and
since we're trying to get a release together.

Modified:
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/framework/build.xml

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1756385&r1=1756384&r2=1756385&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Mon Aug 15 14:07:19 2016
@@ -661,6 +661,8 @@ uitest   - Compile and run all UI tests
 ldtest   - Compile and run all local load tests (HSQLDB)
 doc      - Build html site, under the 'dist/doc' directory
            (requires Apache Forrest)
+precommit- Run this target before committing, to check for policy
+           violations
 tmpclean - Clean up temporary files used during build and testing
 image    - Build release image, under the '.' directory (requires
            Apache Forrest)
@@ -2442,10 +2444,35 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="site" target="download-cleanup"/>
     </target>
 
-    <target name="forbidden-checks">
-        <ant dir="framework" target="forbidden-checks"/>
-    </target>
+    <!-- taskdef name="forbiddenapis" classname="de.thetaphi.forbiddenapis.ant.AntTask"
classpath="lib/forbiddenapis-2.2.jar"/ -->
+
+    <!-- target name="forbidden-checks" depends="build">
+        <forbiddenapis failOnMissingClasses="false" targetVersion="1.7">
+            <classpath>
+                <fileset dir="dist/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+            </classpath>
+            <bundledsignatures name="jdk-unsafe"/>
+            <bundledsignatures name="jdk-non-portable"/>
+            <fileset dir="dist/lib">
+                <include name="**/*.jar"/>
+            </fileset>
+            <fileset dir="dist/lib-proprietary">
+                <include name="**/*.jar"/>
+            </fileset>
+            <fileset dir="dist/connector-common-lib">
+                <include name="**/*.jar"/>
+            </fileset>
+            <fileset dir="dist/connector-lib">
+                <include name="**/*.jar"/>
+            </fileset>
+            <fileset dir="dist/connector-lib-proprietary">
+                <include name="**/*.jar"/>
+            </fileset>
+        </forbiddenapis>
+    </target -->
 
-    <target name="precommit" description="Run basic checks before committing" depends="forbidden-checks,rat-sources"/>
+    <target name="precommit" description="Run basic checks before committing" depends="rat-sources"/>
 
 </project>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1756385&r1=1756384&r2=1756385&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Mon Aug 15 14:07:19 2016
@@ -160,27 +160,6 @@
         </fileset>
     </path>
 
-    <path id="all-classpath">
-        <fileset dir="../lib">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="../lib-proprietary">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="../connectors/alfresco/lib-proprietary">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="../connectors/jcifs/lib-proprietary">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="../connectors/kafka/test-materials">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="../connectors/elasticsearch/test-materials/elasticsearch-1.0.1/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-
     <target name="file-resources">
         <mkdir dir="dist/file-resources"/>
         <copy todir="dist/file-resources">
@@ -2040,23 +2019,6 @@
         </java>
     </target>
 
-    <taskdef name="forbiddenapis" classname="de.thetaphi.forbiddenapis.ant.AntTask" classpath="../lib/forbiddenapis-2.2.jar"/>
-
-    <target name="forbidden-checks" depends="build">
-        <forbiddenapis failOnMissingClasses="false" targetVersion="1.7">
-            <classpath>
-                <path refid="all-classpath"/>
-            </classpath>
-            <bundledsignatures name="jdk-unsafe"/>
-            <!--<bundledsignatures name="jdk-deprecated"/>-->
-            <bundledsignatures name="jdk-non-portable"/>
-            <fileset dir="../">
-                <exclude name="**/target/**"/>
-                <exclude name="test-materials/**"/>
-            </fileset>
-        </forbiddenapis>
-    </target>
-
     <target name="build" depends="multi-process-zk-example,multi-process-zk-example-proprietary,multi-process-file-example,multi-process-file-example-proprietary,single-process-example,single-process-example-proprietary,example-common,script-engine,obfuscation-utility,file-resources,buildfiles,test-lib"/>
     
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-HSQLDB,run-tests-HSQLDBext"/>



Mime
View raw message