Skip to content

Commit 8bea041

Browse files
amitgalitzamitgalitz
authored
updating several dependencies (#1368) (#1373)
Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
1 parent 71dfe4f commit 8bea041

7 files changed

+33
-43
lines changed

‎.github/workflows/benchmark.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches:
88
- "*"
99

10-
env:
11-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
12-
1310
jobs:
1411
Get-CI-Image-Tag:
1512
uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
@@ -34,17 +31,19 @@ jobs:
3431
# this image tag is subject to change as more dependencies and updates will arrive over time
3532
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
3633
# need to switch to root so that github actions can install runner binary on container without permission issues.
37-
options: --user root
34+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3835

3936
steps:
37+
- name: Run start commands
38+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
4039
- name: Setup Java
41-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
4241
with:
4342
distribution: 'temurin'
4443
java-version: 21
4544

4645
- name: Checkout AD
47-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4847

4948
- name: Build and Run Tests
5049
run: |

‎.github/workflows/link-check-workflow.yml

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on:
55
pull_request:
66
branches: [main]
77

8-
env:
9-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
10-
118
jobs:
129
linkchecker:
1310
runs-on: ubuntu-latest

‎.github/workflows/long_running.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches:
88
- "*"
99

10-
env:
11-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
12-
1310
jobs:
1411
Get-CI-Image-Tag:
1512
uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
@@ -34,17 +31,19 @@ jobs:
3431
# this image tag is subject to change as more dependencies and updates will arrive over time
3532
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
3633
# need to switch to root so that github actions can install runner binary on container without permission issues.
37-
options: --user root
34+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3835

3936
steps:
37+
- name: Run start commands
38+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
4039
- name: Setup Java
41-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
4241
with:
4342
distribution: 'temurin'
4443
java-version: 21
4544

4645
- name: Checkout AD
47-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4847

4948
- name: Build and Run Tests
5049
run: |

‎.github/workflows/maven-publish.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
- '1.*'
99
- '2.*'
1010

11-
env:
12-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
13-
1411
jobs:
1512
build-and-publish-snapshots:
1613
strategy:
@@ -23,12 +20,12 @@ jobs:
2320
contents: write
2421

2522
steps:
26-
- uses: actions/setup-java@v3
23+
- uses: actions/setup-java@v4
2724
with:
2825
distribution: temurin # Temurin is a distribution of adoptium
2926
java-version: 17
3027
- uses: actions/checkout@v4
31-
- uses: aws-actions/configure-aws-credentials@v4.0.1
28+
- uses: aws-actions/configure-aws-credentials@v4
3229
with:
3330
role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
3431
aws-region: us-east-1

‎.github/workflows/test_build_multi_platform.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches:
88
- "*"
99

10-
env:
11-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
12-
1310
jobs:
1411
Get-CI-Image-Tag:
1512
uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
@@ -40,7 +37,7 @@ jobs:
4037
JENKINS_URL: build.ci.opensearch.org
4138
steps:
4239
- name: Setup Java ${{ matrix.java }}
43-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
4441
with:
4542
distribution: 'temurin'
4643
java-version: ${{ matrix.java }}
@@ -70,20 +67,22 @@ jobs:
7067
# this image tag is subject to change as more dependencies and updates will arrive over time
7168
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
7269
# need to switch to root so that github actions can install runner binary on container without permission issues.
73-
options: --user root
70+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
7471

7572
env:
7673
JENKINS_URL: build.ci.opensearch.org
7774

7875
steps:
76+
- name: Run start commands
77+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
7978
- name: Setup Java ${{ matrix.java }}
80-
uses: actions/setup-java@v3
79+
uses: actions/setup-java@v4
8180
with:
8281
distribution: 'temurin'
8382
java-version: ${{ matrix.java }}
8483

8584
- name: Checkout AD
86-
uses: actions/checkout@v3
85+
uses: actions/checkout@v4
8786

8887
- name: Assemble / build / mavenlocal / integTest
8988
run: |
@@ -107,7 +106,7 @@ jobs:
107106

108107
steps:
109108
- name: Setup Java ${{ matrix.java }}
110-
uses: actions/setup-java@v3
109+
uses: actions/setup-java@v4
111110
with:
112111
distribution: 'temurin'
113112
java-version: ${{ matrix.java }}

‎.github/workflows/test_bwc.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
branches:
88
- "*"
99

10-
env:
11-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
12-
1310
jobs:
1411
Get-CI-Image-Tag:
1512
uses: opensearch-project/opensearch-build/.github/workflows/get-ci-image-tag.yml@main
@@ -30,18 +27,20 @@ jobs:
3027
# this image tag is subject to change as more dependencies and updates will arrive over time
3128
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
3229
# need to switch to root so that github actions can install runner binary on container without permission issues.
33-
options: --user root
30+
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}
3431

3532
steps:
33+
- name: Run start commands
34+
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
3635
- name: Setup Java ${{ matrix.java }}
37-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3837
with:
3938
distribution: 'temurin'
4039
java-version: ${{ matrix.java }}
4140

4241
# anomaly-detection
4342
- name: Checkout AD
44-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4544

4645
- name: Assemble anomaly-detection
4746
run: |

‎build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,20 @@ dependencies {
142142

143143

144144
implementation "org.jacoco:org.jacoco.agent:0.8.12"
145-
implementation ("org.jacoco:org.jacoco.ant:0.8.11") {
145+
implementation ("org.jacoco:org.jacoco.ant:0.8.12") {
146146
exclude group: 'org.ow2.asm', module: 'asm-commons'
147147
exclude group: 'org.ow2.asm', module: 'asm'
148148
exclude group: 'org.ow2.asm', module: 'asm-tree'
149149
}
150150

151151
// used for output encoding of config descriptions
152-
implementation group: 'org.owasp.encoder' , name: 'encoder', version: '1.2.3'
152+
implementation group: 'org.owasp.encoder' , name: 'encoder', version: '1.3.1'
153153

154154
testImplementation group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.1'
155-
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.1'
155+
testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.2'
156156
testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3'
157-
testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.14.9'
158-
testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.14.9'
157+
testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: '1.15.10'
158+
testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: '1.15.10'
159159
testCompileOnly 'org.apiguardian:apiguardian-api:1.1.2'
160160
// jupiter is required to run unit tests not inherited from OpenSearchTestCase (e.g., PreviousValueImputerTests)
161161
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
@@ -186,7 +186,7 @@ allprojects {
186186
version = "${opensearch_build}"
187187

188188
plugins.withId('jacoco') {
189-
jacoco.toolVersion = '0.8.11'
189+
jacoco.toolVersion = '0.8.12'
190190
}
191191
}
192192

@@ -218,10 +218,10 @@ configurations.all {
218218
force "org.apache.httpcomponents.client5:httpclient5:${versions.httpclient5}"
219219
force "commons-codec:commons-codec:${versions.commonscodec}"
220220

221-
force "org.mockito:mockito-core:5.14.1"
221+
force "org.mockito:mockito-core:5.14.2"
222222
force "org.objenesis:objenesis:3.3"
223-
force "net.bytebuddy:byte-buddy:1.14.9"
224-
force "net.bytebuddy:byte-buddy-agent:1.14.9"
223+
force "net.bytebuddy:byte-buddy:1.15.10"
224+
force "net.bytebuddy:byte-buddy-agent:1.15.10"
225225
force "com.google.code.gson:gson:2.8.9"
226226
force "junit:junit:4.13.2"
227227

0 commit comments

Comments
 (0)