Skip to content

Commit 5d220d2

Browse files
authored
Bump gradle to 9.2.0 and JDK to 25 in non-publishing GHAs (opensearch-project#276)
* Updae gradle to 9.2.0 and jdk to 25 Signed-off-by: Karen X <karenxyr@gmail.com> * Remove java download for go and python GHAs Signed-off-by: Karen X <karenxyr@gmail.com> * changelog Signed-off-by: Karen X <karenxyr@gmail.com> * decouple protobuf tooling java upgrade Signed-off-by: Karen X <karenxyr@gmail.com> * move publishing back to jdk 21 Signed-off-by: Karen X <karenxyr@gmail.com> * add matrix for build-protobufs-java Signed-off-by: Karen X <karenxyr@gmail.com> --------- Signed-off-by: Karen X <karenxyr@gmail.com>
1 parent e5349ff commit 5d220d2

5 files changed

Lines changed: 11 additions & 12 deletions

File tree

.github/workflows/build-protobufs-go.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v4
14-
with:
15-
distribution: temurin # Temurin is a distribution of adoptium
16-
java-version: 21
1713
- name: build protobufs go
1814
run: bazel build //:go_protos_all

.github/workflows/build-protobufs-java.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@ on:
55

66
jobs:
77
build-protobufs-java:
8+
strategy:
9+
matrix:
10+
java:
11+
- 21
12+
- 25
813
runs-on: ubuntu-latest
914
if: github.repository == 'opensearch-project/opensearch-protobufs'
1015

1116
steps:
1217
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v4
18+
- name: Set up JDK ${{ matrix.java }}
19+
uses: actions/setup-java@v4
1420
with:
1521
distribution: temurin # Temurin is a distribution of adoptium
16-
java-version: 21
22+
java-version: ${{ matrix.java }}
1723
- name: build protobufs java
1824
run: ./tools/java/package_proto_jar.sh -c true

.github/workflows/build-protobufs-python.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v4
14-
with:
15-
distribution: temurin # Temurin is a distribution of adoptium
16-
java-version: 21
1713
- name: build protobufs python
1814
run: bazel build //:python_schemas //:python_services

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1212
### Changed
1313
- Update preprocessing for x-protobuf-excluded ([#266](https://github.com/opensearch-project/opensearch-protobufs/pull/266))
1414
- Fix aggregations protos ([#270](https://github.com/opensearch-project/opensearch-protobufs/pull/270))
15+
- Bump gradle to 9.2.0 and JDK to 25 in GHAs ([#276](https://github.com/opensearch-project/opensearch-protobufs/pull/276))
1516

1617
### Removed
1718
- Remove error responses for single doc ingestion APIS (Index, Update, Get, Delete Doc) ([#258](https://github.com/opensearch-project/opensearch-protobufs/pull/258))

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)