Skip to content

Commit a123c43

Browse files
retareta
authored
Update Gradle to 8.5 (opensearch-project#11136)
* Update Gradle to 8.5 Signed-off-by: Andriy Redko <andriy.redko@aiven.io> * Revert "remove unnecessary empty `build.gradle` files (opensearch-project#4723)" This reverts commit a6b984b. Signed-off-by: Andriy Redko <andriy.redko@aiven.io> --------- Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent 39449b2 commit a123c43

File tree

52 files changed

+464
-20
lines changed

Some content is hidden

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

52 files changed

+464
-20
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
* text eol=lf
2+
*.jar binary
23
*.bat binary
34
*.zip binary
45
*.exe binary

‎benchmarks/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ application {
4040
}
4141

4242
base {
43-
archivesBaseName = 'opensearch-benchmarks'
43+
archivesName = 'opensearch-benchmarks'
4444
}
4545

4646
test.enabled = false

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ allprojects {
375375
} else {
376376
// Link to non-shadowed dependant projects
377377
project.javadoc.dependsOn "${upstreamProject.path}:javadoc"
378-
String externalLinkName = upstreamProject.base.archivesBaseName
378+
String externalLinkName = upstreamProject.base.archivesName
379379
String artifactPath = dep.group.replaceAll('\\.', '/') + '/' + externalLinkName.replaceAll('\\.', '/') + '/' + dep.version
380380
String projectRelativePath = project.relativePath(upstreamProject.buildDir)
381381
project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${projectRelativePath}/docs/javadoc/"

‎buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class PluginBuildPlugin implements Plugin<Project> {
8989
String name = extension1.name
9090

9191
BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
92-
base.archivesBaseName = name
92+
base.archivesName = name
9393
project.description = extension1.description
9494

9595
if (extension1.name == null) {
@@ -155,15 +155,15 @@ class PluginBuildPlugin implements Plugin<Project> {
155155
// Only configure publishing if applied externally
156156
if (extension.hasClientJar) {
157157
project.pluginManager.apply('com.netflix.nebula.maven-base-publish')
158-
// Only change Jar tasks, we don't want a -client zip so we can't change archivesBaseName
158+
// Only change Jar tasks, we don't want a -client zip so we can't change archivesName
159159
project.tasks.withType(Jar) {
160160
archiveBaseName = archiveBaseName.get() + "-client"
161161
}
162162
// always configure publishing for client jars
163163
project.publishing.publications.nebula(MavenPublication).artifactId(extension.name + "-client")
164164
final BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
165165
project.tasks.withType(GenerateMavenPom.class).configureEach { GenerateMavenPom generatePOMTask ->
166-
generatePOMTask.destination = "${project.buildDir}/distributions/${base.archivesBaseName}-client-${project.versions.opensearch}.pom"
166+
generatePOMTask.destination = "${project.buildDir}/distributions/${base.archivesName}-client-${project.versions.opensearch}.pom"
167167
}
168168
} else {
169169
if (project.plugins.hasPlugin(MavenPublishPlugin)) {

‎buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void apply(Project project) {
7777
}
7878

7979
private static String getArchivesBaseName(Project project) {
80-
return project.getExtensions().getByType(BasePluginExtension.class).getArchivesBaseName();
80+
return project.getExtensions().getByType(BasePluginExtension.class).getArchivesName().get();
8181
}
8282

8383
/**Configuration generation of maven poms. */

‎client/benchmark/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apply plugin: 'application'
3333

3434
base {
3535
group = 'org.opensearch.client'
36-
archivesBaseName = 'client-benchmarks'
36+
archivesName = 'client-benchmarks'
3737
}
3838

3939
// Not published so no need to assemble

‎client/rest-high-level/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ apply plugin: 'opensearch.rest-resources'
3939

4040
base {
4141
group = 'org.opensearch.client'
42-
archivesBaseName = 'opensearch-rest-high-level-client'
42+
archivesName = 'opensearch-rest-high-level-client'
4343
}
4444

4545
restResources {

‎client/rest/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ java {
4040

4141
base {
4242
group = 'org.opensearch.client'
43-
archivesBaseName = 'opensearch-rest-client'
43+
archivesName = 'opensearch-rest-client'
4444
}
4545

4646
dependencies {

‎client/sniffer/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ java {
3737

3838
base {
3939
group = 'org.opensearch.client'
40-
archivesBaseName = 'opensearch-rest-client-sniffer'
40+
archivesName = 'opensearch-rest-client-sniffer'
4141
}
4242

4343
dependencies {

‎distribution/archives/darwin-arm64-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/darwin-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/freebsd-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/integ-test-zip/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ apply plugin: 'com.netflix.nebula.maven-publish'
3838

3939
base {
4040
group = "org.opensearch.distribution.integ-test-zip"
41-
archivesBaseName = "opensearch"
41+
archivesName = "opensearch"
4242
}
4343

4444
integTest {

‎distribution/archives/jre-linux-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/linux-arm64-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/linux-ppc64le-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/linux-s390x-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/linux-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-darwin-arm64-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-darwin-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-freebsd-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-linux-arm64-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-linux-ppc64le-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-linux-tar/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/no-jdk-windows-zip/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/archives/windows-zip/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/docker/docker-arm64-build-context/build.gradle

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
// This file is intentionally blank. All configuration of the
13+
// distribution is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/docker/docker-arm64-export/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111

1212
// This file is intentionally blank. All configuration of the
1313
// export is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/docker/docker-export/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111

1212
// This file is intentionally blank. All configuration of the
1313
// export is done in the parent project.
14+
15+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

‎distribution/docker/docker-ppc64le-export/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010

1111
// This file is intentionally blank. All configuration of the
1212
// export is done in the parent project.
13+
14+
// See please https://docs.gradle.org/8.5/userguide/upgrading_version_8.html#deprecated_missing_project_directory

0 commit comments

Comments
 (0)