Skip to content

Commit e84d9e0

Browse files
Bump main to 3.0.0 (#585)
* Bump main to 3.0.0 Signed-off-by: bowenlan-amzn <[email protected]> * Upgrade gradle Signed-off-by: bowenlan-amzn <[email protected]> * Refactor Signed-off-by: bowenlan-amzn <[email protected]> * Refactor for 3.0 Signed-off-by: bowenlan-amzn <[email protected]> * Directly consume plugin zip Signed-off-by: bowenlan-amzn <[email protected]> * Trying to fix bwc tests Signed-off-by: bowenlan-amzn <[email protected]> * Comment out rolling upgrade test Signed-off-by: bowenlan-amzn <[email protected]> --------- Signed-off-by: bowenlan-amzn <[email protected]>
1 parent 536eb70 commit e84d9e0

Some content is hidden

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

45 files changed

+320
-263
lines changed

.github/workflows/bwc-test-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ jobs:
1414
steps:
1515
# This step uses the setup-java Github action: https://github.com/actions/setup-java
1616
- name: Set Up JDK
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v2
1818
with:
19+
distribution: temurin # Temurin is a distribution of adoptium
1920
java-version: 17
2021
# index-management
2122
- name: Checkout Branch

.github/workflows/docker-security-test-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Set Up JDK
16-
uses: actions/setup-java@v1
16+
uses: actions/setup-java@v2
1717
with:
18+
distribution: temurin # Temurin is a distribution of adoptium
1819
java-version: 17
1920
- name: Checkout Branch
2021
uses: actions/checkout@v2

.github/workflows/multi-node-test-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
steps:
1616
# This step uses the setup-java Github action: https://github.com/actions/setup-java
1717
- name: Set Up JDK
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v2
1919
with:
20+
distribution: temurin # Temurin is a distribution of adoptium
2021
java-version: 17
2122
# index-management
2223
- name: Checkout Branch

.github/workflows/release-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ jobs:
2020
uses: actions/checkout@v2
2121
# This step uses the setup-java Github action: https://github.com/actions/setup-java
2222
- name: Set Up JDK ${{ matrix.java }}
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@v2
2424
with:
25+
distribution: temurin # Temurin is a distribution of adoptium
2526
java-version: ${{ matrix.java }}
2627

2728
# Building zip, deb and rpm files

.github/workflows/security-test-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
steps:
1616
# This step uses the setup-java Github action: https://github.com/actions/setup-java
1717
- name: Set Up JDK
18-
uses: actions/setup-java@v1
18+
uses: actions/setup-java@v2
1919
with:
20+
distribution: temurin # Temurin is a distribution of adoptium
2021
java-version: 17
2122
# index-management
2223
- name: Checkout Branch

.github/workflows/test-and-build-workflow.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ jobs:
3030
steps:
3131
# This step uses the setup-java Github action: https://github.com/actions/setup-java
3232
- name: Set Up JDK ${{ matrix.java }}
33-
uses: actions/setup-java@v1
33+
uses: actions/setup-java@v2
3434
with:
35+
distribution: temurin # Temurin is a distribution of adoptium
3536
java-version: ${{ matrix.java }}
3637
# build index management
3738
- name: Checkout Branch

build.gradle

Lines changed: 73 additions & 117 deletions
Large diffs are not rendered by default.

gradle/wrapper/gradle-wrapper.jar

935 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ set -- \
205205
org.gradle.wrapper.GradleWrapperMain \
206206
"$@"
207207

208+
# Stop when "xargs" is not available.
209+
if ! command -v xargs >/dev/null 2>&1
210+
then
211+
die "xargs is not available"
212+
fi
213+
208214
# Use "xargs" to parse quoted args.
209215
#
210216
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

0 commit comments

Comments
 (0)