Skip to content

Commit

Permalink
#88: Fix CVE-2024-21634 in com.amazon.ion/[email protected] (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaklakariada authored Jan 19, 2024
1 parent 7aef3c5 commit 4e4b4de
Show file tree
Hide file tree
Showing 18 changed files with 249 additions and 129 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.github/workflows/broken_links_checker.yml linguist-generated=true
.github/workflows/dependencies_check.yml linguist-generated=true
.github/workflows/prepare_aws_marketplace_release.yml linguist-generated=true
.github/workflows/ci-build.yml linguist-generated=true
.github/workflows/release_droid_print_quick_checksum.yml linguist-generated=true
.github/workflows/release_droid_prepare_original_checksum.yml linguist-generated=true
.github/workflows/release_droid_upload_github_release_assets.yml linguist-generated=true
.settings/org.eclipse.jdt.core.prefs linguist-generated=true
.settings/org.eclipse.jdt.ui.prefs linguist-generated=true
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/broken_links_checker.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions .github/workflows/ci-build-java8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 8
uses: actions/setup-java@v3
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 8
distribution: "temurin"
java-version: |
8
17
cache: "maven"
- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand All @@ -28,6 +31,6 @@ jobs:
${{ runner.os }}-maven-
- name: Run maven compile with Java 8
run: |
mvn --batch-mode --update-snapshots clean compile \
mvn --batch-mode --update-snapshots -Dtoolchain.version=8 clean compile \
-DtrimStackTrace=false \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
18 changes: 12 additions & 6 deletions .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: CI Build next Java

on:
push:
branches:
Expand All @@ -14,16 +13,23 @@ jobs:
cancel-in-progress: true
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
distribution: "temurin"
java-version: 17
cache: 'maven'
cache: "maven"
- name: Run tests and build with Maven
run: |
mvn --batch-mode --update-snapshots clean javadoc:javadoc -DtrimStackTrace=false \
mvn --batch-mode --update-snapshots clean javadoc:javadoc -DtrimStackTrace=false \
-Djava.version=17 -Dtoolchain.version=17 \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
- name: Publish Test Report for Java 17
uses: scacap/action-surefire-report@v1
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
fail_if_no_tests: false
59 changes: 37 additions & 22 deletions .github/workflows/ci-build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .github/workflows/dependencies_check.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions .github/workflows/prepare_aws_marketplace_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Prepare AWS Marketplace Release
on:
push:
tags:
- '*'
- "*"
workflow_dispatch:

permissions:
Expand All @@ -15,17 +15,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the repository
uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/checkout@v4
- name: Set up JDKs
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
cache: 'maven'
distribution: "temurin"
java-version: |
11
17
cache: "maven"
- name: Install xmlstarlet
run: sudo apt install -y --no-install-recommends xmlstarlet
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.MARKETPLACE_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.MARKETPLACE_AWS_SECRET_ACCESS_KEY }}
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/release_droid_prepare_original_checksum.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .github/workflows/release_droid_print_quick_checksum.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions .github/workflows/release_droid_upload_github_release_assets.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ sources:
- jar_artifact
- integration_tests
linkReplacements:
build:
runnerOs: ubuntu-20.04
freeDiskSpace: false
exasolDbVersions:
- "7.1.25"
- "8.24.0"
excludes:
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
- "E-PK-CORE-18: Outdated content: '.settings/org.eclipse.jdt.core.prefs'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'"
Loading

0 comments on commit 4e4b4de

Please sign in to comment.