diff --git a/.github/workflows/bwc-test-workflow.yml b/.github/workflows/bwc-test-workflow.yml index 718974bc..539347ac 100644 --- a/.github/workflows/bwc-test-workflow.yml +++ b/.github/workflows/bwc-test-workflow.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - java: [ 11 ] + java: [ 21 ] # Job name name: Build and test Job-scheduler # This job runs on Linux diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0707644b..362d1d19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - java: [11, 17, 21] + java: [21] name: Build job-scheduler Plugin on Linux using Container Image runs-on: ubuntu-latest @@ -64,7 +64,7 @@ jobs: strategy: fail-fast: false matrix: - java: [11, 17, 21] + java: [21] name: Build job-scheduler Plugin on MacOS needs: Get-CI-Image-Tag @@ -104,7 +104,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 11, 17 ] + java: [ 21 ] name: Build job-scheduler Plugin on Windows needs: Get-CI-Image-Tag diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index aabc13d4..36dd689c 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -18,11 +18,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: distribution: temurin # Temurin is a distribution of adoptium - java-version: 11 + java-version: 21 - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index e52c7748..a5b7b4f7 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - java: [11] + java: [21] # Job name name: Build Job-scheduler with JDK ${{ matrix.java }} # This job runs on Linux diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md index 7d931d42..2283ff82 100644 --- a/DEVELOPER_GUIDE.md +++ b/DEVELOPER_GUIDE.md @@ -1,7 +1,7 @@ - [Developer Guide](#developer-guide) - [Forking and Cloning](#forking-and-cloning) - [Install Prerequisites](#install-prerequisites) - - [JDK 11](#jdk-11) + - [JDK 21](#jdk-21) - [Setup](#setup) - [Build](#build) - [Building from the command line](#building-from-the-command-line) @@ -19,15 +19,15 @@ Fork this repository on GitHub, and clone locally with `git clone`. ### Install Prerequisites -#### JDK 11 +#### JDK 21 -OpenSearch components build using Java 11 at a minimum. This means you must have a JDK 11 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 11 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-11`. +OpenSearch components build using Java 21 at a minimum. This means you must have a JDK 21 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 21 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-21`. ## Setup 1. Check out this package from version control. 2. Launch Intellij IDEA, choose **Import Project**, and select the `settings.gradle` file in the root of this package. -3. To build from the command line, set `JAVA_HOME` to point to a JDK >= 11 before running `./gradlew`. +3. To build from the command line, set `JAVA_HOME` to point to a JDK >= 21 before running `./gradlew`. - Unix System 1. `export JAVA_HOME=jdk-install-dir`: Replace `jdk-install-dir` with the JAVA_HOME directory of your system. 2. `export PATH=$JAVA_HOME/bin:$PATH` @@ -41,7 +41,7 @@ OpenSearch components build using Java 11 at a minimum. This means you must have The JobScheduler plugin uses the [Gradle](https://docs.gradle.org/4.10.2/userguide/userguide.html) build system. 1. Checkout this package from version control. -1. To build from command line set `JAVA_HOME` to point to a JDK >=11 +1. To build from command line set `JAVA_HOME` to point to a JDK >=21 1. Run `./gradlew build` Then you will find the built artifact located at `build/distributions` directory diff --git a/build.gradle b/build.gradle index 939f7d08..8a39a495 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { } plugins { - id 'com.netflix.nebula.ospackage' version "11.9.1" + id 'com.netflix.nebula.ospackage' version "11.10.0" id 'java-library' id "com.diffplug.spotless" version "6.25.0" } @@ -93,8 +93,8 @@ allprojects { apply from: "$rootDir/build-tools/repositories.gradle" plugins.withId('java') { - targetCompatibility = JavaVersion.VERSION_11 - sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_21 } } @@ -178,7 +178,7 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: "${versions.mockito}" javaRestTestImplementation project.sourceSets.main.runtimeClasspath //spotless - implementation('com.google.googlejavaformat:google-java-format:1.23.0') { + implementation('com.google.googlejavaformat:google-java-format:1.24.0') { exclude group: 'com.google.guava' } opensearchPlugin "org.opensearch.plugin:opensearch-security:${security_plugin_version}@zip" diff --git a/release-notes/opensearch-job-scheduler.release-notes-2.17.0.0.md b/release-notes/opensearch-job-scheduler.release-notes-2.17.0.0.md new file mode 100644 index 00000000..8f750085 --- /dev/null +++ b/release-notes/opensearch-job-scheduler.release-notes-2.17.0.0.md @@ -0,0 +1,13 @@ +## Version 2.17.0.0 + +Compatible with OpenSearch 2.17.0 + +### Maintenance +* Increment version to 2.17.0 [#660](https://github.com/opensearch-project/job-scheduler/pull/660). +* dependabot: bump org.gradle.test-retry from 1.5.9 to 1.5.10 [(#653)](https://github.com/opensearch-project/job-scheduler/pull/653) [(#654)](https://github.com/opensearch-project/job-scheduler/pull/654). +* dependabot: bump com.google.googlejavaformat:google-java-format [#663](https://github.com/opensearch-project/job-scheduler/pull/663) [#664](https://github.com/opensearch-project/job-scheduler/pull/664). +* dependabot: bump org.slf4j:slf4j-api from 2.0.13 to 2.0.16 [(#666)](https://github.com/opensearch-project/job-scheduler/pull/666) [(#667)](https://github.com/opensearch-project/job-scheduler/pull/667). +* dependabot: bump com.netflix.nebula.ospackage from 11.9.1 to 11.10.0 [(#668)](https://github.com/opensearch-project/job-scheduler/pull/668) [(#669)](https://github.com/opensearch-project/job-scheduler/pull/669). + +### Bug Fixes +* Fix system index compatibility with v1 templates [(#658)](https://github.com/opensearch-project/job-scheduler/pull/658) [(#659)](https://github.com/opensearch-project/job-scheduler/pull/659). diff --git a/sample-extension-plugin/build.gradle b/sample-extension-plugin/build.gradle index e8f655ac..154b57c8 100644 --- a/sample-extension-plugin/build.gradle +++ b/sample-extension-plugin/build.gradle @@ -205,7 +205,7 @@ testClusters.integTest { } String baseName = "jobSchedulerBwcCluster" -String bwcOpenSearchVersion = "2.17.0" +String bwcOpenSearchVersion = "2.18.0" String bwcPluginVersion = bwcOpenSearchVersion + ".0" String bwcFilePath = "src/test/resources/bwc/job-scheduler/" bwcOpenSearchVersion += "-SNAPSHOT" diff --git a/spi/build.gradle b/spi/build.gradle index bbcf1c26..12e6abf1 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -11,7 +11,7 @@ plugins { id 'jacoco' id 'maven-publish' id 'signing' - id "org.gradle.test-retry" version "1.5.10" + id "org.gradle.test-retry" version "1.6.0" } apply plugin: 'opensearch.java' diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java index c305118e..3873a4dc 100644 --- a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java +++ b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java @@ -127,7 +127,7 @@ public Collection createComponents( clusterService.addListener(this.sweeper); clusterService.addLifecycleListener(this.sweeper); - return Collections.emptyList(); + return List.of(this.lockService); } @Override