diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 52b0c8e377..1fa9d1e229 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") implementation("com.github.node-gradle:gradle-node-plugin:3.5.1") implementation("com.gradle:develocity-gradle-plugin:3.17.2") - implementation("com.tngtech.archunit:archunit:1.3.0") + implementation("com.tngtech.archunit:archunit:1.4.1") implementation("commons-codec:commons-codec:${commonsCodecVersion}") implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0") implementation("dev.adamko.dokkatoo:dokkatoo-plugin:2.3.1") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 93a89a9219..d88b8402a4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -47,7 +47,7 @@ dependencies { testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) testImplementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("com.fasterxml.jackson.module:jackson-module-parameter-names") - testImplementation("com.tngtech.archunit:archunit-junit5:0.22.0") + testImplementation("com.tngtech.archunit:archunit-junit5:1.4.0") testImplementation("net.java.dev.jna:jna-platform") testImplementation("org.apache.commons:commons-compress") testImplementation("org.apache.httpcomponents.client5:httpclient5") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/TaskConfigurationAvoidanceTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/TaskConfigurationAvoidanceTests.java index 7b3e241388..92934e8a99 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/TaskConfigurationAvoidanceTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/TaskConfigurationAvoidanceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ package org.springframework.boot.gradle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.function.Predicate; import java.util.regex.Pattern; import com.tngtech.archunit.base.DescribedPredicate; -import com.tngtech.archunit.base.Predicate; import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.domain.JavaMethodCall; import com.tngtech.archunit.core.domain.JavaType; @@ -75,9 +75,9 @@ class TaskConfigurationAvoidanceTests { } @Override - public boolean apply(JavaMethodCall methodCall) { + public boolean test(JavaMethodCall methodCall) { for (Predicate spec : this.prohibited) { - if (spec.apply(methodCall)) { + if (spec.test(methodCall)) { return true; } } @@ -119,7 +119,7 @@ class TaskConfigurationAvoidanceTests { } @Override - public boolean apply(JavaMethodCall methodCall) { + public boolean test(JavaMethodCall methodCall) { return methodCall.getTargetOwner().isEquivalentTo(this.owner) && methodCall.getName().equals(this.name); } @@ -135,8 +135,8 @@ class TaskConfigurationAvoidanceTests { } @Override - public boolean apply(JavaMethodCall methodCall) { - return super.apply(methodCall) && match(methodCall.getTarget().getParameterTypes()); + public boolean test(JavaMethodCall methodCall) { + return super.test(methodCall) && match(methodCall.getTarget().getParameterTypes()); } private boolean match(List callParameterTypes) {