From b642fdf150ba63535c70e621a27c98768085dde7 Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Wed, 28 Aug 2024 15:37:46 +0200
Subject: [PATCH] Upgrade to apr 1.7.5 (#884)

Motivation:

A new apr version was released

Modifications:

Upgrade to 1.7.5

Result:

Use latest apr version
---
 docker/Dockerfile.cross_compile_aarch64 | 2 +-
 docker/docker-compose.centos-7.yaml     | 2 +-
 pom.xml                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.cross_compile_aarch64 b/docker/Dockerfile.cross_compile_aarch64
index f08aed641..9c25c1c97 100644
--- a/docker/Dockerfile.cross_compile_aarch64
+++ b/docker/Dockerfile.cross_compile_aarch64
@@ -2,7 +2,7 @@ FROM centos:7.6.1810
 
 ARG gcc_version=10.2-2020.11
 ARG openssl_version=1_1_1d
-ARG apr_version=1.7.4
+ARG apr_version=1.7.5
 ENV SOURCE_DIR /root/source
 ENV GCC_VERSION $gcc_version
 ENV OPENSSL_VERSION $openssl_version
diff --git a/docker/docker-compose.centos-7.yaml b/docker/docker-compose.centos-7.yaml
index aeb6fc0fd..050d6e996 100644
--- a/docker/docker-compose.centos-7.yaml
+++ b/docker/docker-compose.centos-7.yaml
@@ -9,7 +9,7 @@ services:
       dockerfile: docker/Dockerfile.cross_compile_aarch64
       args:
         gcc_version: "10.2-2020.11"
-        apr_version: "1.7.4"
+        apr_version: "1.7.5"
         openssl_version: "1_1_1k"
 
   cross-compile-aarch64-common: &cross-compile-aarch64-common
diff --git a/pom.xml b/pom.xml
index 9d1a13ecc..b72309d10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,8 +83,8 @@
     <nativeLibOnlyDir>${project.build.directory}/native-lib-only</nativeLibOnlyDir>
     <nativeJarWorkdir>${project.build.directory}/native-jar-work</nativeJarWorkdir>
     <nativeLibOsParts>${os.detected.name}_${os.detected.arch}</nativeLibOsParts>
-    <aprVersion>1.7.4</aprVersion>
-    <aprSha256>fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577</aprSha256>
+    <aprVersion>1.7.5</aprVersion>
+    <aprSha256>3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db</aprSha256>
     <boringsslBranch>chromium-stable</boringsslBranch>
     <!--
       See https://boringssl.googlesource.com/boringssl/+/refs/heads/chromium-stable for the latest commit