Skip to content

Commit 525183e

Browse files
lawofcycleslawofcycles
authored
Upgrade to OpenSearch 3.x build-tools, drop JDK 8 support, and bump Hadoop to 3.4.3 (#730)
Signed-off-by: Sotaro Hikita <bering1814@gmail.com>
1 parent 658f794 commit 525183e

74 files changed

Lines changed: 237 additions & 239 deletions

File tree

Some content is hidden

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

‎.github/workflows/build_hive.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,11 +34,21 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

4950
- name: Build with Gradle
50-
run: ./gradlew opensearch-hadoop-hive:build
51+
run: ./gradlew opensearch-hadoop-hive:build -x integrationTest
5152

5253
- name: Publish Test Results
5354
if: failure()

‎.github/workflows/build_mr.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark_30.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark_30_scala_213.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark_35.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark_35_scala_213.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ jobs:
1313
- name: Checkout Branch
1414
uses: actions/checkout@v3
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
18-
with:
19-
distribution: 'temurin'
20-
java-version: '8'
21-
cache: 'gradle'
22-
23-
- name: 'Setup: Java 8 env'
24-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2516

2617
- name: Set up JDK 11
2718
uses: actions/setup-java@v3
@@ -43,6 +34,16 @@ jobs:
4334
- name: 'Setup: Java 17 env'
4435
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4536

37+
- name: Set up JDK 21
38+
uses: actions/setup-java@v3
39+
with:
40+
distribution: 'temurin'
41+
java-version: '21'
42+
cache: 'gradle'
43+
44+
- name: 'Setup: Java 21 env'
45+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
46+
4647
- name: Setup Gradle
4748
uses: gradle/gradle-build-action@v2
4849

‎.github/workflows/build_spark_40.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ jobs:
3333
- name: 'Setup: Spark test Java env'
3434
run: echo "SPARK_TEST_JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
3535

36+
- name: Set up JDK 21
37+
uses: actions/setup-java@v3
38+
with:
39+
distribution: 'temurin'
40+
java-version: '21'
41+
cache: 'gradle'
42+
43+
- name: 'Setup: Java 21 env'
44+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
45+
3646
- name: Setup Gradle
3747
uses: gradle/gradle-build-action@v2
3848

‎.github/workflows/dependabot_pr.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ jobs:
2929
with:
3030
token: ${{ steps.github_app_token.outputs.token }}
3131

32-
- name: Set up JDK 8
33-
uses: actions/setup-java@v3
34-
with:
35-
distribution: 'temurin'
36-
java-version: '8'
37-
cache: 'gradle'
38-
39-
- name: 'Setup: Java 8 env'
40-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
4132

4233
- name: Set up JDK 11
4334
uses: actions/setup-java@v3
@@ -59,6 +50,16 @@ jobs:
5950
- name: 'Setup: Java 17 env'
6051
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
6152

53+
- name: Set up JDK 21
54+
uses: actions/setup-java@v3
55+
with:
56+
distribution: 'temurin'
57+
java-version: '21'
58+
cache: 'gradle'
59+
60+
- name: 'Setup: Java 21 env'
61+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
62+
6263
- name: Update Gradle SHAs
6364
run: |
6465
./gradlew updateSHAs

‎.github/workflows/distribution_check.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ jobs:
1010
- name: Checkout code
1111
uses: actions/checkout@v3
1212

13-
- name: Set up JDK 8
14-
uses: actions/setup-java@v3
15-
with:
16-
distribution: 'temurin'
17-
java-version: '8'
18-
cache: 'gradle'
19-
20-
- name: 'Setup: Java 8 env'
21-
run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV
2213

2314
- name: Set up JDK 11
2415
uses: actions/setup-java@v3
@@ -40,6 +31,16 @@ jobs:
4031
- name: 'Setup: Java 17 env'
4132
run: echo "JAVA17_HOME=$JAVA_HOME" >> $GITHUB_ENV
4233

34+
- name: Set up JDK 21
35+
uses: actions/setup-java@v3
36+
with:
37+
distribution: 'temurin'
38+
java-version: '21'
39+
cache: 'gradle'
40+
41+
- name: 'Setup: Java 21 env'
42+
run: echo "JAVA21_HOME=$JAVA_HOME" >> $GITHUB_ENV
43+
4344
- name: Setup Gradle
4445
uses: gradle/gradle-build-action@v2
4546

0 commit comments

Comments
 (0)