Lines 134-139
Link Here
|
134 |
reportlevel="${findbugs.level}" |
134 |
reportlevel="${findbugs.level}" |
135 |
excludeFilter="fb-excludes.xml" |
135 |
excludeFilter="fb-excludes.xml" |
136 |
jvmargs="-Xms512m -Xmx512m" |
136 |
jvmargs="-Xms512m -Xmx512m" |
|
|
137 |
omitVisitors="InefficientStringBuffering" |
137 |
outputFile="${findbugs.outName}.xml" > |
138 |
outputFile="${findbugs.outName}.xml" > |
138 |
<sourcePath path="${src.core}" /> |
139 |
<sourcePath path="${src.core}" /> |
139 |
<sourcePath path="${src.http}" /> |
140 |
<sourcePath path="${src.http}" /> |
Lines 548-560
Link Here
|
548 |
<filter token="YEAR" value="${year}"/> |
549 |
<filter token="YEAR" value="${year}"/> |
549 |
</filterset> |
550 |
</filterset> |
550 |
|
551 |
|
|
|
552 |
<!-- |
553 |
JMeter version |
554 |
This is overridden for formal releases. |
555 |
--> |
556 |
<property name="jmeter.version" value="3.2-SNAPSHOT"/> |
557 |
|
551 |
<target name="init-version"> |
558 |
<target name="init-version"> |
552 |
<tstamp/> |
559 |
<tstamp/> |
553 |
<!-- |
|
|
554 |
JMeter version |
555 |
This is overridden for formal releases. |
556 |
--> |
557 |
<property name="jmeter.version" value="3.2-SNAPSHOT"/> |
558 |
<!-- Remember to change "docversion" below if necessary --> |
560 |
<!-- Remember to change "docversion" below if necessary --> |
559 |
<condition property="implementation.version" |
561 |
<condition property="implementation.version" |
560 |
value="${jmeter.version} r${svn.revision}" else="${jmeter.version}.${DSTAMP}"> |
562 |
value="${jmeter.version} r${svn.revision}" else="${jmeter.version}.${DSTAMP}"> |
Lines 2804-2809
run JMeter unless all the JMeter jars are added.
Link Here
|
2804 |
</junit> |
2806 |
</junit> |
2805 |
</target> |
2807 |
</target> |
2806 |
|
2808 |
|
|
|
2809 |
<target name="complete-junit" depends="compile-tests" |
2810 |
description="Run individual JUnit test (-Dtest.case=org.apache.jorphan.test.AllTests) (-Dtest.format=plain) (-Dtest.showoutput=true)" |
2811 |
xmlns:jacoco="antlib:org.jacoco.ant"> |
2812 |
<mkdir dir="reports"/> |
2813 |
<property name="test.format" value="plain"/> |
2814 |
<property name="test.case" value="org.apache.jorphan.test.AllTests"/> |
2815 |
<property name="test.showoutput" value="false"/> |
2816 |
<taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml"> |
2817 |
<classpath refid="sonar.classpath" /> |
2818 |
</taskdef> |
2819 |
<jacoco:coverage destfile="reports/jacoco.exec"> |
2820 |
<junit fork="true" |
2821 |
dir="${basedir}/bin" |
2822 |
showoutput="${test.showoutput}" |
2823 |
printsummary="on"> |
2824 |
<formatter type="${test.format}" usefile="yes"/> |
2825 |
<formatter type="xml"/> |
2826 |
<jvmarg value="-Dfile.encoding=${test.encoding}"/> |
2827 |
<!-- Allow headless to be passed in --> |
2828 |
<jvmarg value="-Djava.awt.headless=${java.awt.headless}"/> |
2829 |
<classpath> |
2830 |
<fileset dir="${dest.jar}" includes="*.jar"/> |
2831 |
<pathelement location="${build.test}"/> |
2832 |
<pathelement location="${build.test-res}"/> |
2833 |
<path refid="classpath"/> |
2834 |
</classpath> |
2835 |
<batchtest todir="reports" skipNonTests="true"> |
2836 |
<fileset dir="${src.test}"> |
2837 |
<include name="**/*Test*.java" /> |
2838 |
<exclude name="**/AllTests.java" /> |
2839 |
</fileset> |
2840 |
</batchtest> |
2841 |
</junit> |
2842 |
</jacoco:coverage> |
2843 |
</target> |
2844 |
|
2807 |
<!-- Utility target to collate reports --> |
2845 |
<!-- Utility target to collate reports --> |
2808 |
<target name="junitreport"> |
2846 |
<target name="junitreport"> |
2809 |
<mkdir dir="reports"/> |
2847 |
<mkdir dir="reports"/> |
Lines 3029-3034
run JMeter unless all the JMeter jars are added.
Link Here
|
3029 |
<process_jarfile jarname="xpp3"/> |
3067 |
<process_jarfile jarname="xpp3"/> |
3030 |
<process_jarfile jarname="xstream"/> |
3068 |
<process_jarfile jarname="xstream"/> |
3031 |
<process_jarfile jarname="jacocoant" dest.dir="${lib.coverage}" /> |
3069 |
<process_jarfile jarname="jacocoant" dest.dir="${lib.coverage}" /> |
|
|
3070 |
<process_jarfile jarname="sonarqube-ant-task" dest.dir="${lib.coverage}" /> |
3032 |
</target> |
3071 |
</target> |
3033 |
|
3072 |
|
3034 |
<target name="_process_doc_jars"> |
3073 |
<target name="_process_doc_jars"> |
Lines 3324-3327
run JMeter unless all the JMeter jars are added.
Link Here
|
3324 |
<fileset dir="${maven.dir}" includes="*.*" excludes="*.asc *.md5 *.sha1 *.sha"/> |
3363 |
<fileset dir="${maven.dir}" includes="*.*" excludes="*.asc *.md5 *.sha1 *.sha"/> |
3325 |
</gpg> |
3364 |
</gpg> |
3326 |
</target> |
3365 |
</target> |
|
|
3366 |
|
3367 |
<path id="sonar.classpath"> |
3368 |
<fileset dir="./lib/opt" includes="**/*.jar" /> |
3369 |
</path> |
3370 |
|
3371 |
<taskdef uri="antlib:org.sonar.ant" resource="org/sonar/ant/antlib.xml"> |
3372 |
<classpath refid="sonar.classpath" /> |
3373 |
</taskdef> |
3374 |
|
3375 |
<property name="sonar.organizationName" value="Apache" /> |
3376 |
<property name="sonar.projectName" value="JMeter" /> |
3377 |
|
3378 |
<property name="sonar.projectKey" value="org.apache.jmeter:${sonar.projectName}" /> |
3379 |
<property name="sonar.projectVersion" value="${jmeter.version}" /> |
3380 |
<property name="sonar.language" value="java" /> |
3381 |
<property name="sonar.modules" value="core,http,ftp,java,jdbc,ldap,mail,components,functions,jorphan,tcp,jms,native" /> |
3382 |
<property name="sonar.java.binaries" value="${build.core},${build.http},${build.core},${build.http},${build.ftp},${build.java},${build.jdbc},${build.ldap},${build.mail},${build.components},${build.functions},${build.jorphan},${build.tcp},${build.jms},${build.native}" /> |
3383 |
<property name="sonar.java.libraries" value="lib,lib/opt" /> |
3384 |
|
3385 |
<property name="sonar.junit.reportsPath" value="reports" /> |
3386 |
<property name="sonar.jacoco.reportPath" value="reports/jacoco.exec" /> |
3387 |
|
3388 |
<property name="core.sonar.projectName" value="core" /> |
3389 |
<property name="core.sonar.sources" value="${src.core}" /> |
3390 |
<property name="core.sonar.projectBaseDir" value="./" /> |
3391 |
<property name="http.sonar.projectName" value="http" /> |
3392 |
<property name="http.sonar.sources" value="${src.http}" /> |
3393 |
<property name="http.sonar.projectBaseDir" value="./" /> |
3394 |
<property name="ftp.sonar.projectName" value="ftp" /> |
3395 |
<property name="ftp.sonar.sources" value="${src.ftp}" /> |
3396 |
<property name="ftp.sonar.projectBaseDir" value="./" /> |
3397 |
<property name="java.sonar.projectName" value="java" /> |
3398 |
<property name="java.sonar.sources" value="${src.java}" /> |
3399 |
<property name="java.sonar.projectBaseDir" value="./" /> |
3400 |
<property name="jdbc.sonar.projectName" value="jdbc" /> |
3401 |
<property name="jdbc.sonar.sources" value="${src.jdbc}" /> |
3402 |
<property name="jdbc.sonar.projectBaseDir" value="./" /> |
3403 |
<property name="ldap.sonar.projectName" value="ldap" /> |
3404 |
<property name="ldap.sonar.sources" value="${src.ldap}" /> |
3405 |
<property name="ldap.sonar.projectBaseDir" value="./" /> |
3406 |
<property name="mail.sonar.projectName" value="mail" /> |
3407 |
<property name="mail.sonar.sources" value="${src.mail}" /> |
3408 |
<property name="mail.sonar.projectBaseDir" value="./" /> |
3409 |
<property name="components.sonar.projectName" value="components" /> |
3410 |
<property name="components.sonar.sources" value="${src.components}" /> |
3411 |
<property name="components.sonar.projectBaseDir" value="./" /> |
3412 |
<property name="functions.sonar.projectName" value="functions" /> |
3413 |
<property name="functions.sonar.sources" value="${src.functions}" /> |
3414 |
<property name="functions.sonar.projectBaseDir" value="./" /> |
3415 |
<property name="jorphan.sonar.projectName" value="jorphan" /> |
3416 |
<property name="jorphan.sonar.sources" value="${src.jorphan}" /> |
3417 |
<property name="jorphan.sonar.projectBaseDir" value="./" /> |
3418 |
<property name="tcp.sonar.projectName" value="tcp" /> |
3419 |
<property name="tcp.sonar.sources" value="${src.tcp}" /> |
3420 |
<property name="tcp.sonar.projectBaseDir" value="./" /> |
3421 |
<property name="jms.sonar.projectName" value="jms" /> |
3422 |
<property name="jms.sonar.sources" value="${src.jms}" /> |
3423 |
<property name="jms.sonar.projectBaseDir" value="./" /> |
3424 |
<property name="native.sonar.projectName" value="native" /> |
3425 |
<property name="native.sonar.sources" value="${src.native}" /> |
3426 |
<property name="native.sonar.projectBaseDir" value="./" /> |
3427 |
|
3428 |
<target name="sonar" depends="compile, install, complete-junit"> |
3429 |
<property environment="env" /> |
3430 |
<condition property="sonar.host.url" value="${env.SONAR_HOST_URL}" else="http://localhost:9000"> |
3431 |
<isset property="env.SONAR_HOST_URL" /> |
3432 |
</condition> |
3433 |
<condition property="sonar.login" value="${env.SONAR_LOGIN}"> |
3434 |
<isset property="env.SONAR_LOGIN" /> |
3435 |
</condition> |
3436 |
<condition property="sonar.password" value="${env.SONAR_PASSWORD}"> |
3437 |
<isset property="env.SONAR_PASSWORD" /> |
3438 |
</condition> |
3439 |
<condition property="sonar.jdbc.url" value="${env.SONAR_JDBC_URL}"> |
3440 |
<isset property="env.SONAR_JDBC_URL" /> |
3441 |
</condition> |
3442 |
<condition property="sonar.jdbc.username" value="${env.SONAR_JDBC_USERNAME}"> |
3443 |
<isset property="env.SONAR_JDBC_USERNAME" /> |
3444 |
</condition> |
3445 |
<condition property="sonar.jdbc.password" value="${env.SONAR_JDBC_PASSWORD}"> |
3446 |
<isset property="env.SONAR_JDBC_PASSWORD" /> |
3447 |
</condition> |
3448 |
<property name="sonar.java.test.libraries" value="lib/**/*.jar" /> |
3449 |
<sonar:sonar xmlns:sonar="antlib:org.sonar.ant"> |
3450 |
</sonar:sonar> |
3451 |
</target> |
3452 |
|
3327 |
</project> |
3453 |
</project> |