diff --git a/.run/All checks [PMD, modernizer, spotbugs, checkstyle].run.xml b/.run/All checks [PMD, spotbugs, checkstyle].run.xml similarity index 83% rename from .run/All checks [PMD, modernizer, spotbugs, checkstyle].run.xml rename to .run/All checks [PMD, spotbugs, checkstyle].run.xml index 64f2d50d7cc..2ab2d39399e 100644 --- a/.run/All checks [PMD, modernizer, spotbugs, checkstyle].run.xml +++ b/.run/All checks [PMD, spotbugs, checkstyle].run.xml @@ -1,5 +1,5 @@ - + - + \ No newline at end of file diff --git a/.run/Modernizer check [modernizer].run.xml b/.run/Modernizer check [modernizer].run.xml deleted file mode 100644 index 7e074415ac4..00000000000 --- a/.run/Modernizer check [modernizer].run.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - true - true - false - - - \ No newline at end of file diff --git a/DEVNOTES.md b/DEVNOTES.md index 28bc86e1eb7..572c4fba008 100644 --- a/DEVNOTES.md +++ b/DEVNOTES.md @@ -75,22 +75,6 @@ Run code style checks only: Code style check results are generated at: * `/build/reports/checkstyle/` -### Legacy API -The project is checked for legacy APIs with [Modernizer Gradle Plugin](https://plugins.gradle.org/plugin/com.github.andygoossens.gradle-modernizer-plugin). -* [Modernizer rules](check-rules/modernizer-rules.xml) - -Plugin is enabled by default and is bound to `build` task. - -Build project without legacy API check: -```shell -./gradlew clean build -x modernizer -``` - -Run legacy API checks only: -```shell -./gradlew modernizer -``` - ### Spotbugs The project is checked for bugs with [Spotbugs Gradle Plugin](https://github.com/spotbugs/spotbugs-gradle-plugin). * [Spotbugs exclusion rules](check-rules/spotbugs-excludes.xml) diff --git a/build.gradle b/build.gradle index 1c8664ec61d..de688c01d6c 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,6 @@ plugins { id('idea') alias(libs.plugins.ideaext) alias(libs.plugins.javacc) apply false - alias(libs.plugins.modernizer) apply false alias(libs.plugins.aggregateJavadoc) alias(libs.plugins.spotbugs) apply false } diff --git a/buildscripts/java-core.gradle b/buildscripts/java-core.gradle index d8b3c4474ca..e0e83c02781 100644 --- a/buildscripts/java-core.gradle +++ b/buildscripts/java-core.gradle @@ -20,7 +20,6 @@ apply plugin: 'jacoco' apply plugin: 'checkstyle' apply plugin: 'pmd' apply plugin: 'java-library' -apply plugin: libs.plugins.modernizer.get().pluginId apply plugin: libs.plugins.spotbugs.get().pluginId java { @@ -85,15 +84,6 @@ tasks.withType(Checkstyle) { } } -modernizer { - failOnViolations = true - includeTestClasses = false - violationsFile = "${rootDir}/check-rules/modernizer-rules.xml" - ignorePackages = ["org.apache.ignite.internal.sql.engine", - "org.apache.ignite.internal.generated", - "org.apache.ignite.rest.client"] -} - javadoc { source = sourceSets.main.allJava classpath = configurations.compileClasspath diff --git a/check-rules/modernizer-rules.xml b/check-rules/modernizer-rules.xml deleted file mode 100644 index dce02a219ea..00000000000 --- a/check-rules/modernizer-rules.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - java/lang/String.getBytes:()[B - 1.6 - Prefer java.lang.String.getBytes(java.nio.charset.Charset) - - - - - java/lang/String."<init>":([BII)V - 1.6 - Prefer java.lang.String.<init>(byte[], int, int, java.nio.charset.Charset) - - - - - java/lang/String."<init>":([B)V - 1.6 - Prefer java.lang.String.<init>(byte[], java.nio.charset.Charset) - - - - - java/io/ByteArrayOutputStream.toString:()Ljava/lang/String; - 1.10 - Prefer java.io.ByteArrayOutputStream.toString(java.nio.charset.Charset) - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 72b5e15fdf2..ac5259487fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,7 +94,6 @@ openapiGenerator = "org.openapi.generator:7.3.0" javacc = "com.intershop.gradle.javacc:4.1.3" shadow = "com.github.johnrengelman.shadow:7.1.2" cmake = "net.freudasoft.gradle-cmake-plugin:0.0.4" -modernizer = "com.github.andygoossens.modernizer:1.9.2" nebula = "com.netflix.nebula.ospackage:11.8.1" docker = "com.palantir.docker:0.35.0" checksum = "org.gradle.crypto.checksum:1.4.0"