Skip to content

Commit d526bdd

Browse files
authored
Merge branch 'main' into search_relevance_role_updates
2 parents 0cbd4c6 + cc1d27f commit d526bdd

File tree

183 files changed

+5970
-3839
lines changed

Some content is hidden

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

183 files changed

+5970
-3839
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cwperks @DarshitChanpura @derek-ho @nibix @peternied @RyanL1997 @reta @shikharj05 @willyborankin
1+
* @cwperks @DarshitChanpura @derek-ho @nibix @RyanL1997 @reta @shikharj05 @willyborankin

.github/workflows/auto-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Get tag
2222
id: tag
2323
uses: dawidd6/action-get-tag@v1
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
- name: Download release notes
2626
run: |
2727
curl -s -o release-notes.md https://raw.githubusercontent.com/opensearch-project/security/main/release-notes/opensearch-security.release-notes-${{ steps.tag.outputs.tag }}.md

.github/workflows/automatic-merges.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
automatic-merge-version-bumps:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616

1717
- id: find-triggering-pr
1818
uses: peternied/find-triggering-pr@v1

.github/workflows/changelog_verifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository == 'opensearch-project/security'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
ref: ${{ github.event.pull_request.head.sha }}

.github/workflows/ci.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java-version: 21
3131

3232
- name: Checkout security
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Generate list of tasks
3636
id: set-matrix
@@ -45,7 +45,7 @@ jobs:
4545
matrix:
4646
gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
4747
platform: [windows-latest]
48-
jdk: [21, 24]
48+
jdk: [21, 25]
4949
runs-on: ${{ matrix.platform }}
5050

5151
steps:
@@ -56,7 +56,7 @@ jobs:
5656
java-version: ${{ matrix.jdk }}
5757

5858
- name: Checkout security
59-
uses: actions/checkout@v5
59+
uses: actions/checkout@v6
6060

6161
- name: Build and Test
6262
uses: gradle/gradle-build-action@v3
@@ -80,7 +80,7 @@ jobs:
8080
matrix:
8181
gradle_task: ${{ fromJson(needs.generate-test-list.outputs.separateTestsNames) }}
8282
platform: [ubuntu-latest]
83-
jdk: [21, 24]
83+
jdk: [21, 25]
8484
runs-on: ubuntu-latest
8585
container:
8686
# using the same image which is used by opensearch-build to build the OpenSearch Distribution
@@ -99,7 +99,7 @@ jobs:
9999
java-version: ${{ matrix.jdk }}
100100

101101
- name: Checkout security
102-
uses: actions/checkout@v5
102+
uses: actions/checkout@v6
103103

104104
- name: Build and Test
105105
uses: gradle/gradle-build-action@v3
@@ -119,7 +119,7 @@ jobs:
119119
needs: ["test-windows", "test-linux", "integration-tests-windows", "integration-tests-linux", "sample-plugin-integration-tests-linux", "sample-plugin-integration-tests-windows"]
120120
runs-on: ubuntu-latest
121121
steps:
122-
- uses: actions/checkout@v5
122+
- uses: actions/checkout@v6
123123
- uses: actions/download-artifact@v6
124124
with:
125125
path: downloaded-artifacts
@@ -144,7 +144,7 @@ jobs:
144144
strategy:
145145
fail-fast: false
146146
matrix:
147-
jdk: [21, 24]
147+
jdk: [21, 25]
148148
platform: [windows-latest]
149149
runs-on: ${{ matrix.platform }}
150150

@@ -156,7 +156,7 @@ jobs:
156156
java-version: ${{ matrix.jdk }}
157157

158158
- name: Checkout security
159-
uses: actions/checkout@v5
159+
uses: actions/checkout@v6
160160

161161
- name: Run Integration Tests
162162
uses: gradle/gradle-build-action@v3
@@ -178,7 +178,7 @@ jobs:
178178
strategy:
179179
fail-fast: false
180180
matrix:
181-
jdk: [21, 24]
181+
jdk: [21, 25]
182182
platform: [ubuntu-latest]
183183
runs-on: ubuntu-latest
184184
container:
@@ -199,7 +199,7 @@ jobs:
199199
java-version: ${{ matrix.jdk }}
200200

201201
- name: Checkout security
202-
uses: actions/checkout@v5
202+
uses: actions/checkout@v6
203203

204204
- name: Build and Test
205205
uses: gradle/gradle-build-action@v3
@@ -221,7 +221,7 @@ jobs:
221221
strategy:
222222
fail-fast: false
223223
matrix:
224-
jdk: [21,24]
224+
jdk: [21, 25]
225225
platform: [ubuntu-latest]
226226
runs-on: ${{ matrix.platform }}
227227
container:
@@ -242,7 +242,7 @@ jobs:
242242
java-version: ${{ matrix.jdk }}
243243

244244
- name: Checkout security
245-
uses: actions/checkout@v5
245+
uses: actions/checkout@v6
246246

247247
- name: Run SampleResourcePlugin Integration Tests
248248
uses: gradle/gradle-build-action@v3
@@ -262,7 +262,7 @@ jobs:
262262
strategy:
263263
fail-fast: false
264264
matrix:
265-
jdk: [21, 24]
265+
jdk: [21, 25]
266266
platform: [windows-latest]
267267
runs-on: ${{ matrix.platform }}
268268

@@ -274,7 +274,7 @@ jobs:
274274
java-version: ${{ matrix.jdk }}
275275

276276
- name: Checkout security
277-
uses: actions/checkout@v5
277+
uses: actions/checkout@v6
278278

279279
- name: Run SampleResourcePlugin Integration Tests
280280
uses: gradle/gradle-build-action@v3
@@ -295,7 +295,7 @@ jobs:
295295
strategy:
296296
fail-fast: false
297297
matrix:
298-
jdk: [21, 24]
298+
jdk: [21, 25]
299299
platform: [ubuntu-latest]
300300
runs-on: ${{ matrix.platform }}
301301

@@ -307,7 +307,7 @@ jobs:
307307
java-version: ${{ matrix.jdk }}
308308

309309
- name: Checkout security
310-
uses: actions/checkout@v5
310+
uses: actions/checkout@v6
311311

312312
- name: Run Resource Tests
313313
uses: gradle/gradle-build-action@v3
@@ -325,7 +325,7 @@ jobs:
325325
java-version: 21
326326

327327
- name: Checkout Security Repo
328-
uses: actions/checkout@v5
328+
uses: actions/checkout@v6
329329

330330
- name: Build BWC tests
331331
uses: gradle/gradle-build-action@v3
@@ -338,7 +338,7 @@ jobs:
338338
strategy:
339339
fail-fast: false
340340
matrix:
341-
jdk: [11, 17]
341+
jdk: [21]
342342
platform: [ubuntu-latest, windows-latest]
343343
runs-on: ${{ matrix.platform }}
344344

@@ -349,7 +349,7 @@ jobs:
349349
java-version: ${{ matrix.jdk }}
350350

351351
- name: Checkout Security Repo
352-
uses: actions/checkout@v5
352+
uses: actions/checkout@v6
353353

354354
- id: build-previous
355355
uses: ./.github/actions/run-bwc-suite
@@ -363,7 +363,7 @@ jobs:
363363
code-ql:
364364
runs-on: ubuntu-latest
365365
steps:
366-
- uses: actions/checkout@v5
366+
- uses: actions/checkout@v6
367367
- uses: actions/setup-java@v5
368368
with:
369369
distribution: temurin # Temurin is a distribution of adoptium
@@ -377,7 +377,7 @@ jobs:
377377
build-health:
378378
runs-on: ubuntu-latest
379379
steps:
380-
- uses: actions/checkout@v5
380+
- uses: actions/checkout@v6
381381
- uses: actions/setup-java@v5
382382
with:
383383
distribution: temurin # Temurin is a distribution of adoptium
@@ -395,7 +395,7 @@ jobs:
395395
runs-on: ubuntu-latest
396396
steps:
397397
- name: Setup Environment
398-
uses: actions/checkout@v5
398+
uses: actions/checkout@v6
399399

400400
- name: Configure Java
401401
uses: actions/setup-java@v5

.github/workflows/code-hygiene.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Check if all files end in newline
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212

1313
- name: Linelint
1414
uses: fernandrone/[email protected]
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
name: Spotless scan
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121

2222
- uses: actions/setup-java@v5
2323
with:
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434
name: Checkstyle scan
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737

3838
- uses: actions/setup-java@v5
3939
with:
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
name: Spotbugs scan
5151
steps:
52-
- uses: actions/checkout@v5
52+
- uses: actions/checkout@v6
5353

5454
- uses: actions/setup-java@v5
5555
with:
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666
name: Check permissions orders
6767
steps:
68-
- uses: actions/checkout@v5
68+
- uses: actions/checkout@v6
6969
- run: npm install yaml
7070

7171
- name: Check permissions order

.github/workflows/dependabot_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
installation_id: 22958780
1919

2020
- name: Check out code
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
token: ${{ steps.github_app_token.outputs.token }}
2424
ref: ${{ github.head_ref }}

.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
jdk: [21, 24]
14+
jdk: [21, 25]
1515
test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
1616

1717
steps:
@@ -20,7 +20,7 @@ jobs:
2020
distribution: temurin # Temurin is a distribution of adoptium
2121
java-version: ${{ matrix.jdk }}
2222

23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424

2525
- run: ./gradlew test
2626

.github/workflows/link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
linkchecker:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- name: lychee Link Checker
1414
id: lychee
1515
uses: lycheeverse/lychee-action@master

.github/workflows/maven-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
distribution: temurin # Temurin is a distribution of adoptium
2323
java-version: 21
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
- name: Load secret
2626
uses: 1password/load-secrets-action@v3
2727
with:

0 commit comments

Comments
 (0)