You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2022/04/12 17:39:11 UTC
[jmeter] branch master updated (e457b35cbc -> f7b597fa1e)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
from e457b35cbc Revert "Update ActiveMQ to 5.17.0"
new dfa7e3425b Add necessary trusted-keys in checksum.xml
new f7b597fa1e Fix simple errorprone violations
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:
checksum.xml | 2 ++
.../main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java | 2 +-
.../src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
[jmeter] 01/02: Add necessary trusted-keys in checksum.xml
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit dfa7e3425b94846f046dc16a5e8366cfb2fcfe3a
Author: Wilson Kurniawan <wi...@visenze.com>
AuthorDate: Tue Apr 12 07:55:07 2022 +0800
Add necessary trusted-keys in checksum.xml
---
checksum.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/checksum.xml b/checksum.xml
index f0b151d799..3d43a4475c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -28,6 +28,7 @@
<trusted-key id='105cb91cac2aee0e' group='com.github.vlsi.gradle' />
<trusted-key id='254e9c64c264c176' group='com.github.weisj' />
<trusted-key id='5e1f79a7c298661e' group='com.google.auto' />
+ <trusted-key id='b0f3710fa64900e7' group='com.google.auto' />
<trusted-key id='c51e6cbc7ff46f0b' group='com.google.auto.service' />
<trusted-key id='b0f3710fa64900e7' group='com.google.auto.value' />
<trusted-key id='353a436e043e3145' group='com.google.code.findbugs' />
@@ -85,6 +86,7 @@
<trusted-key id='6601e5c08dccbb96' group='info.picocli' />
<trusted-key id='b2ca0dfe9ed21c6e' group='io.burt' />
<trusted-key id='5b30d3b10694f057' group='io.codearte.gradle.nexus' />
+ <trusted-key id='a6ea2e2bf22e0543' group='io.github.java-diff-utils' />
<trusted-key id='67631bc0568801c3' group='io.github.microutils' />
<trusted-key id='602ec18d20c4661c' group='io.github.x-stream' />
<trusted-key id='6425559c47cc79c4' group='javax.activation' />
[jmeter] 02/02: Fix simple errorprone violations
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit f7b597fa1e37d2d6bbf68e6abe94be34f6b419d6
Author: Wilson Kurniawan <wi...@visenze.com>
AuthorDate: Tue Apr 12 17:04:34 2022 +0800
Fix simple errorprone violations
---
.../main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java | 2 +-
.../src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
index 1f3ab5c5e6..7ed3ba2158 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
@@ -48,7 +48,7 @@ public class HeaderAsPropertyRenderer extends DefaultTableCellRenderer {
* are moved.
*/
@Deprecated
- public HeaderAsPropertyRenderer(@Deprecated Object[][] columnsMsgParameters) {
+ public HeaderAsPropertyRenderer(Object[][] columnsMsgParameters) {
super();
}
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
index ccc0ecf64e..27fba4ec7a 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/AbstractSampleSender.java
@@ -30,7 +30,7 @@ public abstract class AbstractSampleSender implements SampleSender {
private final boolean isClientConfigured = JMeterUtils.getPropDefault("sample_sender_client_configured", true); // $NON-NLS-1$
/**
- * @return boolean indicates how SampleSender configuration is done, @{code true}
+ * @return boolean indicates how SampleSender configuration is done, {@code true}
* means use client properties and send to servers, {@code false} means use
* server configurations
*/