Skip to content
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
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
## Security Fixes

* Fixed [CVE-2023-46604](https://www.cve.org/CVERecord?id=CVE-2023-46604) (CVSS 10.0) and [CVE-2022-41678](https://www.cve.org/CVERecord?id=CVE-2022-41678) by upgrading ActiveMQ from 5.14.5 to 5.19.2 (Java) ([#37943](https://github.com/apache/beam/issues/37943)).
* Fixed [CVE-2024-1597](https://www.cve.org/CVERecord?id=CVE-2024-1597), [CVE-2022-31197](https://www.cve.org/CVERecord?id=CVE-2022-31197), and [CVE-2022-21724](https://www.cve.org/CVERecord?id=CVE-2022-21724) by upgrading PostgreSQL JDBC Driver from 42.2.16 to 42.7.10 (Java) ([#37942](https://github.com/apache/beam/issues/37942)).
* Fixed [CVE-2024-1597](https://www.cve.org/CVERecord?id=CVE-2024-1597), [CVE-2022-31197](https://www.cve.org/CVERecord?id=CVE-2022-31197), and [CVE-2022-21724](https://www.cve.org/CVERecord?id=CVE-2022-21724) by upgrading PostgreSQL JDBC Driver from 42.2.16 to 42.6.2 (Java) ([#37942](https://github.com/apache/beam/issues/37942)).

## Known Issues

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ class BeamModulePlugin implements Plugin<Project> {
def netty_version = "4.1.124.Final"
// [bomupgrader] determined by: io.opentelemetry:opentelemetry-sdk, consistent with: google_cloud_platform_libraries_bom
def opentelemetry_version = "1.51.0"
def postgres_version = "42.7.10"
def postgres_version = "42.6.2"
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
def protobuf_version = "4.33.2"
// TODO(https://github.com/apache/beam/issues/37637): Remove this once the Bom has been updated to at least reach this version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private void monitorEssentialMetrics() throws SQLException {
}
} catch (SQLException ex) {
LOG.error("SQL error in monitoring thread. Shutting down.", ex);
throw (ex);
throw ex;
} catch (InterruptedException ex) {
LOG.info("Monitoring thread interrupted. Shutting down.");
Thread.currentThread().interrupt();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ public void testGetInitialRestrictionWithoutStartOffsetIsNull() throws Exception
// ---- OffsetRetainer tests -----------------------------------------------

/** Minimal in-memory retainer used only in tests. */
@SuppressWarnings("unused")
private static class InMemoryOffsetRetainer implements OffsetRetainer {
private final @Nullable Map<String, Object> loadResult;
private @Nullable Map<String, Object> lastSaved;
Expand Down
Loading