Skip to content

Commit c9d47a3

Browse files
authored
[DPE-5679] Downgrade jmx_exported lib to avoid conflict with spark-metrics (#119)
1 parent 8fc86e2 commit c9d47a3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/trivy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
docker-archive:${{ steps.artifact.outputs.base_artifact_name }} \
4949
docker-daemon:trivy/charmed-spark:test
5050
- name: Run Trivy vulnerability scanner
51-
uses: aquasecurity/trivy-action@master
51+
uses: aquasecurity/trivy-action@0.28.0
5252
with:
5353
image-ref: 'trivy/charmed-spark:test'
5454
format: 'sarif'
@@ -63,7 +63,7 @@ jobs:
6363
ref: ${{ inputs.branch }}
6464

6565
- name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
66-
uses: aquasecurity/trivy-action@0.20.0
66+
uses: aquasecurity/trivy-action@0.28.0
6767
with:
6868
scan-type: 'image'
6969
format: 'spdx-json'

images/charmed-spark/rockcraft.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ parts:
100100
ICEBERG_VERSION='1.4.3'
101101
SPARK_METRICS_VERSION='3.4-1.0.2'
102102
SERVLET_FILTERS_VERSION='0.0.1'
103-
PROMETHEUS_JMX_EXPORTER_VERSION='0.20.0'
103+
PROMETHEUS_JMX_EXPORTER_VERSION='0.15.0'
104104
SHA1SUM_ICEBERG_JAR='48d553e4e5496f731b9e0e6adb5bc0fd040cb0df'
105105
SHA512SUM_SPARK_METRICS_ASSEMBLY_JAR='9be728c3bda6a8e9db77452f416bc23245271a5db2da64557429352917c0772801ead19f3b1a33f955ec2eced3cb952c6c3a7c617cdeb4389cd17284f3c711f7'
106106
SHA512SUM_SPARK_SERVLET_FILTER_JAR='ffeb809d58ef0151d513b09d4c2bfd5cc064b0b888ca45899687aed2f42bcb1ce9834be9709290dd70bd9df84049f02cbbff6c2d5ec3c136c278c93f167c8096'
107-
SHA1SUM_PROMETHEUS_JMX_EXPORTER='7b8a98e3482cee8889698ef391b85c47a3c4ce5b'
107+
SHA1SUM_PROMETHEUS_JMX_EXPORTER='a1061f29088ac2709da076a97736de575a872538'
108108
109109
JARS=(
110110
"https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/LIB_VERSION/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-LIB_VERSION.jar $ICEBERG_VERSION sha1sum $SHA1SUM_ICEBERG_JAR"

0 commit comments

Comments
 (0)