This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 4b30ab065 Bump pmd.version from 6.47.0 to 7.4.0 (#557)
4b30ab065 is described below
commit 4b30ab065d065a9b85a8b5f65df0d6ad111fae3c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 26 18:10:47 2024 +0200
Bump pmd.version from 6.47.0 to 7.4.0 (#557)
* Bump pmd.version from 6.47.0 to 7.4.0
Bumps `pmd.version` from 6.47.0 to 7.4.0.
Updates `net.sourceforge.pmd:pmd-core` from 6.47.0 to 7.4.0
- [Release notes](https://github.com/pmd/pmd/releases)
-
[Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
-
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/7.4.0)
Updates `net.sourceforge.pmd:pmd-java` from 6.47.0 to 7.4.0
- [Release notes](https://github.com/pmd/pmd/releases)
-
[Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
-
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/7.4.0)
Updates `net.sourceforge.pmd:pmd-javascript` from 6.47.0 to 7.4.0
- [Release notes](https://github.com/pmd/pmd/releases)
-
[Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
-
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/7.4.0)
Updates `net.sourceforge.pmd:pmd-jsp` from 6.47.0 to 7.4.0
- [Release notes](https://github.com/pmd/pmd/releases)
-
[Changelog](https://github.com/pmd/pmd/blob/master/docs/render_release_notes.rb)
-
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/6.47.0...pmd_releases/7.4.0)
---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-core
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: net.sourceforge.pmd:pmd-java
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: net.sourceforge.pmd:pmd-javascript
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: net.sourceforge.pmd:pmd-jsp
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <supp...@github.com>
* Upgrade maven-pmd-plugin too
---------
Signed-off-by: dependabot[bot] <supp...@github.com>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Guillaume Nodet <gno...@gmail.com>
---
pom.xml | 4 ++--
.../src/main/java/org/apache/sshd/common/util/GenericUtils.java | 1 +
sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java | 5 +++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21ed6be59..78cace371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<maven.archiver.version>3.6.2</maven.archiver.version>
<plexus.archiver.version>4.8.0</plexus.archiver.version>
<!-- See https://pmd.github.io/ for available latest version -->
- <pmd.version>6.47.0</pmd.version>
+ <pmd.version>7.4.0</pmd.version>
<sshd.tests.timeout.factor>1.0</sshd.tests.timeout.factor>
<sshd.tests.rerun.count>2</sshd.tests.rerun.count>
@@ -930,7 +930,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.17.0</version>
+ <version>3.24.0</version>
<configuration>
<targetJdk>${javac.target}</targetJdk>
<printFailingErrors>true</printFailingErrors>
diff --git
a/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
b/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
index 8ca104790..57ffec51a 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
@@ -67,6 +67,7 @@ public final class GenericUtils {
/**
* The complement of {@link String#CASE_INSENSITIVE_ORDER}
*/
+ @SuppressWarnings("PMD.UseEqualsToCompareStrings")
public static final Comparator<String> CASE_SENSITIVE_ORDER = (s1, s2) -> {
if (s1 == s2) {
return 0;
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
index d91c13d12..9c8235b3e 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
@@ -1135,10 +1135,11 @@ public class ServerTest extends BaseTestSupport {
@Override
public void destroy(ChannelSession channel) {
- synchronized (name) {
+ Object lock = new Object();
+ synchronized (lock) {
if ("block".equals(name)) {
try {
- name.wait();
+ lock.wait();
} catch (InterruptedException e) {
e.printStackTrace(); // NOPMD
}
