You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2022/10/02 18:43:04 UTC
[lucene] branch branch_9x updated: Clean up MR-JAR build, so we do not have hardcoded "19" everywhere in validation tasks (#11835)
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 3f42e23d06f Clean up MR-JAR build, so we do not have hardcoded "19" everywhere in validation tasks (#11835)
3f42e23d06f is described below
commit 3f42e23d06f1b324754473d57fc905e3085d86c6
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Sun Oct 2 20:41:46 2022 +0200
Clean up MR-JAR build, so we do not have hardcoded "19" everywhere in validation tasks (#11835)
As long as soureSets are named "mainXX", with XX a feature version, we check everything automatically:
- ECJ is disabled (we can't do a check without forking ECJ as a separate process using toolkit, we may support this later)
- forbiddenapis (we disable checks for missing classes)
- errorprone is disabled (errorprone does not work correctly at moment with forked compiler)
---
gradle/validation/ecj-lint.gradle | 9 ++++++---
gradle/validation/error-prone.gradle | 4 ++--
gradle/validation/forbidden-apis.gradle | 6 ++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradle
index 7587a02f465..7a59ed5e10d 100644
--- a/gradle/validation/ecj-lint.gradle
+++ b/gradle/validation/ecj-lint.gradle
@@ -34,9 +34,7 @@ allprojects {
// Create a [sourceSetName]EcjLint task for each source set
// with a non-empty java.srcDirs. These tasks are then
// attached to project's "ecjLint" task.
-
- // TODO: Better way to disable on our MR-JAR
- def lintTasks = sourceSets.findAll { it.name != 'main19' }.collect { sourceSet ->
+ def lintTasks = sourceSets.collect { sourceSet ->
def srcDirs = sourceSet.java.sourceDirectories
.filter { dir -> dir.exists() }
@@ -54,6 +52,11 @@ allprojects {
// that don't have any Java source directories.
enabled = !srcDirs.isEmpty()
+ // Ignore MR-JAR sourceSets.
+ if (sourceSet.name ==~ /main\d+/) {
+ enabled = false
+ }
+
classpath = rootProject.configurations.ecjDeps
mainClass = "org.eclipse.jdt.internal.compiler.batch.Main"
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index e4e1d349758..962e237cc03 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -58,8 +58,8 @@ allprojects { prj ->
}
tasks.withType(JavaCompile) { task ->
- // TODO: Better way to disable on our MR-JAR
- if (task.name == 'compileMain19Java') {
+ // Disable errorprone on the MR-JAR tasks
+ if (task.name ==~ /compileMain\d+Java/) {
options.errorprone.enabled = false
return
}
diff --git a/gradle/validation/forbidden-apis.gradle b/gradle/validation/forbidden-apis.gradle
index c124895ec1e..1c3d5808e5f 100644
--- a/gradle/validation/forbidden-apis.gradle
+++ b/gradle/validation/forbidden-apis.gradle
@@ -57,7 +57,7 @@ allprojects { prj ->
}
// Configure defaults for sourceSets.main
- tasks.matching { it.name in ["forbiddenApisMain", "forbiddenApisMain19"] }.all {
+ tasks.matching { it.name ==~ /forbiddenApisMain\d*/ }.all {
bundledSignatures += [
'jdk-unsafe',
'jdk-deprecated',
@@ -76,10 +76,8 @@ allprojects { prj ->
// Configure defaults for the MR-JAR feature sourceSets by setting java version and ignore missing classes
// TODO:
// - Get hold of warning messages, see https://github.com/policeman-tools/forbidden-apis/issues/207
- // - Allow using newer bundled signatures, see: https://github.com/policeman-tools/forbidden-apis/issues/207
- tasks.matching { it.name == "forbiddenApisMain19" }.all {
+ tasks.matching { it.name ==~ /forbiddenApisMain\d+/ }.all {
failOnMissingClasses = false
- targetCompatibility = rootProject.minJavaVersion
}
// Configure defaults for sourceSets.test