Skip to content

Commit 942afee

Browse files
committed
Merge branch 'master-upstream' into runddl-manually
2 parents 8c501f8 + 6d5f740 commit 942afee

File tree

1,903 files changed

+23141
-12789
lines changed

Some content is hidden

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

1,903 files changed

+23141
-12789
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11

22
name: Build
33

4-
on: [push, pull_request]
4+
on:
5+
pull_request:
6+
push:
7+
branches: master
58

69
jobs:
710
build:
@@ -17,14 +20,14 @@ jobs:
1720
os: [ubuntu-latest]
1821

1922
steps:
20-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2124
- name: Set up Java
22-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2326
with:
2427
java-version: ${{ matrix.java_version }}
2528
distribution: 'zulu'
2629
- name: Maven cache
27-
uses: actions/cache@v3
30+
uses: actions/cache@v4
2831
env:
2932
cache-name: maven-cache
3033
with:

.github/workflows/db2luw.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'adopt'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/h2database.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'zulu'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/jdk-ea.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
java_version: [GA,EA]
19+
java_version: [GA,EA,23]
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
2525
uses: oracle-actions/setup-java@v1
2626
with:
2727
website: jdk.java.net
2828
release: ${{ matrix.java_version }}
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/mariadb.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'adopt'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/multi-db-platform.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
os: [ubuntu-latest]
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Set up Java
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
java-version: ${{ matrix.java_version }}
2525
distribution: 'adopt'
2626
- name: Maven cache
27-
uses: actions/cache@v3
27+
uses: actions/cache@v4
2828
env:
2929
cache-name: maven-cache
3030
with:

.github/workflows/multi-jdk-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
java_version: [11, 17]
19+
java_version: [11, 17, 21]
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'zulu'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:
3434
path:
3535
~/.m2
3636
key: build-${{ env.cache-name }}
37+
- name: Maven version
38+
run: mvn --version
3739
- name: Build with Maven
3840
run: mvn package
3941

.github/workflows/mysql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'adopt'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/oracle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'zulu'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

.github/workflows/postgres.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
os: [ubuntu-latest]
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
- name: Set up Java
25-
uses: actions/setup-java@v3
25+
uses: actions/setup-java@v4
2626
with:
2727
java-version: ${{ matrix.java_version }}
2828
distribution: 'adopt'
2929
- name: Maven cache
30-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: maven-cache
3333
with:

0 commit comments

Comments
 (0)