Skip to content

Commit 94420c9

Browse files
burhan94burhan94
authored
Merge branch 'master' into dependabot/maven/com.google.guava-guava-33.4.8-jre
2 parents 6254897 + e78f071 commit 94420c9

File tree

170 files changed

+11549
-1858
lines changed

Some content is hidden

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

170 files changed

+11549
-1858
lines changed

‎.github/workflows/code-guru-security.yml‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
security-events: write
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
- name: Initialize CodeQL
3434
uses: github/codeql-action/init@v3
3535
# Specify custom java build since the autobuild doesn't take advantage of multiple cores.

‎.github/workflows/cut_release.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ jobs:
1010
steps:
1111
- name: Setup dependencies
1212
run: |
13+
sudo apt update --fix-missing
1314
sudo apt-get install -y libxml2-utils python3
1415
pip3 install lxml beautifulsoup4
1516
1617
- name: Set up JDK 11
17-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1819
with:
1920
distribution: 'corretto'
2021
java-version: '11'
2122

2223
- name: Checkout repository
23-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2425
with:
2526
fetch-depth: 0
2627

‎.github/workflows/javadoc_sync.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: aws-athena-query-federation_ubuntu-latest_16-core
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212

1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
distribution: 'corretto'
1717
java-version: '11'

‎.github/workflows/maven_push.yml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
if: needs.pre_job.outputs.should_skip != 'true'
2222
runs-on: aws-athena-query-federation_ubuntu-latest_16-core
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Set up JDK 11
26-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2727
with:
2828
distribution: 'corretto'
2929
java-version: '11'
@@ -37,13 +37,31 @@ jobs:
3737
- name: Identify any Maven Build changes
3838
run: >
3939
! (git status | grep "modified: " )
40-
- name: Upload coverage reports to Codecov
40+
41+
# -------- Codecov coverage upload --------
42+
# Fork PRs: upload WITHOUT token
43+
- name: Upload coverage reports to Codecov (fork PRs, no token)
44+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
4145
uses: codecov/codecov-action@v5
42-
env:
46+
47+
# Pushes & same-repo PRs: upload WITH token
48+
- name: Upload coverage reports to Codecov (internal only)
49+
if: ${{ github.event_name != 'pull_request' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork) }}
50+
uses: codecov/codecov-action@v5
51+
with:
4352
slug: awslabs/aws-athena-query-federation
44-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
45-
- name: Upload test results to Codecov
46-
if: ${{ !cancelled() }}
53+
token: ${{ secrets.CODECOV_TOKEN }}
54+
# -------- Codecov test results --------
55+
# Fork PRs: no token
56+
- name: Upload test results to Codecov (fork PRs, no token)
57+
if: ${{ !cancelled() && github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
58+
uses: codecov/test-results-action@v1
59+
with:
60+
slug: awslabs/aws-athena-query-federation
61+
62+
# Pushes & same-repo PRs: with token
63+
- name: Upload test results to Codecov (internal only)
64+
if: ${{ !cancelled() && (github.event_name != 'pull_request' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork)) }}
4765
uses: codecov/test-results-action@v1
4866
with:
4967
slug: awslabs/aws-athena-query-federation

‎.github/workflows/publish_to_maven_central.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- name: Checkout Codebase
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Set up Maven Central Repository
18-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1919
with:
2020
java-version: '11'
2121
distribution: 'adopt'
@@ -26,7 +26,7 @@ jobs:
2626
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2727

2828
- name: Publish to Apache Maven Central
29-
run: mvn clean deploy --batch-mode -Dmaven.compiler.release=11 -am -P release -pl ".,athena-federation-sdk,athena-dynamodb,athena-cloudwatch,athena-cloudwatch-metrics,athena-aws-cmdb,athena-jdbc,athena-mysql"
29+
run: mvn clean deploy --batch-mode -Dmaven.compiler.release=11 -am -P release -pl ".,athena-federation-sdk,athena-dynamodb,athena-cloudwatch,athena-cloudwatch-metrics,athena-aws-cmdb,athena-jdbc,athena-mysql,athena-oracle,athena-redshift,athena-postgresql"
3030
env:
3131
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
3232
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

‎.github/workflows/run_release_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ jobs:
1818
sudo apt update && sudo apt install -y tar gzip unzip wget less groff vim git python3 python3-pip unixodbc-dev curl jq;
1919
pip3 install boto3;
2020
- name: install node and npm
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v5
2222
with:
2323
node-version: 18
2424
- name: Set up JDK 11
25-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
2626
with:
2727
distribution: 'corretto'
2828
java-version: '11'
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0
3333
- name: Build jars
3434
run: mvn clean package -T 1C -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN --no-transfer-progress
3535
- name: Setup Repo Root Directory
3636
run: echo "REPOSITORY_ROOT=$GITHUB_WORKSPACE" >> $GITHUB_ENV
3737
- name: Setup AWS Cred
38-
uses: aws-actions/configure-aws-credentials@v4
38+
uses: aws-actions/configure-aws-credentials@v5
3939
with:
4040
aws-region: us-east-1
4141
role-duration-seconds: 18000

‎athena-clickhouse/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>com.clickhouse</groupId>
2424
<artifactId>clickhouse-jdbc</artifactId>
25-
<version>0.9.0</version>
25+
<version>0.9.2</version>
2626
<classifier>all</classifier>
2727
</dependency>
2828
<dependency>

‎athena-cloudera-hive/META-INF/maven/org.apache.zookeeper/zookeeper-jute/pom.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
artifactId=zookeeper-jute
2+
groupId=org.apache.zookeeper
3+
version=3.9.4

‎athena-cloudera-hive/META-INF/maven/org.apache.zookeeper/zookeeper/pom.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
artifactId=zookeeper
2+
groupId=org.apache.zookeeper
3+
version=3.9.4

0 commit comments

Comments
 (0)