Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/wavefront proxy #17601

Merged
merged 2 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion wavefront-proxy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: wavefront-proxy
version: "13.4" # When version is bumped, check if patches are still needed to address CVE-2023-1428
epoch: 4
epoch: 5
description: Wavefront Proxy Project
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -72,6 +72,29 @@ subpackages:
- wavefront-proxy-config
- wavefront-proxy-licenses

test:
environment:
contents:
packages:
- busybox
pipeline:
- runs: |
set -- java -jar /usr/share/java/wavefront/wavefront-proxy/wavefront-proxy.jar
"$@" --help >out 2>&1 || {
rc=$?;
echo "failed [$rc]: $*"
cat out
exit $rc;
}
expected="Wavefront Proxy version ${{package.version}}"
grep "$expected" out || {
echo "command '$* --help' did not contain expected output"
echo "expected: $expected"
echo "actual:"
cat out
exit 1
}

update:
enabled: true
github:
Expand Down
7 changes: 1 addition & 6 deletions wavefront-proxy/proxy/pombump-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ patches:
# Fixes GHSA-5jpm-x58v-624v
- groupId: io.netty
artifactId: netty-bom
version: 4.1.108.Final
scope: import
type: jar
- groupId: io.netty
artifactId: netty-codec-http
version: 4.1.108.Final
version: 4.1.109.Final
scope: import
type: jar
- groupId: com.squareup.okio
Expand Down
Loading