Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable annotation processor for docs #30610

Merged
merged 6 commits into from
May 21, 2018
Merged

disable annotation processor for docs #30610

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
54ab648
disable annotation processor for docs
alpar-t May 15, 2018
c5a334f
Disable annotation processors for all tests
alpar-t May 16, 2018
74824fd
Merge branch '9434f25' into fix/30476
alpar-t May 16, 2018
126e5c0
remove redundant `-proc:none` already handled by required plugins
alpar-t May 17, 2018
97eac87
Revert unintentional changes
alpar-t May 18, 2018
8e68b87
Merge commit '9be3fbd' into fix/30476
alpar-t May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.gradle.api.InvalidUserDataException
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.tasks.compile.JavaCompile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the changes in this file are extraneous and should be reverted


/**
* Adds support for starting an Elasticsearch cluster before running integration
Expand All @@ -48,5 +49,6 @@ public class RestTestPlugin implements Plugin<Project> {
integTest.group = JavaBasePlugin.VERIFICATION_GROUP
integTest.mustRunAfter(project.precommit)
project.check.dependsOn(integTest)

}
}
8 changes: 8 additions & 0 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/test/StandaloneTestPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.elasticsearch.gradle.BuildPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.tasks.compile.JavaCompile

/**
* Configures the build to compile against Elasticsearch's test framework and
Expand All @@ -49,5 +50,12 @@ public class StandaloneTestPlugin implements Plugin<Project> {
test.testClassesDir project.sourceSets.test.output.classesDir
test.mustRunAfter(project.precommit)
project.check.dependsOn(test)

project.tasks.withType(JavaCompile) {
// This will be the default in Gradle 5.0
if (options.compilerArgs.contains("-processor") == false) {
options.compilerArgs << '-proc:none'
}
}
}
}