From f8699722add62e9089779b188e0eb61bae70c70e Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Tue, 23 Jun 2020 12:11:51 +0200 Subject: [PATCH 1/2] Remove minimumRuntime sourceSet from build-tools fixes #58351 --- buildSrc/build.gradle | 33 +++---------------- .../org/elasticsearch/gradle/BwcVersions.java | 0 .../elasticsearch/gradle/JdkJarHellCheck.java | 0 .../gradle/LazyFileOutputStream.java | 0 .../org/elasticsearch/gradle/LoggedExec.java | 21 ++++++++++-- .../org/elasticsearch/gradle/Version.java | 0 .../gradle/VersionProperties.java | 0 .../gradle/info/BuildParams.java | 0 .../elasticsearch/gradle/info/JavaHome.java | 0 9 files changed, 24 insertions(+), 30 deletions(-) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/BwcVersions.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/JdkJarHellCheck.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/LazyFileOutputStream.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/LoggedExec.java (87%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/Version.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/VersionProperties.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/info/BuildParams.java (100%) rename buildSrc/src/{minimumRuntime => main}/java/org/elasticsearch/gradle/info/JavaHome.java (100%) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6957fe6af413b..79ebb65a49a34 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -69,29 +69,14 @@ allprojects { } sourceSets { - // We have a few classes that need to be compiled for older java versions - minimumRuntime {} - integTest { compileClasspath += sourceSets["main"].output + configurations["testRuntimeClasspath"] runtimeClasspath += output + compileClasspath } } -compileMinimumRuntimeJava { - targetCompatibility = 8 - sourceCompatibility = 8 - tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' - } -} - -jar { - from sourceSets.minimumRuntime.output -} - -javadoc { - source sourceSets.minimumRuntime.allSource +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' } /***************************************************************************** @@ -103,12 +88,8 @@ repositories { } dependencies { - if (project.ext.has("isEclipse") == false || project.ext.isEclipse == false) { - // eclipse is confused if this is set explicitly - compile sourceSets.minimumRuntime.output - } - compile localGroovy() + compile gradleApi() compile 'commons-codec:commons-codec:1.12' compile 'org.apache.commons:commons-compress:1.19' @@ -132,11 +113,8 @@ dependencies { testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2' testImplementation 'org.mockito:mockito-core:1.9.5' integTestImplementation('org.spockframework:spock-core:1.3-groovy-2.5') { - exclude module:"groovy" + exclude module: "groovy" } - minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}" - minimumRuntimeCompile localGroovy() - minimumRuntimeCompile gradleApi() } /***************************************************************************** @@ -173,8 +151,7 @@ if (project != rootProject) { // build-tools is not ready for primetime with these... tasks.named("dependencyLicenses").configure { it.enabled = false } dependenciesInfo.enabled = false - disableTasks('forbiddenApisMain', 'forbiddenApisMinimumRuntime', - 'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures') + disableTasks('forbiddenApisMain', 'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures') jarHell.enabled = false thirdPartyAudit.enabled = false if (org.elasticsearch.gradle.info.BuildParams.inFipsJvm) { diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/BwcVersions.java b/buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/BwcVersions.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/JdkJarHellCheck.java b/buildSrc/src/main/java/org/elasticsearch/gradle/JdkJarHellCheck.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/JdkJarHellCheck.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/JdkJarHellCheck.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/LazyFileOutputStream.java b/buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/LazyFileOutputStream.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/LoggedExec.java b/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java similarity index 87% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/LoggedExec.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java index 45324e4bc1808..86f2aba21b9ce 100644 --- a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/LoggedExec.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java @@ -1,3 +1,22 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.elasticsearch.gradle; import org.gradle.api.Action; @@ -7,7 +26,6 @@ import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; import org.gradle.api.tasks.Exec; -import org.gradle.api.tasks.Internal; import org.gradle.process.BaseExecSpec; import org.gradle.process.ExecOperations; import org.gradle.process.ExecResult; @@ -66,7 +84,6 @@ public void execute(Task task) { } } - @Internal public void setSpoolOutput(boolean spoolOutput) { final OutputStream out; if (spoolOutput) { diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/Version.java b/buildSrc/src/main/java/org/elasticsearch/gradle/Version.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/Version.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/Version.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/VersionProperties.java b/buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/VersionProperties.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java b/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java diff --git a/buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/JavaHome.java b/buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java similarity index 100% rename from buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/JavaHome.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java From 0df2ec876d356b315bda1ebeb890a033b75cc698 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Tue, 23 Jun 2020 12:19:03 +0200 Subject: [PATCH 2/2] remove license change in loggedexec task --- .../org/elasticsearch/gradle/LoggedExec.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java b/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java index 86f2aba21b9ce..ad98a7f8fa4be 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java @@ -1,22 +1,3 @@ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - package org.elasticsearch.gradle; import org.gradle.api.Action;