Skip to content

Commit f702086

Browse files
alpar-tnik9000
authored andcommitted
Build: Fix naming conventions task (#31681)
Move min compiler and runtime version to files so we can fix the source and target comparability of the build script to those Closes #31665
1 parent 8c78fe7 commit f702086

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

buildSrc/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
20-
2119
import java.nio.file.Files
2220

2321
plugins {
@@ -41,6 +39,12 @@ if (project == rootProject) {
4139
buildDir = 'build-bootstrap'
4240
}
4341

42+
// Make sure :buildSrc: doesn't generate classes incompatible with RUNTIME_JAVA_HOME
43+
// We can't use BuildPlugin here, so read from file
44+
String minimumRuntimeVersion = file('src/main/resources/minimumRuntimeVersion').text.trim()
45+
targetCompatibility = minimumRuntimeVersion
46+
sourceCompatibility = minimumRuntimeVersion
47+
4448
/*****************************************************************************
4549
* Propagating version.properties to the rest of the build *
4650
*****************************************************************************/

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.elasticsearch.gradle
2020

2121
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
22-
import nebula.plugin.extraconfigurations.ProvidedBasePlugin
2322
import org.apache.tools.ant.taskdefs.condition.Os
2423
import org.eclipse.jgit.lib.Constants
2524
import org.eclipse.jgit.lib.RepositoryBuilder
@@ -58,9 +57,6 @@ import java.time.ZonedDateTime
5857
*/
5958
class BuildPlugin implements Plugin<Project> {
6059

61-
static final JavaVersion minimumRuntimeVersion = JavaVersion.VERSION_1_8
62-
static final JavaVersion minimumCompilerVersion = JavaVersion.VERSION_1_10
63-
6460
@Override
6561
void apply(Project project) {
6662
if (project.pluginManager.hasPlugin('elasticsearch.standalone-rest-test')) {
@@ -95,6 +91,12 @@ class BuildPlugin implements Plugin<Project> {
9591
/** Performs checks on the build environment and prints information about the build environment. */
9692
static void globalBuildInfo(Project project) {
9793
if (project.rootProject.ext.has('buildChecksDone') == false) {
94+
JavaVersion minimumRuntimeVersion = JavaVersion.toVersion(
95+
BuildPlugin.class.getClassLoader().getResourceAsStream("minimumRuntimeVersion").text.trim()
96+
)
97+
JavaVersion minimumCompilerVersion = JavaVersion.toVersion(
98+
BuildPlugin.class.getClassLoader().getResourceAsStream("minimumCompilerVersion").text.trim()
99+
)
98100
String compilerJavaHome = findCompilerJavaHome()
99101
String runtimeJavaHome = findRuntimeJavaHome(compilerJavaHome)
100102
File gradleJavaHome = Jvm.current().javaHome
@@ -192,10 +194,12 @@ class BuildPlugin implements Plugin<Project> {
192194
project.rootProject.ext.runtimeJavaVersion = runtimeJavaVersionEnum
193195
project.rootProject.ext.javaVersions = javaVersions
194196
project.rootProject.ext.buildChecksDone = true
197+
project.rootProject.ext.minimumCompilerVersion = minimumCompilerVersion
198+
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
195199
}
196200

197-
project.targetCompatibility = minimumRuntimeVersion
198-
project.sourceCompatibility = minimumRuntimeVersion
201+
project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion
202+
project.sourceCompatibility = project.rootProject.ext.minimumRuntimeVersion
199203

200204
// set java home for each project, so they dont have to find it in the root project
201205
project.ext.compilerJavaHome = project.rootProject.ext.compilerJavaHome
@@ -348,7 +352,7 @@ class BuildPlugin implements Plugin<Project> {
348352
// just a self contained test-fixture configuration, likely transitive and hellacious
349353
return
350354
}
351-
configuration.resolutionStrategy {
355+
configuration.resolutionStrategy {
352356
failOnVersionConflict()
353357
}
354358
})
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.10
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.8

buildSrc/src/test/java/org/elasticsearch/gradle/precommit/NamingConventionsTaskIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.gradle.testkit.runner.BuildResult;
55
import org.gradle.testkit.runner.GradleRunner;
66
import org.gradle.testkit.runner.TaskOutcome;
7-
import org.junit.Ignore;
87

98
import java.util.Arrays;
109

@@ -22,7 +21,6 @@ public void testPluginCanBeApplied() {
2221
assertTrue(output, output.contains("build plugin can be applied"));
2322
}
2423

25-
@Ignore("AwaitsFix : https://github.com/elastic/elasticsearch/issues/31665")
2624
public void testNameCheckFailsAsItShould() {
2725
BuildResult result = GradleRunner.create()
2826
.withProjectDir(getProjectDir("namingConventionsSelfTest"))
@@ -48,7 +46,6 @@ public void testNameCheckFailsAsItShould() {
4846
}
4947
}
5048

51-
@Ignore("AwaitsFix : https://github.com/elastic/elasticsearch/issues/31665")
5249
public void testNameCheckFailsAsItShouldWithMain() {
5350
BuildResult result = GradleRunner.create()
5451
.withProjectDir(getProjectDir("namingConventionsSelfTest"))

0 commit comments

Comments
 (0)