Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating setup-java, byte buddy, jacoco and mockito dependencies #1368

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −18
Open

Updating setup-java, byte buddy, jacoco and mockito dependencies #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
distribution: temurin # Temurin is a distribution of adoptium
java-version: 21
- uses: actions/checkout@v4
- uses: aws-actions/configure-aws-credentials@v4.0.1
- uses: aws-actions/configure-aws-credentials@v4.0.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest just use v4 instead of specific version unless you have specific requirements here.

Thanks!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We keep getting depandabot PRs for this, do you know why we are getting this and other repos aren't? #1182

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you use v4 it will automatically link to the latest v4.x.x.

with:
role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
aws-region: us-east-1
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/test_build_multi_platform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,22 @@ jobs:
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
options: --user root
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

env:
JENKINS_URL: build.ci.opensearch.org

steps:
- name: Run start commands
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

- name: Checkout AD
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Assemble / build / mavenlocal / integTest
run: |
Expand All @@ -106,7 +108,7 @@ jobs:

steps:
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand All @@ -122,7 +124,7 @@ jobs:
./gradlew build -x spotlessJava
# coverage.gradle is only applied in single local node test
- name: Upload Coverage Report
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/test_bwc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,20 @@ jobs:
# this image tag is subject to change as more dependencies and updates will arrive over time
image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }}
# need to switch to root so that github actions can install runner binary on container without permission issues.
options: --user root
options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }}

steps:
- name: Run start commands
run: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-command }}
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}

# anomaly-detection
- name: Checkout AD
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Assemble anomaly-detection
run: |
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,20 @@ dependencies {


implementation "org.jacoco:org.jacoco.agent:0.8.12"
implementation ("org.jacoco:org.jacoco.ant:0.8.11") {
implementation ("org.jacoco:org.jacoco.ant:0.8.12") {
exclude group: 'org.ow2.asm', module: 'asm-commons'
exclude group: 'org.ow2.asm', module: 'asm'
exclude group: 'org.ow2.asm', module: 'asm-tree'
}

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

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

plugins.withId('jacoco') {
jacoco.toolVersion = '0.8.11'
jacoco.toolVersion = '0.8.12'
}
}

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

force "org.mockito:mockito-core:5.14.1"
force "org.mockito:mockito-core:5.14.2"
force "org.objenesis:objenesis:3.3"
force "net.bytebuddy:byte-buddy:1.14.9"
force "net.bytebuddy:byte-buddy-agent:1.14.9"
force "net.bytebuddy:byte-buddy:1.15.10"
force "net.bytebuddy:byte-buddy-agent:1.15.10"
force "com.google.code.gson:gson:2.8.9"
force "junit:junit:4.13.2"

Expand Down
Loading