Skip to content

Commit 4d01533

Browse files
authored
Bouncy castle update (#340)
1 parent d82fd30 commit 4d01533

3 files changed

Lines changed: 70 additions & 5 deletions

File tree

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Refresh Flatpak maven-dependencies
2+
3+
on:
4+
push:
5+
branches: [master]
6+
paths:
7+
- 'pom.xml'
8+
- '**/pom.xml'
9+
workflow_dispatch:
10+
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
15+
concurrency:
16+
group: refresh-flatpak-deps
17+
cancel-in-progress: true
18+
19+
jobs:
20+
refresh:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v6
25+
26+
- name: Install Flatpak + Flathub remote
27+
run: |
28+
sudo apt-get update
29+
sudo apt-get install -y flatpak
30+
sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
31+
32+
- name: Install Flatpak SDK + openjdk21 extension
33+
run: |
34+
sudo flatpak install -y --noninteractive flathub \
35+
org.freedesktop.Sdk//25.08 \
36+
org.freedesktop.Sdk.Extension.openjdk21//25.08
37+
38+
- name: Regenerate maven-dependencies.json
39+
run: ./distribution/linux/flatpak/generate-dependencies.sh
40+
41+
- name: Open self-healing PR on drift
42+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1
43+
with:
44+
token: ${{ secrets.GITHUB_TOKEN }}
45+
base: master
46+
branch: chore/flatpak-deps-refresh
47+
delete-branch: true
48+
add-paths: distribution/linux/flatpak/maven-dependencies.json
49+
commit-message: |
50+
chore(flatpak): regenerate maven-dependencies.json
51+
title: "chore(flatpak): refresh maven-dependencies.json"
52+
body: |
53+
Automated refresh of `distribution/linux/flatpak/maven-dependencies.json`.
54+
55+
The `refresh-flatpak-deps` workflow detected drift after a change to a
56+
`pom.xml` on `master` and regenerated the offline Maven manifest used by
57+
the Devel Flatpak build.
58+
59+
Safe to merge once review passes. If the regeneration itself is broken,
60+
the fix belongs in `distribution/linux/flatpak/generate-dependencies.sh`.
61+
62+
**Note:** CI does not run automatically on PRs opened by `GITHUB_TOKEN`.
63+
Close and reopen this PR, or push any commit to its branch, to trigger
64+
the usual `pr-builder` / `codeql-analysis` workflows. Upgrading this job
65+
to a PAT or GitHub App token would remove that limitation.

jsignpdf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@
192192
</dependency>
193193
<dependency>
194194
<groupId>org.bouncycastle</groupId>
195-
<artifactId>bcprov-jdk15on</artifactId>
195+
<artifactId>bcprov-jdk18on</artifactId>
196196
</dependency>
197197
<dependency>
198198
<groupId>org.bouncycastle</groupId>
199-
<artifactId>bcpkix-jdk15on</artifactId>
199+
<artifactId>bcpkix-jdk18on</artifactId>
200200
</dependency>
201201
<dependency>
202202
<groupId>org.apache.commons</groupId>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<maven.dependency.plugin.version>3.10.0</maven.dependency.plugin.version>
2222
<maven.shade.plugin.version>3.6.2</maven.shade.plugin.version>
2323

24-
<bouncycastle.version>1.70</bouncycastle.version>
24+
<bouncycastle.version>1.84</bouncycastle.version>
2525
<jsign.pkcs11.version>1.1.0</jsign.pkcs11.version>
2626
<jsign.jpedal.version>4.92.13</jsign.jpedal.version>
2727
<pdfbox.version>2.0.27</pdfbox.version>
@@ -49,12 +49,12 @@
4949
</dependency>
5050
<dependency>
5151
<groupId>org.bouncycastle</groupId>
52-
<artifactId>bcprov-jdk15on</artifactId>
52+
<artifactId>bcprov-jdk18on</artifactId>
5353
<version>${bouncycastle.version}</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.bouncycastle</groupId>
57-
<artifactId>bcpkix-jdk15on</artifactId>
57+
<artifactId>bcpkix-jdk18on</artifactId>
5858
<version>${bouncycastle.version}</version>
5959
</dependency>
6060
<dependency>

0 commit comments

Comments
 (0)