Skip to content

Commit

Permalink
Update Gradle to 8.12
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Jan 3, 2025
1 parent 542b551 commit 2b75405
Show file tree
Hide file tree
Showing 75 changed files with 184 additions and 180 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ subprojects {
name = 'Snapshots'
url = 'https://aws.oss.sonatype.org/content/repositories/snapshots'
credentials {
username "$System.env.SONATYPE_USERNAME"
password "$System.env.SONATYPE_PASSWORD"
username = "$System.env.SONATYPE_USERNAME"
password = "$System.env.SONATYPE_PASSWORD"
}
}
}
Expand Down Expand Up @@ -420,7 +420,7 @@ allprojects {
gradle.projectsEvaluated {
allprojects {
project.tasks.withType(JavaForkOptions) {
maxHeapSize project.property('options.forkOptions.memoryMaximumSize')
maxHeapSize = project.property('options.forkOptions.memoryMaximumSize')
}

if (project.path == ':test:framework') {
Expand Down Expand Up @@ -736,7 +736,7 @@ tasks.named(JavaBasePlugin.CHECK_TASK_NAME) {
}

tasks.register('checkCompatibility', CheckCompatibilityTask) {
description('Checks the compatibility with child components')
description = 'Checks the compatibility with child components'
}

allprojects { project ->
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ dependencies {
api "org.apache.commons:commons-compress:${props.getProperty('commonscompress')}"
api 'org.apache.ant:ant:1.10.14'
api 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0'
api 'com.netflix.nebula:nebula-publishing-plugin:21.0.0'
api 'com.netflix.nebula:nebula-publishing-plugin:21.1.0'
api 'com.netflix.nebula:gradle-info-plugin:12.1.6'
api 'org.apache.rat:apache-rat:0.15'
api "commons-io:commons-io:${props.getProperty('commonsio')}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ class PluginBuildPlugin implements Plugin<Project> {
archiveBaseName = archiveBaseName.get() + "-client"
}
// always configure publishing for client jars
project.publishing.publications.nebula(MavenPublication).artifactId(extension.name + "-client")
project.publishing.publications.nebula(MavenPublication).artifactId = extension.name + "-client"
final BasePluginExtension base = project.getExtensions().findByType(BasePluginExtension.class)
project.tasks.withType(GenerateMavenPom.class).configureEach { GenerateMavenPom generatePOMTask ->
generatePOMTask.destination = "${project.buildDir}/distributions/${base.archivesName}-client-${project.versions.opensearch}.pom"
}
} else {
if (project.plugins.hasPlugin(MavenPublishPlugin)) {
project.publishing.publications.nebula(MavenPublication).artifactId(extension.name)
project.publishing.publications.nebula(MavenPublication).artifactId = extension.name
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ public Destination getDestination() {
public String getMessage() {
return message;
}

public long getLogTime() {
return System.currentTimeMillis();
}
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions client/client-benchmark-noop-api-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ group = 'org.opensearch.plugin'
apply plugin: 'opensearch.opensearchplugin'

opensearchplugin {
name 'client-benchmark-noop-api'
description 'Stubbed out OpenSearch actions that can be used for client-side benchmarking'
classname 'org.opensearch.plugin.noop.NoopPlugin'
name = 'client-benchmark-noop-api'
description = 'Stubbed out OpenSearch actions that can be used for client-side benchmarking'
classname = 'org.opensearch.plugin.noop.NoopPlugin'
}

// Not published so no need to assemble
Expand Down
4 changes: 2 additions & 2 deletions distribution/docker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ subprojects { Project subProject ->
}

artifacts.add('default', file(tarFile)) {
type 'tar'
name artifactName
type = 'tar'
name = artifactName
builtBy exportTaskName
}

Expand Down
16 changes: 8 additions & 8 deletions distribution/packages/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -320,13 +320,13 @@ apply plugin: 'com.netflix.nebula.ospackage-base'

// this is package indepdendent configuration
ospackage {
maintainer 'OpenSearch Team <[email protected]>'
summary 'Distributed RESTful search engine built for the cloud'
packageDescription '''
maintainer ='OpenSearch Team <[email protected]>'
summary = 'Distributed RESTful search engine built for the cloud'
packageDescription = '''
Reference documentation can be found at
https://github.com/opensearch-project/OpenSearch
'''.stripIndent().trim()
url 'https://github.com/opensearch-project/OpenSearch'
url = 'https://github.com/opensearch-project/OpenSearch'

// signing setup
if (project.hasProperty('signing.password') && BuildParams.isSnapshotBuild() == false) {
Expand All @@ -340,10 +340,10 @@ ospackage {
// version found on oldest supported distro, centos-6
requires('coreutils', '8.4', GREATER | EQUAL)

fileMode 0644
dirMode 0755
user 'root'
permissionGroup 'root'
fileMode = 0644
dirMode = 0755
user = 'root'
permissionGroup = 'root'

into '/usr/share/opensearch'
}
Expand Down
4 changes: 2 additions & 2 deletions doc-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ plugins {
}

base {
group 'org.opensearch'
version '1.0.0-SNAPSHOT'
group = 'org.opensearch'
version = '1.0.0-SNAPSHOT'
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions doc-tools/missing-doclet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ plugins {
id 'java-library'
}

group 'org.opensearch'
version '1.0.0-SNAPSHOT'
group = 'org.opensearch'
version = '1.0.0-SNAPSHOT'

tasks.withType(JavaCompile) {
options.compilerArgs += ["--release", targetCompatibility.toString()]
Expand Down
2 changes: 1 addition & 1 deletion gradle/ide.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import org.jetbrains.gradle.ext.JUnit
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
url = "https://plugins.gradle.org/m2/"
}
}
dependencies {
Expand Down
4 changes: 2 additions & 2 deletions gradle/missing-javadoc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ allprojects {


tasks.register('missingJavadoc', MissingJavadocTask) {
description "This task validates and generates Javadoc API documentation for the main source code."
group "documentation"
description = "This task validates and generates Javadoc API documentation for the main source code."
group = "documentation"

taskResources = resources
dependsOn sourceSets.main.compileClasspath
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
distributionSha256Sum=7ebdac923867a3cec0098302416d1e3c6c0c729fc4e2e05c10637a8af33a76c5
2 changes: 1 addition & 1 deletion libs/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if (BuildParams.runtimeJavaVersion >= JavaVersion.VERSION_20) {
}

tasks.register('roundableSimdTest', Test) {
group 'verification'
group = 'verification'
include '**/RoundableTests.class'
systemProperty 'opensearch.experimental.feature.simd.rounding.enabled', 'forced'
}
Expand Down
4 changes: 2 additions & 2 deletions modules/aggs-matrix-stats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
apply plugin: 'opensearch.yaml-rest-test'

opensearchplugin {
description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.'
classname 'org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin'
description = 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.'
classname = 'org.opensearch.search.aggregations.matrix.MatrixAggregationModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/analysis-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Adds "built in" analyzers to OpenSearch.'
classname 'org.opensearch.analysis.common.CommonAnalysisModulePlugin'
description = 'Adds "built in" analyzers to OpenSearch.'
classname = 'org.opensearch.analysis.common.CommonAnalysisModulePlugin'
extendedPlugins = ['lang-painless']
}

Expand Down
2 changes: 1 addition & 1 deletion modules/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ configure(subprojects.findAll { it.parent.path == project.path }) {

opensearchplugin {
// for local OpenSearch plugins, the name of the plugin is the same as the directory
name project.name
name = project.name
}

if (project.file('src/main/packaging').exists()) {
Expand Down
4 changes: 2 additions & 2 deletions modules/cache-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Module for caches which are optional and do not require additional security permission'
classname 'org.opensearch.cache.common.tier.TieredSpilloverCachePlugin'
description = 'Module for caches which are optional and do not require additional security permission'
classname = 'org.opensearch.cache.common.tier.TieredSpilloverCachePlugin'
}

test {
Expand Down
4 changes: 2 additions & 2 deletions modules/geo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Plugin for geospatial features in OpenSearch. Registering the geo_shape and aggregations on GeoShape and GeoPoint'
classname 'org.opensearch.geo.GeoModulePlugin'
description = 'Plugin for geospatial features in OpenSearch. Registering the geo_shape and aggregations on GeoShape and GeoPoint'
classname = 'org.opensearch.geo.GeoModulePlugin'
}

restResources {
Expand Down
4 changes: 2 additions & 2 deletions modules/ingest-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Module for ingest processors that do not require additional security permissions or have large dependencies and resources'
classname 'org.opensearch.ingest.common.IngestCommonModulePlugin'
description = 'Module for ingest processors that do not require additional security permissions or have large dependencies and resources'
classname = 'org.opensearch.ingest.common.IngestCommonModulePlugin'
extendedPlugins = ['lang-painless']
}

Expand Down
4 changes: 2 additions & 2 deletions modules/ingest-geoip/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database'
classname 'org.opensearch.ingest.geoip.IngestGeoIpModulePlugin'
description = 'Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database'
classname = 'org.opensearch.ingest.geoip.IngestGeoIpModulePlugin'
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions modules/ingest-user-agent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
apply plugin: 'opensearch.yaml-rest-test'

opensearchplugin {
description 'Ingest processor that extracts information from a user agent'
classname 'org.opensearch.ingest.useragent.IngestUserAgentModulePlugin'
description = 'Ingest processor that extracts information from a user agent'
classname = 'org.opensearch.ingest.useragent.IngestUserAgentModulePlugin'
}

restResources {
Expand Down
4 changes: 2 additions & 2 deletions modules/lang-expression/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Lucene expressions integration for OpenSearch'
classname 'org.opensearch.script.expression.ExpressionModulePlugin'
description = 'Lucene expressions integration for OpenSearch'
classname = 'org.opensearch.script.expression.ExpressionModulePlugin'
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions modules/lang-mustache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ apply plugin: 'opensearch.java-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Mustache scripting integration for OpenSearch'
classname 'org.opensearch.script.mustache.MustacheModulePlugin'
description = 'Mustache scripting integration for OpenSearch'
classname = 'org.opensearch.script.mustache.MustacheModulePlugin'
hasClientJar = true // For the template apis and query
}

Expand Down
4 changes: 2 additions & 2 deletions modules/lang-painless/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'An easy, safe and fast scripting language for OpenSearch'
classname 'org.opensearch.painless.PainlessModulePlugin'
description = 'An easy, safe and fast scripting language for OpenSearch'
classname = 'org.opensearch.painless.PainlessModulePlugin'
}

ext {
Expand Down
4 changes: 2 additions & 2 deletions modules/mapper-extras/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.java-rest-test'

opensearchplugin {
description 'Adds advanced field mappers'
classname 'org.opensearch.index.mapper.MapperExtrasModulePlugin'
description = 'Adds advanced field mappers'
classname = 'org.opensearch.index.mapper.MapperExtrasModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/opensearch-dashboards/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
apply plugin: 'opensearch.java-rest-test'

opensearchplugin {
description 'Plugin exposing APIs for OpenSearch Dashboards system indices'
classname 'org.opensearch.dashboards.OpenSearchDashboardsModulePlugin'
description = 'Plugin exposing APIs for OpenSearch Dashboards system indices'
classname = 'org.opensearch.dashboards.OpenSearchDashboardsModulePlugin'
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions modules/parent-join/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'This module adds the support parent-child queries and aggregations'
classname 'org.opensearch.join.ParentJoinModulePlugin'
description = 'This module adds the support parent-child queries and aggregations'
classname = 'org.opensearch.join.ParentJoinModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/percolator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Percolator module adds capability to index queries and query these queries by specifying documents'
classname 'org.opensearch.percolator.PercolatorModulePlugin'
description = 'Percolator module adds capability to index queries and query these queries by specifying documents'
classname = 'org.opensearch.percolator.PercolatorModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/rank-eval/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'The Rank Eval module adds APIs to evaluate ranking quality.'
classname 'org.opensearch.index.rankeval.RankEvalModulePlugin'
description = 'The Rank Eval module adds APIs to evaluate ranking quality.'
classname = 'org.opensearch.index.rankeval.RankEvalModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/reindex/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ apply plugin: 'opensearch.java-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'The Reindex module adds APIs to reindex from one index to another or update documents in place.'
classname 'org.opensearch.index.reindex.ReindexModulePlugin'
description = 'The Reindex module adds APIs to reindex from one index to another or update documents in place.'
classname = 'org.opensearch.index.reindex.ReindexModulePlugin'
hasClientJar = true
}

Expand Down
4 changes: 2 additions & 2 deletions modules/repository-url/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ apply plugin: 'opensearch.internal-cluster-test'


opensearchplugin {
description 'Module for URL repository'
classname 'org.opensearch.plugin.repository.url.URLRepositoryModulePlugin'
description = 'Module for URL repository'
classname = 'org.opensearch.plugin.repository.url.URLRepositoryModulePlugin'
}

restResources {
Expand Down
4 changes: 2 additions & 2 deletions modules/search-pipeline-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ apply plugin: 'opensearch.yaml-rest-test'
apply plugin: 'opensearch.internal-cluster-test'

opensearchplugin {
description 'Module for search pipeline processors that do not require additional security permissions or have large dependencies and resources'
classname 'org.opensearch.search.pipeline.common.SearchPipelineCommonModulePlugin'
description = 'Module for search pipeline processors that do not require additional security permissions or have large dependencies and resources'
classname = 'org.opensearch.search.pipeline.common.SearchPipelineCommonModulePlugin'
extendedPlugins = ['lang-painless']
}

Expand Down
4 changes: 2 additions & 2 deletions modules/systemd/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
*/

opensearchplugin {
description 'Integrates OpenSearch with systemd'
classname 'org.opensearch.systemd.SystemdModulePlugin'
description = 'Integrates OpenSearch with systemd'
classname = 'org.opensearch.systemd.SystemdModulePlugin'
}
Loading

0 comments on commit 2b75405

Please sign in to comment.