Skip to content

Commit 0cb6ca3

Browse files
committed
bumping gradle and nebula versions
Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
1 parent 50a2819 commit 0cb6ca3

File tree

6 files changed

+43
-39
lines changed

6 files changed

+43
-39
lines changed

.github/workflows/test_build_multi_platform.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
needs: spotless
3030
strategy:
3131
matrix:
32-
java: [21, 23]
32+
java: [21, 24]
3333
name: Build and Test Anomaly Detection Plugin on Windows
3434
runs-on: windows-latest
3535
env:
@@ -57,7 +57,7 @@ jobs:
5757
needs: [Get-CI-Image-Tag, spotless]
5858
strategy:
5959
matrix:
60-
java: [21, 23]
60+
java: [21, 24]
6161
fail-fast: false
6262
name: Build and Test Anomaly detection Plugin on Linux
6363
runs-on: ubuntu-latest
@@ -95,7 +95,7 @@ jobs:
9595
needs: spotless
9696
strategy:
9797
matrix:
98-
java: [21, 23]
98+
java: [21, 24]
9999
fail-fast: false
100100

101101
name: Build and Test Anomaly detection Plugin on MacOS

build.gradle

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ buildscript {
7373

7474
repositories {
7575
mavenLocal()
76-
maven { url "https://central.sonatype.com/repository/maven-snapshots/" }
77-
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
76+
maven { url = "https://central.sonatype.com/repository/maven-snapshots/" }
77+
maven { url = "https://aws.oss.sonatype.org/content/repositories/snapshots" }
7878
mavenCentral()
79-
maven { url "https://plugins.gradle.org/m2/" }
79+
maven { url = "https://plugins.gradle.org/m2/" }
8080
}
8181

8282
dependencies {
@@ -85,7 +85,7 @@ buildscript {
8585
}
8686

8787
plugins {
88-
id 'com.netflix.nebula.ospackage' version "11.11.1"
88+
id 'com.netflix.nebula.ospackage' version "12.1.0"
8989
id "com.diffplug.spotless" version "6.25.0"
9090
id 'java-library'
9191
id 'org.gradle.test-retry' version '1.6.0'
@@ -118,11 +118,11 @@ tasks.withType(AbstractArchiveTask).configureEach {
118118

119119
repositories {
120120
mavenLocal()
121-
maven { url "https://central.sonatype.com/repository/maven-snapshots/" }
122-
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
121+
maven { url = "https://central.sonatype.com/repository/maven-snapshots/" }
122+
maven { url = "https://aws.oss.sonatype.org/content/repositories/snapshots" }
123123
mavenCentral()
124-
maven { url "https://plugins.gradle.org/m2/" }
125-
maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" }
124+
maven { url = "https://plugins.gradle.org/m2/" }
125+
maven { url = "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" }
126126
}
127127
configurations {
128128
zipArchive
@@ -244,9 +244,9 @@ ext {
244244
}
245245

246246
opensearchplugin {
247-
name 'opensearch-anomaly-detection'
248-
description 'OpenSearch anomaly detector plugin'
249-
classname 'org.opensearch.timeseries.TimeSeriesAnalyticsPlugin'
247+
name = 'opensearch-anomaly-detection'
248+
description = 'OpenSearch anomaly detector plugin'
249+
classname = 'org.opensearch.timeseries.TimeSeriesAnalyticsPlugin'
250250
extendedPlugins = ['lang-painless', 'opensearch-job-scheduler', 'opensearch-security;optional=true']
251251
}
252252

@@ -303,8 +303,8 @@ publishing {
303303
name = "Snapshots"
304304
url = "https://central.sonatype.com/repository/maven-snapshots/"
305305
credentials {
306-
username "$System.env.SONATYPE_USERNAME"
307-
password "$System.env.SONATYPE_PASSWORD"
306+
username = "$System.env.SONATYPE_USERNAME"
307+
password = "$System.env.SONATYPE_PASSWORD"
308308
}
309309
}
310310
}
@@ -1063,21 +1063,20 @@ afterEvaluate {
10631063
into opensearchplugin.name
10641064
}
10651065

1066-
user 'root'
1067-
permissionGroup 'root'
1068-
fileMode 0644
1069-
dirMode 0755
1066+
user = 'root'
1067+
permissionGroup = 'root'
1068+
fileMode = 0644
1069+
dirMode = 0755
10701070

10711071
requires('opensearch', versions.opensearch, EQUAL)
10721072
packager = 'Amazon'
10731073
vendor = 'Amazon'
10741074
os = 'LINUX'
10751075
prefix '/usr'
1076-
1077-
license 'ASL-2.0'
1078-
maintainer 'OpenSearch <opensearch@amazon.com>'
1079-
url 'https://opensearch.org/downloads.html'
1080-
summary '''
1076+
license = 'ASL-2.0'
1077+
maintainer = 'OpenSearch <opensearch@amazon.com>'
1078+
url = 'https://opensearch.org/downloads.html'
1079+
summary = '''
10811080
Anomaly Detection plugin for OpenSearch.
10821081
Reference documentation can be found at https://opensearch.org/docs/monitoring-plugins/ad/index/.
10831082
'''.stripIndent().replace('\n', ' ').trim()

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

0 commit comments

Comments
 (0)