Skip to content

Commit 3665f1a

Browse files
authored
#61: Fix CVE-2023-42503 in org.apache.commons:commons-compress (#62)
1 parent f2e04a5 commit 3665f1a

19 files changed

+145
-89
lines changed

.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ pk_generated_parent.pom linguist-genera
44
.github/workflows/broken_links_checker.yml linguist-generated=true
55
.github/workflows/ci-build-next-java.yml linguist-generated=true
66
.github/workflows/dependencies_check.yml linguist-generated=true
7-
.github/workflows/release_droid_prepare_original_checksum.yml linguist-generated=true
87
.github/workflows/release_droid_print_quick_checksum.yml linguist-generated=true
98
.github/workflows/release_droid_release_on_maven_central.yml linguist-generated=true
9+
.github/workflows/release_droid_upload_github_release_assets.yml linguist-generated=true
10+
11+
.settings/org.eclipse.jdt.core.prefs linguist-generated=true
12+
.settings/org.eclipse.jdt.ui.prefs linguist-generated=true

.github/workflows/broken_links_checker.yml

Lines changed: 5 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: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,27 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest
1212
concurrency:
1313
group: ${{ github.workflow }}-${{ github.ref }}
1414
cancel-in-progress: true
1515
steps:
16+
- name: Free Disk Space
17+
run: |
18+
sudo rm -rf /usr/local/lib/android
19+
sudo rm -rf /usr/share/dotnet
1620
- name: Checkout the repository
17-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
1822
with:
1923
fetch-depth: 0
20-
- name: Set up JDK 11
24+
- name: Set up JDK 11 & 17
2125
uses: actions/setup-java@v3
2226
with:
23-
distribution: 'temurin'
24-
java-version: 11
25-
cache: 'maven'
27+
distribution: "temurin"
28+
java-version: |
29+
17
30+
11
31+
cache: "maven"
2632
- name: Cache SonarCloud packages
2733
uses: actions/cache@v3
2834
with:
@@ -33,7 +39,7 @@ jobs:
3339
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
3440
- name: Run tests and build with Maven
3541
run: |
36-
mvn --batch-mode clean verify \
42+
JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \
3743
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
3844
-DtrimStackTrace=false
3945
- name: Publish Test Report
@@ -44,12 +50,12 @@ jobs:
4450
- name: Sonar analysis
4551
if: ${{ env.SONAR_TOKEN != null }}
4652
run: |
47-
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
53+
JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
4854
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
4955
-DtrimStackTrace=false \
5056
-Dsonar.organization=exasol \
5157
-Dsonar.host.url=https://sonarcloud.io \
52-
-Dsonar.login=$SONAR_TOKEN
58+
-Dsonar.token=$SONAR_TOKEN
5359
env:
5460
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
61+
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
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ on:
55

66
jobs:
77
build:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest
99
steps:
10+
- name: Free Disk Space
11+
run: |
12+
sudo rm -rf /usr/local/lib/android
13+
sudo rm -rf /usr/share/dotnet
1014
- name: Checkout the repository
11-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1216
with:
1317
fetch-depth: 0
1418
- name: Set up JDK 11
1519
uses: actions/setup-java@v3
1620
with:
17-
distribution: 'temurin'
21+
distribution: "temurin"
1822
java-version: 11
19-
cache: 'maven'
23+
cache: "maven"
2024
- name: Enable testcontainer reuse
2125
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
2226
- name: Run tests and build with Maven
@@ -28,4 +32,4 @@ jobs:
2832
with:
2933
name: original_checksum
3034
retention-days: 5
31-
path: original_checksum
35+
path: original_checksum

.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
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ pom.xml.versionsBackup
55
.classpath
66
.project
77
/.settings/org.eclipse.jdt.apt.core.prefs
8+
/.settings/org.eclipse.core.resources.prefs
9+
/.settings/org.eclipse.m2e.core.prefs
810
# .settings : we need Eclipse settings for code formatter and clean-up rules
911
target
1012
.cache

0 commit comments

Comments
 (0)