diff --git a/build.xml b/build.xml
index 94e588d..41afe50 100644
--- a/build.xml
+++ b/build.xml
@@ -14,6 +14,7 @@
<property file="build.properties" />
<property file="version.properties" />
+ <property name="system.dir" value="/usr/share/java" />
<property name="src.dir" value="${basedir}/src/main/java" />
<property name="lib.dir" value="${basedir}/lib" />
<property name="etc.dir" value="${basedir}/etc" />
@@ -99,67 +100,61 @@
<mkdir dir="${samples.classes.dir}" />
<mkdir dir="${javadoc.dir}" />
<path id="fb-contrib.classpath">
- <pathelement location="${lib.dir}/findbugs-${findbugs.version}.jar" />
- <pathelement location="${lib.dir}/bcel-findbugs-${bcel-findbugs.version}.jar" />
- <pathelement location="${lib.dir}/findbugs-annotations-${findbugs-annotations.version}.jar" />
- <pathelement location="${lib.dir}/asm-debug-all-${asm-debug-all.version}.jar" />
- <pathelement location="${lib.dir}/jsr305-${jsr305.version}.jar" />
+ <pathelement location="${system.dir}/findbugs.jar" />
+ <pathelement location="${system.dir}/findbugs-bcel.jar" />
+ <pathelement location="${system.dir}/findbugs-annotations.jar" />
+ <pathelement location="${system.dir}/jcip-annotations.jar" />
+ <pathelement location="${system.dir}/objectweb-asm/asm-all.jar" />
+ <pathelement location="${system.dir}/jsr-305.jar" />
<pathelement location="${main.classes.dir}" />
</path>
<path id="fb-contrib.test.classpath">
- <pathelement location="${lib.dir}/testng-${testng.version}.jar" />
- <pathelement location="${lib.dir}/jcommander-${jcommander.version}.jar" />
- <pathelement location="${lib.dir}/mockito-core-${mockito-core.version}.jar" />
- <pathelement location="${lib.dir}/byte-buddy-${byte-buddy.version}.jar" />
- <pathelement location="${lib.dir}/objenesis-${objenesis.version}.jar" />
- <pathelement location="${lib.dir}/hamcrest-core-${hamcrest-core.version}.jar" />
- <pathelement location="${findbugs.dir}/lib/dom4j-1.6.1.jar" />
- <pathelement location="${findbugs.dir}/lib/jaxen-1.1.6.jar" />
+ <pathelement location="${system.dir}/testng.jar" />
+ <pathelement location="${system.dir}/beust-jcommander.jar" />
+ <pathelement location="${system.dir}/mockito/mockito-core.jar" />
+ <pathelement location="${system.dir}/objenesis/objenesis.jar" />
+ <pathelement location="${system.dir}/hamcrest/core.jar" />
+ <pathelement location="${system.dir}/dom4j.jar" />
+ <pathelement location="${system.dir}/jaxen.jar" />
</path>
<path id="fb-contrib.samples.classpath">
- <pathelement location="${lib.dir}/asm-debug-all-${asm-debug-all.version}.jar" />
- <pathelement location="${lib.dir}/javax.servlet.jsp-api-${javax.servlet.jsp-api.version}.jar" />
- <pathelement location="${lib.dir}/junit-${junit.version}.jar" />
- <pathelement location="${lib.dir}/jsr305-${jsr305.version}.jar" />
- <pathelement location="${lib.dir}/testng-${testng.version}.jar" />
- <pathelement location="${lib.dir}/javax.servlet-api-${javax.servlet-api.version}.jar" />
- <pathelement location="${lib.dir}/log4j-${log4j.version}.jar" />
- <pathelement location="${lib.dir}/log4j-api-${log4j-api.version}.jar" />
- <pathelement location="${lib.dir}/commons-collections-${commons-collections.version}.jar" />
- <pathelement location="${lib.dir}/commons-lang3-${commons-lang3.version}.jar" />
- <pathelement location="${lib.dir}/commons-io-${commons-io.version}.jar" />
- <pathelement location="${lib.dir}/dom4j-${dom4j.version}.jar" />
- <pathelement location="${lib.dir}/backport-util-concurrent-${backport-util-concurrent.version}.jar" />
- <pathelement location="${lib.dir}/threetenbp-${threetenbp.version}.jar" />
- <pathelement location="${lib.dir}/slf4j-api-${slf4j-api.version}.jar" />
- <pathelement location="${lib.dir}/guava-${guava.version}.jar" />
- <pathelement location="${lib.dir}/httpclient-cache-${httpclient-cache.version}.jar" />
- <pathelement location="${lib.dir}/httpcore-${httpcore.version}.jar" />
- <pathelement location="${lib.dir}/httpclient-${httpclient.version}.jar" />
- <pathelement location="${lib.dir}/commons-codec-${commons-codec.version}.jar" />
- <pathelement location="${lib.dir}/spring-beans-${spring-beans.version}.jar" />
- <pathelement location="${lib.dir}/spring-context-${spring-context.version}.jar" />
- <pathelement location="${lib.dir}/spring-tx-${spring-tx.version}.jar" />
- <pathelement location="${lib.dir}/javax.persistence-${javax.persistence.version}.jar" />
- <pathelement location="${lib.dir}/jaxen-${jaxen.version}.jar" />
- <pathelement location="${lib.dir}/mockito-core-${mockito-core.version}.jar" />
- <pathelement location="${lib.dir}/hamcrest-core-${hamcrest-core.version}.jar" />
- <pathelement location="${lib.dir}/hamcrest-library-${hamcrest-library.version}.jar" />
- <pathelement location="${lib.dir}/jena-shaded-guava-${jena-shaded-guava.version}.jar" />
- <pathelement location="${lib.dir}/javax.ws.rs-api-${javax.ws.rs-api.version}.jar" />
- <pathelement location="${lib.dir}/jersey-media-multipart-${jersey-media-multipart.version}.jar" />
+ <pathelement location="${system.dir}/objectweb-asm/asm-all.jar" />
+ <pathelement location="${system.dir}/jsp.jar" />
+ <pathelement location="${system.dir}/junit.jar" />
+ <pathelement location="${system.dir}/jsr-305.jar" />
+ <pathelement location="${system.dir}/testng.jar" />
+ <pathelement location="${system.dir}/servlet.jar" />
+ <pathelement location="${system.dir}/log4j/log4j-1.2-api.jar" />
+ <pathelement location="${system.dir}/log4j/log4j-api.jar" />
+ <pathelement location="${system.dir}/apache-commons-collections.jar" />
+ <pathelement location="${system.dir}/apache-commons-lang3.jar" />
+ <pathelement location="${system.dir}/apache-commons-io.jar" />
+ <pathelement location="${system.dir}/dom4j.jar" />
+ <pathelement location="${system.dir}/slf4j/api.jar" />
+ <pathelement location="${system.dir}/guava/guava.jar" />
+ <pathelement location="${system.dir}/httpcomponents/httpcore.jar" />
+ <pathelement location="${system.dir}/httpcomponents/httpclient.jar" />
+ <pathelement location="${system.dir}/apache-commons-codec.jar" />
+ <pathelement location="${system.dir}/springframework/spring-beans.jar" />
+ <pathelement location="${system.dir}/springframework/spring-context.jar" />
+ <pathelement location="${system.dir}/springframework/spring-tx.jar" />
+ <pathelement location="${system.dir}/hibernate-jpa-2.1-api.jar" />
+ <pathelement location="${system.dir}/jaxen.jar" />
+ <pathelement location="${system.dir}/mockito/mockito-core.jar" />
+ <pathelement location="${system.dir}/hamcrest/core.jar" />
+ <pathelement location="${system.dir}/hamcrest/library.jar" />
+ <pathelement location="${system.dir}/glassfish-jax-rs-api.jar" />
+ <pathelement location="${system.dir}/jersey/jersey-media-multipart.jar" />
</path>
</target>
<target name="validate_xml" depends="-init" unless="skip-validate" description="validates the xml files">
- <taskdef name="bug-rank-check-style" classname="text.style.check.BugRankCheckStyleTask"/>
<xmlvalidate lenient="false" failonerror="yes">
<attribute name="http://apache.org/xml/features/validation/schema" value="true" />
<attribute name="http://xml.org/sax/features/namespaces" value="true" />
<fileset dir="${etc.dir}" includes="*.xml" excludes="findbugs-exclude.xml,pmd-rules.xml"/>
</xmlvalidate>
- <bug-rank-check-style findbugsxml="etc/findbugs.xml" failOnMissingDetector="false" />
</target>
<target name="compile" depends="-init" description="compiles java files">
@@ -202,7 +197,6 @@
</target>
<target name="jar" depends="compile" xmlns:vcs="antlib:com.mebigfatguy.vcsversion" description="produces the fb-contrib jar file">
- <vcs:vcsversion vcs="git" revisionProperty="_rev_" dateProperty="_date_" branchProperty="_branch_" urlProperty="_url_"/>
<jar destfile="${target.dir}/fb-contrib-${fb-contrib.version}.jar">
<fileset dir="etc">
<include name="findbugs.xml" />
@@ -220,10 +214,6 @@
<manifest>
<attribute name="fb-contrib-version" value="${fb-contrib.version}" />
<attribute name="Main-Class" value="com.mebigfatguy.fbcontrib.FBContrib" />
- <attribute name="git-url" value="${_url_}" />
- <attribute name="git-branch" value="${_branch_}" />
- <attribute name="git-revision" value="${_rev_}" />
- <attribute name="git-date" value="${_date_}" />
<attribute name="Eclipse-RegisterBuddy" value="edu.umd.cs.findbugs.plugin.eclipse" />
<attribute name="Bundle-ManifestVersion" value="2" />
<attribute name="Bundle-Name" value="fb-contrib plugin" />