Checkstyle

build.properties

@@ -80,10 +80,10 @@ bcpkix.jar                  = bcpkix-jdk15on-${bcprov.version}.jar
 bcpkix.loc                  = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
 bcpkix.md5                  = cb025ef84fb991e14fdf62f6bef7be53
 
-dec.version          		= 0.1.2
-dec.jar              		= dec-${dec.version}.jar
-dec.loc              		= ${maven2.repo}/org/brotli/dec/${dec.version}
-dec.md5              		= 4b1cd14cf29733941cc536b27e6aedfa
+dec.version                 = 0.1.2
+dec.jar                     = dec-${dec.version}.jar
+dec.loc                     = ${maven2.repo}/org/brotli/dec/${dec.version}
+dec.md5                     = 4b1cd14cf29733941cc536b27e6aedfa
 
 caffeine.version            = 2.5.5
 caffeine.jar                = caffeine-${caffeine.version}.jar
@@ -140,12 +140,10 @@ commons-pool2.jar             = commons-pool2-${commons-pool2.version}.jar
 commons-pool2.loc             = ${maven2.repo}/org/apache/commons/commons-pool2/${commons-pool2.version}
 commons-pool2.md5             = 62727a85e2e1bf6a756f5571d19cc71c
 
-# Optional for use by checkstyle
-darcula.version       = e208efb96f70e4be9dc362fbb46f6e181ef501dd
-darcula.jar           = darcula.jar
-darcula.loc           = https://github.com/bulenkov/Darcula/raw/${darcula.version}/build
-darcula.md5           = 5afdcd4e299f71fb9dfd1740937bfbea
-
+darcula.version            = e208efb96f70e4be9dc362fbb46f6e181ef501dd
+darcula.jar                = darcula.jar
+darcula.loc                = https://github.com/bulenkov/Darcula/raw/${darcula.version}/build
+darcula.md5                = 5afdcd4e299f71fb9dfd1740937bfbea
 
 # dnsjava for DNSCacheManager (http://www.dnsjava.org/ BSD license)
 dnsjava.version             = 2.1.8
@@ -185,7 +183,6 @@ httpasyncclient.md5              = 73d4a443918f4f7124339d2161e2ae54
 
 # Apache HttpClient 4.x
 httpclient.version          = 4.5.3
-#
 httpclient.jar              = httpclient-${httpclient.version}.jar
 httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
 httpclient.md5              = 1965ebb7aca0f9f8faaed3870d8cf689
@@ -433,10 +430,10 @@ jdom.loc                    = ${maven2.repo}/org/jdom/jdom/${jdom.version}
 jdom.md5                    = 140bfed13341fe2039eee0f26a16d705
 
 # Optional for use by checkstyle
-checkstyle-all.version       = 6.13
+checkstyle-all.version       = 8.5
 checkstyle-all.jar           = checkstyle-${checkstyle-all.version}-all.jar
 checkstyle-all.loc           = http://downloads.sourceforge.net/checkstyle/checkstyle/${checkstyle-all.version}/checkstyle-${checkstyle-all.version}-all.jar?ts=${EPOCHSECONDS}&use_mirror=autoselect
-checkstyle-all.md5           = ac6e1e81d09bcaf4c0c22181e9bda1d9
+checkstyle-all.md5           = 6e7d8b1e9a750be769037cc7e3bada40
 
 # Optional for use by rat
 rat.version                  = 0.12
@@ -455,29 +452,29 @@ jacocoant.loc                = ${maven2.repo}/org/jacoco/org.jacoco.ant/${jacoco
 jacocoant.md5                = 134a9863234844bf156143dad39564e2
 
 # Optional for use by JDBC_TESTS.jmx
-hsqldb.version            	 = 2.4.0
-hsqldb.jar                	 = hsqldb-${hsqldb.version}.jar
-hsqldb.loc                	 = ${maven2.repo}/org/hsqldb/hsqldb/${hsqldb.version}
-hsqldb.md5                	 = 72cae1d3ef411edc74bc3ff4d12bd47c
+hsqldb.version               = 2.4.0
+hsqldb.jar                   = hsqldb-${hsqldb.version}.jar
+hsqldb.loc                   = ${maven2.repo}/org/hsqldb/hsqldb/${hsqldb.version}
+hsqldb.md5                   = 72cae1d3ef411edc74bc3ff4d12bd47c
 
 # Optional for use by JMS_TESTS.jmx
-activemq-all.version            	 = 5.15.2
-activemq-all.jar                	 = activemq-all-${activemq-all.version}.jar
-activemq-all.loc                	 = ${maven2.repo}/org/apache/activemq/activemq-all/${activemq-all.version}
-activemq-all.md5                	 = bd24ae082be11dc969a6e5bc45515ab7
+activemq-all.version         = 5.15.2
+activemq-all.jar             = activemq-all-${activemq-all.version}.jar
+activemq-all.loc             = ${maven2.repo}/org/apache/activemq/activemq-all/${activemq-all.version}
+activemq-all.md5             = bd24ae082be11dc969a6e5bc45515ab7
 
 # Optional for use by FTP_TESTS.jmx
-mina-core.version            	 = 2.0.16
-mina-core.jar                	 = mina-core-${mina-core.version}.jar
-mina-core.loc                	 = ${maven2.repo}/org/apache/mina/mina-core/${mina-core.version}
-mina-core.md5                	 = fd86528fa9d9ba8fb8c37e3ac28fa45f
-
-ftplet-api.version            	 = 1.1.1
-ftplet-api.jar                	 = ftplet-api-${ftplet-api.version}.jar
-ftplet-api.loc                	 = ${maven2.repo}/org/apache/ftpserver/ftplet-api/${ftplet-api.version}
-ftplet-api.md5                	 = a17a7513f5a7e2cd717f7b0fbd15241a
-
-ftpserver-core.version            	 = 1.1.1
-ftpserver-core.jar                	 = ftpserver-core-${ftpserver-core.version}.jar
-ftpserver-core.loc                	 = ${maven2.repo}/org/apache/ftpserver/ftpserver-core/${ftpserver-core.version}
-ftpserver-core.md5                	 = 62b0a623ff211013d3056dbdf26139b2
+mina-core.version            = 2.0.16
+mina-core.jar                = mina-core-${mina-core.version}.jar
+mina-core.loc                = ${maven2.repo}/org/apache/mina/mina-core/${mina-core.version}
+mina-core.md5                = fd86528fa9d9ba8fb8c37e3ac28fa45f
+
+ftplet-api.version           = 1.1.1
+ftplet-api.jar               = ftplet-api-${ftplet-api.version}.jar
+ftplet-api.loc               = ${maven2.repo}/org/apache/ftpserver/ftplet-api/${ftplet-api.version}
+ftplet-api.md5               = a17a7513f5a7e2cd717f7b0fbd15241a
+
+ftpserver-core.version       = 1.1.1
+ftpserver-core.jar           = ftpserver-core-${ftpserver-core.version}.jar
+ftpserver-core.loc           = ${maven2.repo}/org/apache/ftpserver/ftpserver-core/${ftpserver-core.version}
+ftpserver-core.md5           = 62b0a623ff211013d3056dbdf26139b2

build.xml

@@ -3436,57 +3436,18 @@ run JMeter unless all the JMeter jars are added.
     </antcall>
   </target>
 
-  <!-- Special: process to get RSyntaxTextArea-->
-  <!-- Useless since rsyntaxtextarea artifacts are published to Maven Repo since 9th july 2014 (JMeter 2.12) -->
-  <!--
-  <target name="_process_rsyntaxtextarea">
-      <available file="./lib/${rsyntaxtextarea.jar}" property="rsyntaxtextarea.exists"/>
-      <antcall target="_get_rsyntaxtextarea"/>
-  </target>
-  -->
-  <!-- Get RSyntaxTextArea binary zip file, unpack it, pick up jar file and remove the zip -->
-  <!-- Useless since rsyntaxtextarea artifacts are published to Maven Repo since 9th july 2014 (JMeter 2.12) -->
-  <!--
-  <target name="_get_rsyntaxtextarea" unless="rsyntaxtextarea.exists">
-    <property name="loc" value="${rsyntaxtextarea.loc}"/>
-    <property name="zip" value="${rsyntaxtextarea.name}_${rsyntaxtextarea.version}.zip"/>
-    <property name="jar" value="${rsyntaxtextarea.name}.jar"/>
-    <property name="md5" value="${rsyntaxtextarea.md5}"/>
-    <property name="path" value="./lib"/>
-    <get src="${loc}/${zip}"
-         dest="${build.dir}/${zip}"
-         usetimestamp="true" ignoreerrors="false"/>
-    <unzip dest="${build.dir}" src="${build.dir}/${zip}">
-      <patternset>
-        <include name="**/${jar}"/>
-      </patternset>
-      <mapper type="flatten"/>
-    </unzip>
-    <antcall target="_checkMD5">
-      <param name="file" value="${build.dir}/${jar}"/>
-      <param name="path" value="${build.dir}"/>
-      <param name="md5"  value="${md5}"/>
-    </antcall>
-    <delete>
-      <fileset dir="${path}" includes="${rsyntaxtextarea.name}-*.jar"/>
-    </delete>
-    <move preservelastmodified="true" overwrite="true"
-        file="${build.dir}/${jar}" tofile="${path}/${rsyntaxtextarea.jar}" verbose="true"/>
-    <delete file="${build.dir}/${zip}"/>
-  </target>
-  -->
-
   <!-- Need to define config_loc for use by Eclipse -->
   <property name="config_loc" value="."/>
   <target name="checkstyle">
     <available property="checkstyle.jar.available" file="${lib.opt}/${checkstyle-all.jar}"/>
-    <fail message="This task requires checkstyle, please run download_checkstyle target to download checkstyle" unless="checkstyle.jar.available"/>
+    <fail message="This task requires checkstyle, please run download_checkstyle target to download checkstyle"
+          unless="checkstyle.jar.available"/>
 
-    <antcall target="_process_checkstyle_jars"></antcall>
+    <antcall target="_process_checkstyle_jars"/>
     <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
              classpath="${lib.opt}/${checkstyle-all.jar}"/>
     <checkstyle config="checkstyle.xml">
-      <fileset dir="src" includes="**/*.java"/>
+      <fileset dir="src" includes="**/*"/>
       <formatter type="plain"/>
       <formatter type="xml" toFile="build/checkstyle_errors.xml"/>
     </checkstyle>
@@ -3495,7 +3456,8 @@ run JMeter unless all the JMeter jars are added.
 
   <target name="rat">
     <available property="rat.jar.available" file="${lib.opt}/${rat.jar}"/>
-    <fail message="This task requires Apache Creadur RAT, please run download_rat target to download it" unless="rat.jar.available"/>
+    <fail message="This task requires Apache Creadur RAT, please run download_rat target to download it"
+          unless="rat.jar.available"/>
     <taskdef
       uri="antlib:org.apache.rat.anttasks"
       resource="org/apache/rat/anttasks/antlib.xml">

checkstyle-suppressions.xml

@@ -18,10 +18,9 @@ limitations under the License.
 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+    "http://checkstyle.sourceforge.net/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-    <!-- On Windows, it appears that Checkstyle matches files using \ delims -->
-    <suppress checks="JavadocPackage" files="[/\\]examples[/\\].*\.java"/>
-    <suppress checks="JavadocPackage" files="[/\\]test[/\\].*\.java"/>
+    <suppress checks="NewlineAtEndOfFile" files=".*.properties"/>
+    <suppress checks="FileLength" files="HTTPSamplerBase.java"/>
 </suppressions>