Skip to content

Commit c681a4a

Browse files
authored
apache-pulsar: adding missed runtime dependencies / upgrade bouncycastle (#38057)
<!--- Provide a short summary in the Title above. Examples of good PR titles: * "ruby-3.1: new package" * "haproxy: fix CVE-2014-123456" --> <!-- Please include references to any related issues or delete this section otherwise. --> Fixes: - Adds `openssl` and `procps` as runtime dependencies - Builds with `openjdk-21` - external counterpart image uses 21 - Upgrades bouncycastle-bcfips to 2.x Related: chainguard-dev/image-requests#1654 ### Pre-review Checklist <!-- This checklist is mostly useful as a reminder of small things that can easily be forgotten – it is meant as a helpful tool rather than hoops to jump through. At the moment of this PR you have the most information on what all the change will affect, so please take the time to jot it down. Put an `x` in all the items that apply, make notes next to any that haven't been addressed, and remove any items that are not relevant to this PR. --> #### For PRs that add patches <!-- remove if unrelated --> - [x] Patch source is documented --------- Signed-off-by: Michael Paul <[email protected]>
1 parent 494bd10 commit c681a4a

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

apache-pulsar.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
package:
22
name: apache-pulsar
33
version: 4.0.1
4-
epoch: 1
4+
epoch: 2
55
description: Pulsar is a distributed pub-sub messaging platform with a very flexible messaging model and an intuitive client API.
66
copyright:
77
- license: Apache-2.0
88
dependencies:
99
runtime:
1010
- bash
1111
- libstdc++
12-
- openjdk-17-jre
12+
- openjdk-21-jre
13+
- openssl
14+
- procps
1315

1416
environment:
1517
contents:
1618
packages:
1719
- busybox
1820
- maven
19-
- openjdk-17-default-jdk
21+
- openjdk-21-default-jdk
2022

2123
pipeline:
2224
- uses: git-checkout
@@ -25,6 +27,10 @@ pipeline:
2527
tag: v${{package.version}}
2628
expected-commit: 3ea527bf6b720dcfe074c4476257cce96ebc068a
2729

30+
- uses: patch
31+
with:
32+
patches: bouncy-castle-bcfips.patch
33+
2834
- uses: maven/pombump
2935

3036
- name: Build
@@ -62,9 +68,10 @@ test:
6268
- ${{package.name}}-compat
6369
- bash
6470
- libstdc++
71+
- procps
6572
environment:
66-
JAVA_HOME: /usr/lib/jvm/java-17-openjdk
67-
PATH: /usr/lib/jvm/java-17-openjdk/bin:$PATH
73+
JAVA_HOME: /usr/lib/jvm/java-21-openjdk
74+
PATH: /usr/lib/jvm/java-21-openjdk/bin:$PATH
6875
pipeline:
6976
- name: Test that all CLI tools are at least installed
7077
runs: |
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/pom.xml b/pom.xml
2+
index 2a91978af8..dfee3a3b77 100644
3+
--- a/pom.xml
4+
+++ b/pom.xml
5+
@@ -159,8 +159,8 @@ flexible messaging model and an intuitive client API.</description>
6+
<commons.collections4.version>4.4</commons.collections4.version>
7+
<log4j2.version>2.23.1</log4j2.version>
8+
<bouncycastle.version>1.78.1</bouncycastle.version>
9+
- <bouncycastle.bcpkix-fips.version>1.0.7</bouncycastle.bcpkix-fips.version>
10+
- <bouncycastle.bc-fips.version>1.0.2.5</bouncycastle.bc-fips.version>
11+
+ <bouncycastle.bcpkix-fips.version>2.0.7</bouncycastle.bcpkix-fips.version>
12+
+ <bouncycastle.bc-fips.version>2.0.0</bouncycastle.bc-fips.version>
13+
<jackson.version>2.17.2</jackson.version>
14+
<fastutil.version>8.5.14</fastutil.version>
15+
<reflections.version>0.10.2</reflections.version>

0 commit comments

Comments
 (0)