|
|
@@ -40,23 +40,10 @@ dependencies {
|
|
|
internalClusterTestImplementation project(":modules:mapper-extras")
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * IntelliJ will always put the java files generated by the annotation processor
|
|
|
- * into src/main/java/generated so we make gradle play along. This block makes
|
|
|
- * it put the generated files into the same spot and the next block stops it from
|
|
|
- * trying to compile the generated files in the regular compile - it'll regenerate
|
|
|
- * them and *then* compile them.
|
|
|
- */
|
|
|
tasks.named("compileJava").configure {
|
|
|
- options.compilerArgs.addAll(["-s", "${projectDir}/src/main/java/generated"])
|
|
|
-}
|
|
|
-
|
|
|
-tasks.named("javadoc").configure {
|
|
|
- include("${projectDir}/src/main/java/generated")
|
|
|
-}
|
|
|
-
|
|
|
-sourceSets.main.java {
|
|
|
- exclude 'generated/**'
|
|
|
+ options.compilerArgs.addAll(["-s", "${projectDir}/src/main/generated"])
|
|
|
+ // IntelliJ sticks generated files here and we can't stop it....
|
|
|
+ exclude { it.file.toString().startsWith("${projectDir}/src/main/generated-src/generated") }
|
|
|
}
|
|
|
|
|
|
tasks.named("test").configure {
|
|
|
@@ -149,7 +136,8 @@ pluginManager.withPlugin('com.diffplug.spotless') {
|
|
|
// for some reason "${outputPath}/EsqlBaseParser*.java" does not match the same files...
|
|
|
targetExclude "src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer*.java",
|
|
|
"src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser*.java",
|
|
|
- "src/main/java/generated/**/*.java"
|
|
|
+ "src/main/generated/**/*.java",
|
|
|
+ "src/main/generated-src/generated/**/*.java"
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -250,6 +238,8 @@ tasks.register("regen") {
|
|
|
tasks.named("spotlessJava") { dependsOn stringTemplates }
|
|
|
tasks.named('checkstyleMain').configure {
|
|
|
excludes = [ "**/*.java.st" ]
|
|
|
+ exclude { it.file.toString().startsWith("${projectDir}/src/main/generated-src/generated") }
|
|
|
+ exclude { it.file.toString().startsWith("${projectDir}/src/main/generated") }
|
|
|
}
|
|
|
|
|
|
def prop(Type, type, TYPE, BYTES, Array) {
|