Skip to content

Commit 67c24c4

Browse files
authored
Fixed vulnerability CVE-2023-42503 (#111)
Fixed vulnerability CVE-2023-42503 Integration tests showed deviations to V7. Delimiting current PR to exclude ticket 105. This will be done in a separate attempt.
1 parent 7bc2aee commit 67c24c4

22 files changed

+106
-69
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ pk_generated_parent.pom linguist-genera
77
.github/workflows/release_droid_prepare_original_checksum.yml linguist-generated=true
88
.github/workflows/release_droid_print_quick_checksum.yml linguist-generated=true
99
.github/workflows/release_droid_release_on_maven_central.yml linguist-generated=true
10+
.settings/org.eclipse.jdt.core.prefs linguist-generated=true
11+
.settings/org.eclipse.jdt.ui.prefs linguist-generated=true

.github/workflows/broken_links_checker.yml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-build-next-java.yml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-build.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,28 @@ on:
88

99
jobs:
1010
build:
11+
runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.docker_db_version }}
14+
cancel-in-progress: true
1115
strategy:
1216
fail-fast: false
1317
matrix:
14-
docker_db_version: ["7.1.21"]
18+
docker_db_version: ["7.1.23"]
1519
env:
16-
DEFAULT_DB_VERSION: "7.1.21"
17-
runs-on: ubuntu-latest
18-
concurrency:
19-
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.docker_db_version }}
20+
DEFAULT_DB_VERSION: "7.1.23"
2021
steps:
2122
- name: Checkout the repository
22-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2324
with:
2425
fetch-depth: 0
25-
- name: Set up JDK 11
26+
- name: Set up JDK 11 & 17
2627
uses: actions/setup-java@v3
2728
with:
2829
distribution: "temurin"
29-
java-version: 11
30+
java-version: |
31+
17
32+
11
3033
cache: "maven"
3134
- name: Cache SonarCloud packages
3235
uses: actions/cache@v3
@@ -38,7 +41,7 @@ jobs:
3841
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
3942
- name: Run tests and build with Maven
4043
run: |
41-
mvn --batch-mode clean verify \
44+
JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \
4245
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
4346
-DtrimStackTrace=false \
4447
-Dcom.exasol.dockerdb.image=${{ matrix.docker_db_version }}
@@ -50,12 +53,13 @@ jobs:
5053
- name: Sonar analysis
5154
if: ${{ env.SONAR_TOKEN != null }}
5255
run: |
56+
JAVA_HOME=$JAVA_HOME_17_X64 \
5357
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
5458
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
5559
-DtrimStackTrace=false \
5660
-Dsonar.organization=exasol \
5761
-Dsonar.host.url=https://sonarcloud.io \
58-
-Dsonar.login=$SONAR_TOKEN
62+
-Dsonar.token=$SONAR_TOKEN
5963
env:
6064
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6165
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/dependencies_check.yml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release_droid_prepare_original_checksum.yml

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release_droid_print_quick_checksum.yml

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release_droid_release_on_maven_central.yml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release_droid_upload_github_release_assets.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ on:
44
workflow_dispatch:
55
inputs:
66
upload_url:
7-
description: 'Assets upload URL'
7+
description: "Assets upload URL"
88
required: true
99

1010
jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout the repository
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 11
1919
uses: actions/setup-java@v3
2020
with:
21-
distribution: 'temurin'
21+
distribution: "temurin"
2222
java-version: 11
23-
cache: 'maven'
23+
cache: "maven"
2424
- name: Build with Maven skipping tests
2525
run: mvn --batch-mode clean verify -DskipTests
2626
- name: Generate sha256sum files

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
/.project
44
/.classpath
5+
/.settings/org.eclipse.core.resources.prefs
56
/.settings/org.eclipse.jdt.apt.core.prefs
7+
/.settings/org.eclipse.m2e.core.prefs
8+
/.settings/org.sonarlint.eclipse.core.prefs
69
# .settings : we need Eclipse settings for code formatter and clean-up rules
710
.cache
811
dependency-reduced-pom.xml

0 commit comments

Comments
 (0)