Skip to content

Commit

Permalink
🔐 Update dependencies to fix vulnerabilities (#119)
Browse files Browse the repository at this point in the history
Co-authored-by: Automatic Dependency Updater <[email protected]>
Co-authored-by: Christoph Pirkl <[email protected]>
  • Loading branch information
3 people authored Nov 21, 2024
1 parent d7c6e1a commit faa62d0
Show file tree
Hide file tree
Showing 17 changed files with 369 additions and 247 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/ci-build-java8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
jobs:
java-8-compatibility:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Checkout the repository
uses: actions/checkout@v4
Expand All @@ -22,15 +24,5 @@ jobs:
8
17
cache: "maven"
- name: Cache local Maven repository
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Run maven compile with Java 8
run: |
mvn --batch-mode --update-snapshots -Dtoolchain.version=8 clean compile \
-DtrimStackTrace=false \
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
run: mvn --batch-mode -Djava.version=8 clean compile
14 changes: 2 additions & 12 deletions .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ on:
pull_request:

jobs:
java-17-compatibility:
next-java-compatibility:
runs-on: ubuntu-latest
defaults:
run:
shell: "bash"
permissions:
contents: read
checks: write # Allow scacap/action-surefire-report
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -29,13 +28,4 @@ jobs:
java-version: 17
cache: "maven"
- name: Run tests and build with Maven
run: |
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
run: mvn --batch-mode clean javadoc:javadoc -Djava.version=17
10 changes: 5 additions & 5 deletions .github/workflows/ci-build.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/dependencies_check.yml

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

2 changes: 1 addition & 1 deletion .github/workflows/dependencies_update.yml

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

4 changes: 2 additions & 2 deletions .github/workflows/release.yml

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

4 changes: 2 additions & 2 deletions .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ build:
runnerOs: ubuntu-20.04
freeDiskSpace: false
exasolDbVersions:
- "8.26.0" # 8.29.1 not yet supported by exasol-testcontainers
- "7.1.29"
- "8.32.0"
- "7.1.30"
excludes:
# Only run javadoc as glue-connector cannot be built with java version > 11 currently
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
34 changes: 21 additions & 13 deletions .settings/org.eclipse.jdt.core.prefs

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

6 changes: 6 additions & 0 deletions .settings/org.eclipse.jdt.ui.prefs

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

5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,10 @@
"vmArgs": [
"-Djava.util.logging.config.file=src/test/resources/logging.properties"
]
},
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx12G -Xms100m",
"sonarlint.connectedMode.project": {
"connectionId": "exasol",
"projectKey": "com.exasol:glue-connector"
}
}
Loading

0 comments on commit faa62d0

Please sign in to comment.