Skip to content

Commit 421dfda

Browse files
Upgrade httpcomponents-core to 4.4.16 (microsoft#14340)
1 parent 293e3ad commit 421dfda

File tree

4 files changed

+46
-8
lines changed

4 files changed

+46
-8
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 8bc0ab8efd3653189d354e2f179c323a42196584 Mon Sep 17 00:00:00 2001
2+
From: Kevin Lockwood <[email protected]>
3+
Date: Wed, 16 Jul 2025 13:24:32 -0700
4+
Subject: [PATCH] fix compiler/source version
5+
6+
---
7+
common.xml | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/common.xml b/common.xml
11+
index 7e34b95..a5d236a 100644
12+
--- a/common.xml
13+
+++ b/common.xml
14+
@@ -3,7 +3,7 @@
15+
<project name="common" basedir=".">
16+
17+
<property file="build.properties"/>
18+
- <property name="project.version" value="4.4.13"/>
19+
+ <property name="project.version" value="4.4.16"/>
20+
<property name="project.groupId" value="org.apache.httpcomponents"/>
21+
22+
<property name="project.organization.name" value="The Apache Software Foundation"/>
23+
@@ -13,7 +13,7 @@
24+
<property name="project.license.url" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
25+
26+
27+
- <property name="compiler.source" value="1.6"/>
28+
+ <property name="compiler.source" value="7"/>
29+
<property name="compiler.target" value="${compiler.source}"/>
30+
31+
</project>
32+
--
33+
2.34.1
34+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Signatures": {
3-
"httpcomponents-core-4.4.13-src.tar.gz": "a0ee8ba5f91909e79adf96eda77bc6752ab2dc4c458be4de76a4a51d9459a37e",
3+
"httpcomponents-core-4.4.16-src.tar.gz": "8fe2e88a5c66c4c8260a0ad828b119142a11e6c9a10d90dd7f65624a3c8e9036",
44
"httpcomponents-core-build.tar.xz": "f8621aeeada7a74e6188f55ba59e317d99a2d080493eaed7f62ceaaa6c54f874"
55
}
66
}

SPECS-EXTENDED/httpcomponents-core/httpcomponents-core.spec

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,20 @@ Distribution: Azure Linux
2020

2121
%bcond_with tests
2222
Name: httpcomponents-core
23-
Version: 4.4.13
24-
Release: 2%{?dist}
23+
Version: 4.4.16
24+
Release: 1%{?dist}
2525
Summary: Set of low level Java HTTP transport components for HTTP services
2626
License: Apache-2.0
2727
Group: Development/Libraries/Java
2828
URL: https://hc.apache.org/
2929
Source0: https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
3030
Source1: %{name}-build.tar.xz
3131
Patch0: %{name}-java8compat.patch
32+
Patch1: fix-compiler-version.patch
3233
BuildRequires: ant
3334
BuildRequires: fdupes
3435
BuildRequires: javapackages-local-bootstrap
36+
BuildRequires: xerces-j2
3537
BuildArch: noarch
3638
%if %{with tests}
3739
BuildRequires: ant-junit
@@ -65,9 +67,7 @@ Group: Development/Libraries/Java
6567
%{summary}.
6668

6769
%prep
68-
%setup -q -a1
69-
70-
%patch 0 -p1
70+
%autosetup -a1 -p1 -c
7171

7272
# Random test failures on ARM -- 100 ms sleep is not eneough on this
7373
# very performant arch, lets make it 2 s
@@ -157,6 +157,10 @@ done
157157
%{_javadocdir}/%{name}
158158

159159
%changelog
160+
* Wed Jul 16 2025 Kevin Lockwood <[email protected]> - 4.4.16-1
161+
- Update to 4.4.16 (latest minor release)
162+
- License verified
163+
160164
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 4.4.13-2
161165
- Converting the 'Release' tag to the '[number].[distribution]' format.
162166

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5420,8 +5420,8 @@
54205420
"type": "other",
54215421
"other": {
54225422
"name": "httpcomponents-core",
5423-
"version": "4.4.13",
5424-
"downloadUrl": "https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.13-src.tar.gz"
5423+
"version": "4.4.16",
5424+
"downloadUrl": "https://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-4.4.16-src.tar.gz"
54255425
}
54265426
}
54275427
},

0 commit comments

Comments
 (0)