diff --git a/build.gradle b/build.gradle index 566c2f4a8f0bd2..750b88226fec2b 100644 --- a/build.gradle +++ b/build.gradle @@ -530,6 +530,9 @@ subprojects { exclude 'src/**/resources/' exclude 'src/**/generated/' exclude 'src/**/mainGeneratedDataTemplate/' + exclude 'src/**/mainGeneratedAvroSchema/' + exclude 'src/**/mainGeneratedGraphQL/' + exclude 'src/**/generatedJsonSchema/' exclude 'src/**/mainGeneratedRest/' exclude 'src/renamed/avro/' exclude 'src/test/sample-test-plugins/' @@ -568,18 +571,6 @@ subprojects { } } } - - afterEvaluate { - def spotlessJavaTask = tasks.findByName('spotlessJava') - def processTask = tasks.findByName('processResources') - if (processTask != null) { - spotlessJavaTask.dependsOn processTask - } - def compileJavaTask = tasks.findByName('compileJava') - if (compileJavaTask != null) { - spotlessJavaTask.dependsOn compileJavaTask - } - } } afterEvaluate { diff --git a/datahub-graphql-core/build.gradle b/datahub-graphql-core/build.gradle index f7024d16d7f491..6151af72fb65cc 100644 --- a/datahub-graphql-core/build.gradle +++ b/datahub-graphql-core/build.gradle @@ -57,11 +57,6 @@ clean { delete 'src/mainGeneratedGraphQL' } -tasks.withType(Checkstyle) { - exclude "**/generated/**" -} - compileJava.dependsOn 'graphqlCodegen' build.dependsOn ':datahub-web-react:graphqlPrettierCheck' -spotlessApply.dependsOn ':datahub-web-react:graphqlPrettierWrite' sourceSets.main.java.srcDir "$projectDir/src/mainGeneratedGraphQL/java" diff --git a/entity-registry/build.gradle b/entity-registry/build.gradle index 6a0ea4d7105aea..fabc4e069cb15c 100644 --- a/entity-registry/build.gradle +++ b/entity-registry/build.gradle @@ -56,5 +56,3 @@ dependencies { testFixturesAnnotationProcessor externalDependency.lombok } compileTestJava.dependsOn tasks.getByPath(':entity-registry:custom-test-model:modelDeploy') - -spotlessJava.dependsOn generateTestDataTemplate \ No newline at end of file diff --git a/entity-registry/custom-test-model/build.gradle b/entity-registry/custom-test-model/build.gradle index c4303691360b9c..8e17de0709188b 100644 --- a/entity-registry/custom-test-model/build.gradle +++ b/entity-registry/custom-test-model/build.gradle @@ -78,8 +78,6 @@ configurations { } } -spotlessJava.dependsOn generateTestDataTemplate - //artifacts { // builtModels(modelArtifact) //} diff --git a/metadata-events/mxe-schemas/build.gradle b/metadata-events/mxe-schemas/build.gradle index 2d6284dadb2622..49351516e5f854 100644 --- a/metadata-events/mxe-schemas/build.gradle +++ b/metadata-events/mxe-schemas/build.gradle @@ -39,4 +39,8 @@ clean { delete 'bin' } -generateTestDataTemplate.dependsOn spotlessJava +// This project only contains generated code, so disable Spotless +tasks.withType(com.diffplug.gradle.spotless.SpotlessTask).configureEach { + enabled = false +} + diff --git a/metadata-service/restli-servlet-impl/build.gradle b/metadata-service/restli-servlet-impl/build.gradle index fc45653974d602..bd26e08ffa7b47 100644 --- a/metadata-service/restli-servlet-impl/build.gradle +++ b/metadata-service/restli-servlet-impl/build.gradle @@ -107,6 +107,3 @@ pegasus.main.idlOptions.addIdlItem([ ]) ext.apiProject = project(':metadata-service:restli-api') - -spotlessJava.dependsOn generateTestDataTemplate -spotlessJava.dependsOn generateIntegTestDataTemplate diff --git a/test-models/build.gradle b/test-models/build.gradle index 89bf4ec445440d..3cb7793605609e 100644 --- a/test-models/build.gradle +++ b/test-models/build.gradle @@ -17,5 +17,4 @@ idea { } } -sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/') -spotlessJava.dependsOn generateTestDataTemplate \ No newline at end of file +sourceSets.mainGeneratedDataTemplate.java.srcDirs('src/main/javaPegasus/') \ No newline at end of file