Skip to content

Commit

Permalink
#235 Fix vulnerability CVE-2023-42503 (#236)
Browse files Browse the repository at this point in the history
Co-authored-by: Christoph Kuhnke <[email protected]>
  • Loading branch information
kaklakariada and ckunki authored Sep 25, 2023
1 parent 164007f commit 68ef165
Show file tree
Hide file tree
Showing 16 changed files with 207 additions and 153 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ pk_generated_parent.pom linguist-genera
.github/workflows/release_droid_print_quick_checksum.yml linguist-generated=true
.github/workflows/release_droid_release_on_maven_central.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.core.prefs linguist-generated=true
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.

30 changes: 18 additions & 12 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,29 @@ jobs:
matrix:
# ATTENTION: When changing the versions in the matrix, make sure one of them is listed as default version below
# Only for the default version you will get a Sonar analysis!
docker_db_version: ["7.1.21", "8.18.1"]
docker_db_version: ["7.1.23", "8.22.0"]
env:
DEFAULT_DB_VERSION: "7.1.21"
DEFAULT_DB_VERSION: "7.1.23"
runs-on: ubuntu-latest
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.docker_db_version }}
cancel-in-progress: true
steps:
- name: Free Disk Space
run: |
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/share/dotnet
- name: Checkout the repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up JDK 11
- name: Set up JDK 11 & 17
uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: 11
java-version: |
17
11
cache: "maven"
- name: Cache SonarCloud packages
uses: actions/cache@v3
Expand All @@ -49,13 +55,13 @@ jobs:
echo "Support information archives are written to $SUPPORT_DIR"
echo
mkdir -p "$SUPPORT_DIR"
mvn --batch-mode clean verify \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DtrimStackTrace=false \
-Dcom.exasol.dockerdb.image=${{ matrix.docker_db_version }} \
-Dcom.exasol.containers.support_information_target_dir="$SUPPORT_DIR" \
-Dcom.exasol.containers.monitored_exit=EXIT_ANY \
-Pslow
JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DtrimStackTrace=false \
-Dcom.exasol.dockerdb.image=${{ matrix.docker_db_version }} \
-Dcom.exasol.containers.support_information_target_dir="$SUPPORT_DIR" \
-Dcom.exasol.containers.monitored_exit=EXIT_ANY \
-Pslow
env:
SUPPORT_DIR: ${{ github.workspace }}/target/support
- name: Publish support package for ${{ matrix.docker_db_version }}
Expand All @@ -72,7 +78,7 @@ jobs:
- name: Sonar analysis
if: ${{ env.SONAR_TOKEN != null && env.DEFAULT_DB_VERSION == matrix.docker_db_version }}
run: |
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-DtrimStackTrace=false \
-Dsonar.organization=exasol \
Expand Down
10 changes: 7 additions & 3 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.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
/.classpath
/.project
/.settings/org.eclipse.jdt.apt.core.prefs
/.settings/org.sonarlint.eclipse.core.prefs
/.settings/org.eclipse.m2e.core.prefs
/.settings/org.eclipse.core.resources.prefs

# Intellij
.idea
Expand All @@ -10,7 +13,6 @@

/.DS_Store
.dbeaver
.settings/org.sonarlint.eclipse.core.prefs
.DS_Store
*.swp
local
Expand Down
6 changes: 0 additions & 6 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

2 changes: 1 addition & 1 deletion .settings/org.eclipse.jdt.core.prefs

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

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

Loading

0 comments on commit 68ef165

Please sign in to comment.