Commit 3aad50b
authored
[Security] Bump ActiveMQ from 5.14.5 to 5.19.2 (#37944)
Fixes CVE-2023-46604 (CVSS 10.0, RCE via OpenWire protocol) and
CVE-2022-41678 (CVSS 8.8, RCE via Jolokia and REST API).
ActiveMQ is used exclusively as a test dependency in Beam (embedded
broker for JMS, MQTT, and AMQP IO connector tests).
Changes required for compatibility:
- Upgrade JMS spec from 1.1 to 2.0 (geronimo-jms) for JMS IO, since
ActiveMQ 5.19.x uses JMS 2.0 API (setJMSDeliveryTime).
- Add JMS 2.0 createContext() stubs to MockNonSerializableConnectionFactory.
- Exclude transitive proton-j from activemq-amqp in AMQP IO to avoid
conflict with the directly declared proton-j:0.16.0.
All three affected test modules pass: JMS IO, MQTT IO, AMQP IO.
Fixes #379431 parent 7187ff6 commit 3aad50b
5 files changed
Lines changed: 31 additions & 4 deletions
File tree
- buildSrc/src/main/groovy/org/apache/beam/gradle
- sdks/java/io
- amqp
- jms
- src/test/java/org/apache/beam/sdk/io/jms
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
85 | 85 | | |
86 | 86 | | |
87 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
88 | 92 | | |
89 | 93 | | |
90 | 94 | | |
| |||
2382 | 2386 | | |
2383 | 2387 | | |
2384 | 2388 | | |
2385 | | - | |
| 2389 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
597 | 597 | | |
598 | 598 | | |
599 | 599 | | |
600 | | - | |
| 600 | + | |
601 | 601 | | |
602 | 602 | | |
603 | 603 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
34 | 36 | | |
35 | 37 | | |
36 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| |||
Lines changed: 21 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
34 | 55 | | |
0 commit comments