diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java index a73b433bab37..8a5b88892953 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java @@ -106,7 +106,7 @@ public final class GradleDistributionManager { GradleVersion.version("9.4.0"),// JDK-26 }; - private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("9.4.1"); //NOI18N + private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("9.6.1"); //NOI18N private static final int LATEST_SUPPORTED_MAJOR = 9; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/GradleInitWizard.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/GradleInitWizard.java index e58e03ed8522..38ed3bd02571 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/GradleInitWizard.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/GradleInitWizard.java @@ -64,6 +64,7 @@ public String toString() { "LBL_TFW_CPP_TEST=C++ Test", "LBL_TFW_JUNIT=JUnit 4", "LBL_TFW_JUNIT_5=JUnit 5", + "LBL_TFW_JUNIT_JUPITER=JUnit Jupiter", "LBL_TFW_KOTLIN_TEST=Kotlin Test", "LBL_TFW_SCALA_TEST=Scala Test", "LBL_TFW_SPOCK=Spock", @@ -73,7 +74,9 @@ public String toString() { public enum TestFramework { CPP_TEST("cpptest"), JUNIT("junit"), + @Deprecated JUNIT_5("junit-jupiter"), + JUNIT_JUPITER("junit-jupiter"), KOTLIN_TEST("kotlintest"), SCALA_TEST("scalatest"), SPOCK("spock"), @@ -96,6 +99,7 @@ public String toString() { case CPP_TEST -> Bundle.LBL_TFW_CPP_TEST(); case JUNIT -> Bundle.LBL_TFW_JUNIT(); case JUNIT_5 -> Bundle.LBL_TFW_JUNIT_5(); + case JUNIT_JUPITER -> Bundle.LBL_TFW_JUNIT_JUPITER(); case KOTLIN_TEST -> Bundle.LBL_TFW_KOTLIN_TEST(); case SCALA_TEST -> Bundle.LBL_TFW_SCALA_TEST(); case SPOCK -> Bundle.LBL_TFW_SPOCK(); diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list index 365f6a9fff03..2a2a60a2fa4c 100644 --- a/extide/libs.gradle/external/binaries-list +++ b/extide/libs.gradle/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -5DE943D707DEB36CD23919473870BF0A051AB24D https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/9.3.0/gradle-tooling-api-9.3.0.jar gradle-tooling-api-9.3.0.jar +1C800044DBAD7BACC5ED32E8A4AB76B0D7BA5276 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/9.6.1/gradle-tooling-api-9.6.1.jar gradle-tooling-api-9.6.1.jar diff --git a/extide/libs.gradle/external/gradle-tooling-api-9.3.0-license.txt b/extide/libs.gradle/external/gradle-tooling-api-9.6.1-license.txt similarity index 99% rename from extide/libs.gradle/external/gradle-tooling-api-9.3.0-license.txt rename to extide/libs.gradle/external/gradle-tooling-api-9.6.1-license.txt index 097d03d4a656..a97440f5cf0d 100644 --- a/extide/libs.gradle/external/gradle-tooling-api-9.3.0-license.txt +++ b/extide/libs.gradle/external/gradle-tooling-api-9.6.1-license.txt @@ -1,7 +1,7 @@ Name: Gradle Tooling API Description: Gradle Tooling API -Version: 9.3.0 -Files: gradle-tooling-api-9.3.0.jar +Version: 9.6.1 +Files: gradle-tooling-api-9.6.1.jar License: Apache-2.0 Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/libs.gradle/external/gradle-tooling-api-9.3.0-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-9.6.1-notice.txt similarity index 100% rename from extide/libs.gradle/external/gradle-tooling-api-9.3.0-notice.txt rename to extide/libs.gradle/external/gradle-tooling-api-9.6.1-notice.txt diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf index a3d2c2ea2660..0c966a412348 100644 --- a/extide/libs.gradle/manifest.mf +++ b/extide/libs.gradle/manifest.mf @@ -2,4 +2,4 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.libs.gradle/9 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 9.5 +OpenIDE-Module-Specification-Version: 9.6 diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties index 2ccf694acdfd..a130c577f0dd 100644 --- a/extide/libs.gradle/nbproject/project.properties +++ b/extide/libs.gradle/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial # Sigtest fails to read the classes in the gradle-tooling-api sigtest.skip.gen=true -release.external/gradle-tooling-api-9.3.0.jar=modules/gradle/gradle-tooling-api.jar +release.external/gradle-tooling-api-9.6.1.jar=modules/gradle/gradle-tooling-api.jar diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml index f3e83ec4cf56..6620741ceec3 100644 --- a/extide/libs.gradle/nbproject/project.xml +++ b/extide/libs.gradle/nbproject/project.xml @@ -39,7 +39,7 @@ gradle/gradle-tooling-api.jar - external/gradle-tooling-api-9.3.0.jar + external/gradle-tooling-api-9.6.1.jar diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java index e3cbd41ffa77..d35a73f122b2 100644 --- a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java +++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java @@ -38,7 +38,7 @@ public final class Wizards { private static final List JAVA_VERSIONS = List.of(26, 25, 21, 17, 11, 8); private static final List JAVA_TEST_FRAMEWORKS = List.of( JUNIT, - JUNIT_5, + JUNIT_JUPITER, TESTNG ); @@ -51,7 +51,7 @@ public static BaseGradleWizardIterator createJavaApplication() { return GradleInitWizard.create("java-application", Bundle.LBL_SimpleApplicationProject()) .withJavaVersions(JAVA_VERSIONS) .withTestframeworks(JAVA_TEST_FRAMEWORKS) - .withPreferredTestFramework(JUNIT_5) + .withPreferredTestFramework(JUNIT_JUPITER) .withImportantPaths(List.of( "app", "app/src/main/java/${package}/App.java" @@ -68,7 +68,7 @@ public static BaseGradleWizardIterator createJavaLibrary() { return GradleInitWizard.create("java-library", Bundle.LBL_SimpleApplicationProject()) .withJavaVersions(JAVA_VERSIONS) .withTestframeworks(JAVA_TEST_FRAMEWORKS) - .withPreferredTestFramework(JUNIT_5) + .withPreferredTestFramework(JUNIT_JUPITER) .withImportantPaths(List.of( "lib", "lib/src/main/java/${package}/Library.java" diff --git a/java/gradle.test/test/unit/src/org/netbeans/modules/gradle/test/GradleTestSuiteTest.java b/java/gradle.test/test/unit/src/org/netbeans/modules/gradle/test/GradleTestSuiteTest.java index 2cd2abc6bf16..6682dc775b52 100644 --- a/java/gradle.test/test/unit/src/org/netbeans/modules/gradle/test/GradleTestSuiteTest.java +++ b/java/gradle.test/test/unit/src/org/netbeans/modules/gradle/test/GradleTestSuiteTest.java @@ -21,6 +21,7 @@ import org.gradle.tooling.events.OperationDescriptor; import org.gradle.tooling.events.test.JvmTestKind; import org.gradle.tooling.events.test.JvmTestOperationDescriptor; +import org.gradle.tooling.events.test.source.TestSource; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -112,5 +113,10 @@ public String getMethodName() { public String getTestDisplayName() { throw new UnsupportedOperationException(); } + + @Override + public TestSource getSource() { + throw new UnsupportedOperationException(); + } } }