Apache Lucene open-source search software
Build: remove hard-coded Java versions from ecj.javadocs.prefs (#14651)
David Smiley78da2ee038b2
diff --git a/gradle/ide/eclipse.gradle b/gradle/ide/eclipse.gradleindex 7e115e4baaf..e58a73d8999 100644--- a/gradle/ide/eclipse.gradle+++ b/gradle/ide/eclipse.gradle@@ -96,7 +96,8 @@ configure(rootProject) {from rootProject.file("${resources}/dot.settings")into rootProject.file(".settings")filter(ReplaceTokens, tokens: [- 'ecj-lint-config': ecjLintFile.getText('UTF-8').replaceAll(/=error\b/, '=' + errorMode)+ 'ecj-lint-config': ecjLintFile.getText('UTF-8').replaceAll(/=error\b/, '=' + errorMode),+ 'eclipseJavaVersion': eclipseJavaVersion as String])filteringCharset = 'UTF-8'diff --git a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefsindex ec5e6f89430..2f4303bb257 100644--- a/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs+++ b/gradle/ide/eclipse/dot.settings/org.eclipse.jdt.core.prefs@@ -1,5 +1,8 @@#Sun Sep 23 13:02:27 EDT 2012eclipse.preferences.version=1+org.eclipse.jdt.core.compiler.codegen.targetPlatform=@eclipseJavaVersion@+org.eclipse.jdt.core.compiler.compliance=@eclipseJavaVersion@+org.eclipse.jdt.core.compiler.source=@eclipseJavaVersion@# Note: all compiler flags are defined in ECJ linter configuration@ecj-lint-config@org.eclipse.jdt.core.formatter.align_type_members_on_columns=falsediff --git a/gradle/validation/ecj-lint.gradle b/gradle/validation/ecj-lint.gradleindex 37305399d1f..80bd9008688 100644--- a/gradle/validation/ecj-lint.gradle+++ b/gradle/validation/ecj-lint.gradle@@ -86,6 +86,8 @@ allprojects {classpath = ecjConfigurationmainClass = "org.eclipse.jdt.internal.compiler.batch.Main"+ // DOCS: https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-using_batch_compiler.htm+// Don't emit any .class files.// Hack around "-d none" still emitting package-info.class// by running in a temporary directory.@@ -94,6 +96,8 @@ allprojects {args += [ "-d", "none" ]+ assert project.java.sourceCompatibility == project.java.targetCompatibility+// Compilation environment.// we use -source/-target as it is significantly faster than --releaseargs += [ "-source", project.java.sourceCompatibility ]diff --git a/gradle/validation/ecj-lint/ecj.javadocs.prefs b/gradle/validation/ecj-lint/ecj.javadocs.prefsindex 974b6965268..66e8d2ea23e 100644--- a/gradle/validation/ecj-lint/ecj.javadocs.prefs+++ b/gradle/validation/ecj-lint/ecj.javadocs.prefs@@ -15,9 +15,7 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owninorg.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabledorg.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabledorg.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate-org.eclipse.jdt.core.compiler.codegen.targetPlatform=24org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve-org.eclipse.jdt.core.compiler.compliance=24org.eclipse.jdt.core.compiler.debug.lineNumber=generateorg.eclipse.jdt.core.compiler.debug.localVariable=generateorg.eclipse.jdt.core.compiler.debug.sourceFile=generate@@ -151,7 +149,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=errororg.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignoreorg.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=errororg.eclipse.jdt.core.compiler.release=disabled-org.eclipse.jdt.core.compiler.source=24org.eclipse.jdt.core.compiler.taskCaseSensitive=enabledorg.eclipse.jdt.core.compiler.taskPriorities=HIGHorg.eclipse.jdt.core.compiler.taskTags=nocommit