You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/07/17 12:19:10 UTC
[jmeter] branch master updated (734794f -> a6228c4)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 734794f Use a more concise way to filter for IPv4 addresses in the test
new 3751ed2 Newer checkstyle allows only one statement per line
new a6228c4 Update checkstyle to newest version (8.22)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.properties | 6 +++---
test/src/org/apache/jmeter/JMeterTest.java | 6 ++++--
xdocs/changes.xml | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
[jmeter] 02/02: Update checkstyle to newest version (8.22)
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit a6228c40796aa5d85f910054dde3ddf75fa6076c
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Wed Jul 17 14:18:54 2019 +0200
Update checkstyle to newest version (8.22)
---
build.properties | 6 +++---
xdocs/changes.xml | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/build.properties b/build.properties
index 76c1dcf..b28198d 100644
--- a/build.properties
+++ b/build.properties
@@ -453,10 +453,10 @@ jdom.loc = ${maven2.repo}/org/jdom/jdom/${jdom.version}
jdom.sha512 = 921A79A4759724DAD02830E75FEF0F3A3B2BB1D14D572CA4E1F97BF7A93CC5413EE41B3B231331F1EF459E77F8AE1FBF43DCDF621D18BD72331F98B24C4E8284
# Optional for use by checkstyle
-checkstyle-all.version = 8.8
+checkstyle-all.version = 8.22
checkstyle-all.jar = checkstyle-${checkstyle-all.version}-all.jar
-checkstyle-all.loc = https://downloads.sourceforge.net/checkstyle/checkstyle/${checkstyle-all.version}/checkstyle-${checkstyle-all.version}-all.jar?ts=${EPOCHSECONDS}&use_mirror=autoselect
-checkstyle-all.sha512 = 4484FED4321FC1D96607D453FAA3A1435BFFFD61B21CC0B3E6E381BCA47BCDE17B34A55A160820B7DEECE3BFA67AC92DC53D0FC64576C82FFAEAE1E80B033CA6
+checkstyle-all.loc = https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle-all.version}
+checkstyle-all.sha512 = d595e284ec440e20367b93a1835357f1c4c2cf77af4589caafdaa995aa9e8a341716ad59f5222fff484275f23c11beb71ad58792cc6cdbdb261e320724b9418f
# Optional for use by rat
rat.version = 0.13
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7801b19..c9dd5dd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -132,6 +132,7 @@ to view the last major behaviors with the version 5.1.1.
<li>Updated to tika-core and tika-parsers 1.21 (from 1.21)</li>
<li>Updated jackson-annotations, jackson-core and jackson-databind to 2.9.9 (from 2.9.8)</li>
<li><bug>63529</bug>Add more unit tests for org.apache.jorphan.util.JOrphanUtils. Contributed by John Bergqvist(John.Bergqvist at diffblue.com)</li>
+ <li>Updated to latest checkstyle (version 8.22)</li>
</ul>
<!-- =================== Bug fixes =================== -->
[jmeter] 01/02: Newer checkstyle allows only one statement per line
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 3751ed22fc80c5bf6e0497a97fdbcd21a46a3c38
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Wed Jul 17 14:18:29 2019 +0200
Newer checkstyle allows only one statement per line
---
test/src/org/apache/jmeter/JMeterTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/src/org/apache/jmeter/JMeterTest.java b/test/src/org/apache/jmeter/JMeterTest.java
index 8d150bdc..3f5149a 100644
--- a/test/src/org/apache/jmeter/JMeterTest.java
+++ b/test/src/org/apache/jmeter/JMeterTest.java
@@ -60,7 +60,8 @@ public class JMeterTest extends JMeterTestCase implements JMeterSerialTest {
+ " <collectionProp name=\"Arguments.arguments\"/>\n" + " </elementProp>\n"
+ " <stringProp name=\"TestPlan.user_define_classpath\"></stringProp></TestPlan>"
+ " <hashTree/></hashTree></jmeterTestPlan>";
- try (FileWriter fw = new FileWriter(temp); BufferedWriter out = new BufferedWriter(fw)) {
+ try (FileWriter fw = new FileWriter(temp);
+ BufferedWriter out = new BufferedWriter(fw)) {
out.write(testPlan);
}
@@ -102,7 +103,8 @@ public class JMeterTest extends JMeterTestCase implements JMeterSerialTest {
+ " <stringProp name=\"CONNECT\">${__Random(1,5)}</stringProp>\n"
+ " </kg.apc.jmeter.samplers.DummySampler></hashTree></hashTree>\n"
+ " </hashTree></jmeterTestPlan><hashTree/></hashTree>\n" + "</jmeterTestPlan>";
- try (FileWriter fw = new FileWriter(temp); BufferedWriter out = new BufferedWriter(fw)) {
+ try (FileWriter fw = new FileWriter(temp);
+ BufferedWriter out = new BufferedWriter(fw)) {
out.write(testPlan);
}
JMeter jmeter = new JMeter();