Skip to content

Commit 3a43235

Browse files
Merge pull request #97 from Aiven-Open/os-3
Bump OS to 3.x
2 parents f3dea76 + 931175f commit 3a43235

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v3
2626
- name: Set up JDK ${{ matrix.java }}
27-
uses: actions/setup-java@v3
27+
uses: actions/setup-java@v5
2828
with:
2929
java-version: ${{ matrix.java }}
3030
distribution: temurin

.github/workflows/codeql.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v2
43+
uses: actions/checkout@v5
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
47+
uses: github/codeql-action/init@v5
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,14 +67,14 @@ jobs:
6767
#- run: |
6868
# make bootstrap
6969
# make release
70-
- name: Set up JDK 11
71-
uses: actions/setup-java@v1
70+
- name: Set up JDK 21
71+
uses: actions/setup-java@v5
7272
with:
73-
java-version: 11
73+
java-version: "21"
7474

7575
- name: Build with Gradle
7676
run: ./gradlew build
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@v2
79+
uses: github/codeql-action/analyze@v5
8080

.github/workflows/make_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Setup Java SDK
16-
uses: actions/setup-java@v1.4.3
16+
uses: actions/setup-java@v5
1717
with:
18-
java-version: 11
18+
java-version: 21
1919

2020
- name: Checkout code
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v4
2222
with:
2323
ref: ${{ github.event.inputs.commit_hash }}
2424

.github/workflows/make_release_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fi
3131
3232
- name: Checkout main
33-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
3434
with:
3535
ref: main
3636
fetch-depth: 0

build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import org.opensearch.gradle.test.RestIntegTestTask
2+
23
apply plugin: 'java'
34
apply plugin: 'idea'
45
apply plugin: 'eclipse'
56
apply plugin: 'opensearch.opensearchplugin'
67
apply plugin: 'opensearch.yaml-rest-test'
78
apply plugin: 'opensearch.pluginzip'
9+
apply plugin: 'opensearch.java-agent'
10+
811
apply plugin: com.diffplug.gradle.spotless.SpotlessPlugin
912

1013
def pluginName = 'rename'
@@ -14,8 +17,10 @@ def pathToPlugin = 'path.to.plugin'
1417
def pluginClassName = 'RenamePlugin'
1518
group = "RenameGroup"
1619

17-
sourceCompatibility = JavaVersion.VERSION_21
18-
targetCompatibility = JavaVersion.VERSION_21
20+
java {
21+
sourceCompatibility = JavaVersion.VERSION_21
22+
targetCompatibility = JavaVersion.VERSION_21
23+
}
1924

2025
spotless {
2126
java {
@@ -73,7 +78,7 @@ testingConventions.enabled = true
7378

7479
buildscript {
7580
ext {
76-
opensearch_version = "3.0.0-alpha1"
81+
opensearch_version = "3.3.2"
7782
}
7883

7984
repositories {
@@ -85,7 +90,7 @@ buildscript {
8590

8691
dependencies {
8792
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
88-
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
93+
classpath "com.diffplug.spotless:spotless-plugin-gradle:8.1.0"
8994
}
9095
}
9196

@@ -107,7 +112,7 @@ test {
107112
}
108113

109114
dependencies {
110-
implementation "org.bouncycastle:bcprov-jdk18on:${versions.bouncycastle}"
115+
implementation "org.bouncycastle:bcprov-jdk18on:1.83"
111116
}
112117

113118
forbiddenPatterns {

licenses/bcprov-jdk18on-1.78.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
310e719f391bd9f4ee5103ca299c172643efb595

0 commit comments

Comments
 (0)