Skip to content

Commit f6ac6e1

Browse files
authored
[Build] Remove deprecated BuildParams (#116984)
1 parent bff8ce6 commit f6ac6e1

File tree

138 files changed

+522
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+522
-278
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchJavaPluginFuncTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ class ElasticsearchJavaPluginFuncTest extends AbstractGradleInternalPluginFuncTe
2020
when:
2121
buildFile.text << """
2222
import org.elasticsearch.gradle.Architecture
23-
import org.elasticsearch.gradle.internal.info.BuildParams
24-
BuildParams.init { it.setMinimumRuntimeVersion(JavaVersion.VERSION_1_10) }
25-
2623
assert tasks.named('compileJava').get().sourceCompatibility == JavaVersion.VERSION_1_10.toString()
2724
assert tasks.named('compileJava').get().targetCompatibility == JavaVersion.VERSION_1_10.toString()
2825
"""

build-tools-internal/src/main/groovy/elasticsearch.fips.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99

1010

1111
import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask
12-
import org.elasticsearch.gradle.internal.info.BuildParams
1312
import org.elasticsearch.gradle.internal.test.rest.RestTestBasePlugin
1413
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1514
import org.elasticsearch.gradle.testclusters.TestClustersAware
16-
import org.elasticsearch.gradle.testclusters.TestDistribution
1715

1816
//apply plugin: org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin
1917

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import org.elasticsearch.gradle.util.Pair
1111
import org.elasticsearch.gradle.util.GradleUtils
12-
import org.elasticsearch.gradle.internal.info.BuildParams
1312
import org.elasticsearch.gradle.internal.test.TestUtil
1413
import org.jetbrains.gradle.ext.JUnit
1514

build-tools-internal/src/main/groovy/elasticsearch.stable-api.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import org.elasticsearch.gradle.Version
33
import org.elasticsearch.gradle.VersionProperties
44
import org.elasticsearch.gradle.internal.BwcVersions
55
import org.elasticsearch.gradle.internal.JarApiComparisonTask
6-
import org.elasticsearch.gradle.internal.info.BuildParams
76

87
import static org.elasticsearch.gradle.internal.InternalDistributionBwcSetupPlugin.buildBwcTaskName
98

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java

Lines changed: 0 additions & 80 deletions
This file was deleted.

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,6 @@ public void apply(Project project) {
152152
spec.getParameters().getBuildParams().set(buildParams);
153153
});
154154

155-
BuildParams.init(params -> {
156-
params.reset();
157-
params.setIsCi(
158-
System.getenv("JENKINS_URL") != null || System.getenv("BUILDKITE_BUILD_URL") != null || System.getProperty("isCI") != null
159-
);
160-
});
161-
162155
// Enforce the minimum compiler version
163156
assertMinimumCompilerVersion(minimumCompilerVersion);
164157

distribution/packages/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.apache.tools.ant.filters.ReplaceTokens
1111
import org.elasticsearch.gradle.LoggedExec
1212
import org.elasticsearch.gradle.OS
13-
import org.elasticsearch.gradle.internal.info.BuildParams
1413
import org.redline_rpm.header.Flags
1514

1615
import java.nio.file.Files

libs/plugin-analysis-api/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.elasticsearch.gradle.internal.info.BuildParams
2-
31
/*
42
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
53
* or more contributor license agreements. Licensed under the "Elastic License

libs/simdvec/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import org.elasticsearch.gradle.internal.info.BuildParams
1110
import org.elasticsearch.gradle.internal.precommit.CheckForbiddenApisTask
1211

1312
apply plugin: 'elasticsearch.publish'

modules/aggregations/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.elasticsearch.gradle.internal.info.BuildParams
2-
31
/*
42
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
53
* or more contributor license agreements. Licensed under the "Elastic License

0 commit comments

Comments
 (0)