Cleanup for Checkstyle #1370 (#1492)

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
opensearch-project · Nov 2, 2021 · fd39137 · fd39137
1 parent c6e79ef
commit fd39137
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 523 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -115,8 +115,6 @@ dependencies {
   api 'org.apache.maven:maven-model:3.6.2'
   api 'com.networknt:json-schema-validator:1.0.36'
 
-  compileOnly "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
-  testImplementation "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
   testFixturesApi "junit:junit:${props.getProperty('junit')}"
   testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
   testFixturesApi gradleApi()

diff --git a/buildSrc/src/integTest/java/org/opensearch/gradle/ExportOpenSearchBuildResourcesTaskIT.java b/buildSrc/src/integTest/java/org/opensearch/gradle/ExportOpenSearchBuildResourcesTaskIT.java
@@ -33,34 +33,11 @@
 package org.opensearch.gradle;
 
 import org.opensearch.gradle.test.GradleIntegrationTestCase;
-import org.gradle.testkit.runner.BuildResult;
 
 public class ExportOpenSearchBuildResourcesTaskIT extends GradleIntegrationTestCase {
 
     public static final String PROJECT_NAME = "opensearch-build-resources";
 
-    public void testUpToDateWithSourcesConfigured() {
-        getGradleRunner(PROJECT_NAME).withArguments("clean", "-s").build();
-
-        BuildResult result = getGradleRunner(PROJECT_NAME).withArguments("buildResources", "-s", "-i").build();
-        assertTaskSuccessful(result, ":buildResources");
-        assertBuildFileExists(result, PROJECT_NAME, "build-tools-exported/checkstyle.xml");
-        assertBuildFileExists(result, PROJECT_NAME, "build-tools-exported/checkstyle_suppressions.xml");
-
-        result = getGradleRunner(PROJECT_NAME).withArguments("buildResources", "-s", "-i").build();
-        assertTaskUpToDate(result, ":buildResources");
-        assertBuildFileExists(result, PROJECT_NAME, "build-tools-exported/checkstyle.xml");
-        assertBuildFileExists(result, PROJECT_NAME, "build-tools-exported/checkstyle_suppressions.xml");
-    }
-
-    public void testOutputAsInput() {
-        BuildResult result = getGradleRunner(PROJECT_NAME).withArguments("clean", "sampleCopy", "-s", "-i").build();
-
-        assertTaskSuccessful(result, ":sampleCopy");
-        assertBuildFileExists(result, PROJECT_NAME, "sampleCopy/checkstyle.xml");
-        assertBuildFileExists(result, PROJECT_NAME, "sampleCopy/checkstyle_suppressions.xml");
-    }
-
     public void testIncorrectUsage() {
         assertOutputContains(
             getGradleRunner(PROJECT_NAME).withArguments("noConfigAfterExecution", "-s", "-i").buildAndFail().getOutput(),

diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/precommit/PrecommitTasks.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/precommit/PrecommitTasks.groovy
@@ -40,7 +40,6 @@ class PrecommitTasks {
 
     static void create(Project project, boolean includeDependencyLicenses) {
 
-        project.pluginManager.apply(CheckstylePrecommitPlugin)
         project.pluginManager.apply(ForbiddenApisPrecommitPlugin)
         project.pluginManager.apply(JarHellPrecommitPlugin)
         project.pluginManager.apply(ForbiddenPatternsPrecommitPlugin)

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/checkstyle/SnippetLengthCheck.java b/buildSrc/src/main/java/org/opensearch/gradle/checkstyle/SnippetLengthCheck.java
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/precommit/CheckstylePrecommitPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/precommit/CheckstylePrecommitPlugin.java
diff --git a/buildSrc/src/main/resources/checkstyle.xml b/buildSrc/src/main/resources/checkstyle.xml