diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 8d98d6dd41..4a95a1367b 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml
index f557b122c9..12538bc44d 100644
--- a/pmd-apex/pom.xml
+++ b/pmd-apex/pom.xml
@@ -96,11 +96,6 @@
commons-lang3
-
- com.google.guava
- guava
-
-
org.hamcrest
hamcrest
diff --git a/pmd-core/pom.xml b/pmd-core/pom.xml
index 27b39da16f..4b9a2c2de7 100644
--- a/pmd-core/pom.xml
+++ b/pmd-core/pom.xml
@@ -121,7 +121,6 @@
com.github.oowekyala.ooxml
nice-xml-messages
- 3.1
diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml
index 998ed84cf8..754127eed1 100644
--- a/pmd-dist/pom.xml
+++ b/pmd-dist/pom.xml
@@ -93,18 +93,16 @@
copy
-
org.apache.ant
ant
- 1.9.16
+ ${ant.version}
org.apache.ant
ant-launcher
- 1.9.16
+ ${ant.version}
${project.build.directory}/ant
diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml
index d5ad36a9e7..6c99408260 100644
--- a/pmd-html/pom.xml
+++ b/pmd-html/pom.xml
@@ -31,7 +31,7 @@
org.jsoup
jsoup
- 1.15.3
+ 1.17.2
diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml
index 0999263c4e..06731e76d4 100644
--- a/pmd-java/pom.xml
+++ b/pmd-java/pom.xml
@@ -12,7 +12,7 @@
- 2.17.1
+ 2.23.0
@@ -167,11 +167,7 @@
hamcrest
test
-
- junit
- junit
- test
-
+
org.junit.jupiter
junit-jupiter
@@ -257,14 +253,26 @@
org.assertj
assertj-core
- 3.11.0
+ 3.25.3
test
commons-logging
commons-logging
- 1.2
+ 1.3.0
test
+
+ junit
+ junit
+ 4.13.2
+ test
+
+
+ org.hamcrest
+ hamcrest-core
+
+
+
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
index 95a0f5cf50..cbb4c83810 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
@@ -181,7 +181,10 @@ public final class TestFrameworksUtil {
}
private static boolean isSoftAssert(ASTMethodCall call) {
- return TypeTestUtil.isA("org.assertj.core.api.AbstractSoftAssertions", call.getMethodType().getDeclaringType())
+ JTypeMirror declaringType = call.getMethodType().getDeclaringType();
+ return (TypeTestUtil.isA("org.assertj.core.api.StandardSoftAssertionsProvider", declaringType)
+ || TypeTestUtil.isA("org.assertj.core.api.Java6StandardSoftAssertionsProvider", declaringType)
+ || TypeTestUtil.isA("org.assertj.core.api.AbstractSoftAssertions", declaringType))
&& !"assertAll".equals(call.getMethodName());
}
diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml
index 1c384420fd..4ed8e83a35 100644
--- a/pmd-scala-modules/pmd-scala-common/pom.xml
+++ b/pmd-scala-modules/pmd-scala-common/pom.xml
@@ -13,7 +13,7 @@
- 4.8.11
+ 4.9.1
diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
index 18a538a8ff..7512ade684 100644
--- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
+++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt
@@ -551,17 +551,18 @@
| | +- LitString
| | +- LitString
| | +- TermName
- | | +- TermApplyInfix
- | | +- TermName
- | | +- TermName
- | | +- TypeArgClause
- | | +- TermArgClause
- | | +- TermApplyInfix
- | | +- TermName
- | | +- TermName
- | | +- TypeArgClause
- | | +- TermArgClause
- | | +- LitInt
+ | | +- TermBlock
+ | | +- TermApplyInfix
+ | | +- TermName
+ | | +- TermName
+ | | +- TypeArgClause
+ | | +- TermArgClause
+ | | +- TermApplyInfix
+ | | +- TermName
+ | | +- TermName
+ | | +- TypeArgClause
+ | | +- TermArgClause
+ | | +- LitInt
| +- DefnDef
| | +- ModFinal
| | +- ModOverride
diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml
index df559e02ea..d23b7bdaa9 100644
--- a/pmd-scala-modules/pmd-scala_2.12/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml
@@ -36,7 +36,7 @@
org.scala-lang
scala-library
- ${scalaVersion}.18
+ ${scalaVersion}.19
org.scalameta
diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml
index 03a78aeee8..2f8f799873 100644
--- a/pmd-scala-modules/pmd-scala_2.13/pom.xml
+++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml
@@ -36,7 +36,7 @@
org.scala-lang
scala-library
- ${scalaVersion}.12
+ ${scalaVersion}.13
org.scalameta
diff --git a/pmd-test-schema/pom.xml b/pmd-test-schema/pom.xml
index c81c7b26dc..da907c0e1a 100644
--- a/pmd-test-schema/pom.xml
+++ b/pmd-test-schema/pom.xml
@@ -45,8 +45,6 @@
com.github.oowekyala.ooxml
nice-xml-messages
- 3.1
- compile
diff --git a/pom.xml b/pom.xml
index 375ed528d3..1023a1540d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,15 +96,15 @@
1.7.20
5.0
- 3.0.0-M8
- 10.7.0
+ 3.2.5
+ 10.14.0
3.3.1
3.21.2
- 1.10.13
- 3.4.1
- 4.9.1
+ 1.10.14
+ 3.6.3
+ 4.9.3
1.7.36
- 10.7
+ 10.9
UTF-8
UTF-8
@@ -164,17 +164,17 @@
org.apache.maven.plugins
maven-assembly-plugin
- 3.5.0
+ 3.6.0
org.apache.maven.plugins
maven-dependency-plugin
- 3.5.0
+ 3.6.1
org.apache.maven.plugins
maven-release-plugin
- 3.0.0-M7
+ 3.0.1
pmd-release,sign
true
@@ -187,14 +187,14 @@
org.apache.maven.plugins
maven-clean-plugin
- 3.2.0
+ 3.3.2
org.codehaus.mojo
build-helper-maven-plugin
- 3.3.0
+ 3.5.0
add-kotlin-source-dir
@@ -257,7 +257,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.10.1
+ 3.12.1
${java.version}
@@ -295,12 +295,12 @@
org.apache.maven.plugins
maven-deploy-plugin
- 3.1.0
+ 3.1.1
org.apache.maven.plugins
maven-install-plugin
- 3.1.0
+ 3.1.1
org.apache.maven.plugins
@@ -310,7 +310,7 @@
org.apache.maven.plugins
maven-resources-plugin
- 3.3.0
+ 3.3.1
${project.build.sourceEncoding}
@@ -318,7 +318,7 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.4.1
+ 3.5.2
org.apache.maven.plugins
@@ -356,12 +356,12 @@
org.codehaus.mojo
exec-maven-plugin
- 3.1.0
+ 3.2.0
org.apache.maven.plugins
maven-source-plugin
- 3.2.1
+ 3.3.0
org.apache.maven.plugins
@@ -457,7 +457,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.2.1
+ 3.4.1
org.apache.maven.plugins
@@ -548,12 +548,12 @@
org.apache.maven.plugins
maven-site-plugin
- 4.0.0-M4
+ 4.0.0-M13
org.codehaus.mojo
versions-maven-plugin
- 2.14.2
+ 2.16.2
org.sonatype.plugins
@@ -568,7 +568,7 @@
org.cyclonedx
cyclonedx-maven-plugin
- 2.7.9
+ 2.7.11
@@ -721,7 +721,7 @@
info.picocli
picocli
- 4.7.0
+ 4.7.5
me.tongfei
@@ -736,7 +736,7 @@
org.pcollections
pcollections
- 3.1.3
+ 3.2.0
net.sourceforge.pmd
@@ -756,12 +756,7 @@
org.checkerframework
checker-qual
- 2.5.2
-
-
- net.sourceforge.saxon
- saxon
- 9.1.0.8
+ 2.11.1
net.sf.saxon
@@ -771,12 +766,12 @@
org.apache.commons
commons-lang3
- 3.8.1
+ 3.14.0
org.apache.commons
commons-text
- 1.3
+ 1.11.0
org.slf4j
@@ -796,12 +791,12 @@
org.apache.groovy
groovy
- 4.0.15
+ 4.0.19
com.google.code.gson
gson
- 2.8.9
+ 2.10.1
org.yaml
@@ -814,11 +809,16 @@
33.0.0-jre
-
+
org.scala-lang
scala-reflect
- 2.13.12
+ 2.13.13
+
+
+ org.scala-lang
+ scala-library
+ 2.13.13
@@ -836,6 +836,12 @@
test
+
+ com.github.oowekyala.ooxml
+ nice-xml-messages
+ 3.1
+
+
com.github.oowekyala.treeutils
tree-matchers
@@ -859,7 +865,7 @@
org.junit
junit-bom
- 5.8.2
+ ${junit5.version}
pom
import
@@ -867,7 +873,7 @@
org.junit.platform
junit-platform-suite
- 1.9.0-M1
+ 1.10.2
test
@@ -878,19 +884,6 @@
test
-
- junit
- junit
- 4.13.1
- test
-
-
- org.hamcrest
- hamcrest-core
-
-
-
-
org.mockito
mockito-core
@@ -905,13 +898,13 @@
net.bytebuddy
byte-buddy
- 1.14.9
+ 1.14.12
test
net.bytebuddy
byte-buddy-agent
- 1.14.9
+ 1.14.12
test
@@ -993,7 +986,7 @@
org.jetbrains
annotations
- 13.0
+ 24.1.0
test
@@ -1006,7 +999,7 @@
com.google.protobuf
protobuf-java
- 3.16.3
+ 3.25.3