phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4854 from adangel/update-dependencies

Browse Source 
Update various dependencies
This commit is contained in:
Andreas Dangel
2024-03-07 16:51:14 +01:00
committed by GitHub
parent 84af109823 f42428b1c1
commit 1492c7cf78
13 changed files with 88 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mvn/wrapper/maven-wrapper.properties vendored
View File

@ -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

5
pmd-apex/pom.xml
View File

@ -96,11 +96,6 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>

1
pmd-core/pom.xml
View File

@ -121,7 +121,6 @@
<dependency>
<groupId>com.github.oowekyala.ooxml</groupId>
<artifactId>nice-xml-messages</artifactId>
<version>3.1</version>
</dependency>
<dependency>

6
pmd-dist/pom.xml
View File

@ -93,18 +93,16 @@
<goal>copy</goal>
</goals>
<configuration>
<!-- note: ant 1.9.x is still compatible with java7,
ant 1.10.x requires java8 -->
<artifactItems>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.16</version>
<version>${ant.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.9.16</version>
<version>${ant.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/ant</outputDirectory>

2
pmd-html/pom.xml
View File

@ -31,7 +31,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
<version>1.17.2</version>
</dependency>
<dependency>

24
pmd-java/pom.xml
View File

@ -12,7 +12,7 @@
</parent>
<properties>
<log4j.version>2.17.1</log4j.version>
<log4j.version>2.23.0</log4j.version>
</properties>
<build>
@ -167,11 +167,7 @@
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
@ -257,14 +253,26 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.11.0</version>
<version>3.25.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<version>1.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

5
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtil.java
View File

@ -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());
}

2
pmd-scala-modules/pmd-scala-common/pom.xml
View File

@ -13,7 +13,7 @@
</parent>
<properties>
<scalameta.version>4.8.11</scalameta.version>
<scalameta.version>4.9.1</scalameta.version>
</properties>
<build>

23
pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt vendored
View File

@ -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

2
pmd-scala-modules/pmd-scala_2.12/pom.xml
View File

@ -36,7 +36,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scalaVersion}.18</version>
<version>${scalaVersion}.19</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>

2
pmd-scala-modules/pmd-scala_2.13/pom.xml
View File

@ -36,7 +36,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scalaVersion}.12</version>
<version>${scalaVersion}.13</version>
</dependency>
<dependency>
<groupId>org.scalameta</groupId>

2
pmd-test-schema/pom.xml
View File

@ -45,8 +45,6 @@
<dependency>
<groupId>com.github.oowekyala.ooxml</groupId>
<artifactId>nice-xml-messages</artifactId>
<version>3.1</version>
<scope>compile</scope>
</dependency>
<dependency>

105
pom.xml
View File

File diff suppressed because it is too large Load Diff