diff --git a/README b/README index 4839683..837e51c 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ This directory contains upgraded parts of WildFly, which fix bugs affecting oVirt Engine: -* - - +* httpclient-4.5.12 and httpcore-4.4.13.jar + - Fixes https://issues.apache.org/jira/browse/HTTPCLIENT-2047 diff --git a/httpclient-4.5.12.jar b/httpclient-4.5.12.jar new file mode 100644 index 0000000..300cdf0 Binary files /dev/null and b/httpclient-4.5.12.jar differ diff --git a/httpcore-4.4.13.jar b/httpcore-4.4.13.jar new file mode 100644 index 0000000..163dc43 Binary files /dev/null and b/httpcore-4.4.13.jar differ diff --git a/org.apache.httpcomponents.core-module.xml b/org.apache.httpcomponents.core-module.xml new file mode 100644 index 0000000..7a5f2f3 --- /dev/null +++ b/org.apache.httpcomponents.core-module.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ovirt-engine-wildfly-overlay.spec b/ovirt-engine-wildfly-overlay.spec index f6b219a..594d3f2 100644 --- a/ovirt-engine-wildfly-overlay.spec +++ b/ovirt-engine-wildfly-overlay.spec @@ -1,31 +1,41 @@ Name: ovirt-engine-wildfly-overlay -Version: 23.0.2 +Version: 19.1.0 Release: 1 Summary: WildFly overlay for ovirt-engine Group: Virtualization/Management -License: ASL-2.0 +License: Apache 2.0 URL: http://www.ovirt.org BuildArch: noarch Source0: README +Source1: org.apache.httpcomponents.core-module.xml +Source2: https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.12/httpclient-4.5.12.jar +Source3: https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar + +Requires: ovirt-engine-wildfly = %{version} -Requires: ovirt-engine-wildfly = %{version}-%{release} %description WildFly overlay for ovirt-engine -%build -true - %install install -d -m 0755 "%{buildroot}%{_docdir}/%{name}" install -m 0644 "%{SOURCE0}" "%{buildroot}%{_docdir}/%{name}/README" install -d -m 0755 "%{buildroot}%{_datadir}/%{name}/modules" +install -d -m 0755 "%{buildroot}%{_datadir}/%{name}/modules/org/apache/httpcomponents/core/main" +install -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/%{name}/modules/org/apache/httpcomponents/core/main/module.xml" +install -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/%{name}/modules/org/apache/httpcomponents/core/main/httpclient-4.5.12.jar" +install -m 0644 "%{SOURCE3}" "%{buildroot}%{_datadir}/%{name}/modules/org/apache/httpcomponents/core/main/httpcore-4.4.13.jar" + %files %{_datadir}/%{name}/ %{_docdir}/%{name}/ + %changelog +* Sat Apr 2 2022 liqiuyu - 19.1.0-1 +- Sync 22.03 to master + * Mon Sep 6 2021 baizhonggui - 23.0.2-1 - Update version to 23.0.2 diff --git a/ovirt-engine-wildfly-overlay.yaml b/ovirt-engine-wildfly-overlay.yaml new file mode 100644 index 0000000..dfb0249 --- /dev/null +++ b/ovirt-engine-wildfly-overlay.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: wildfly/wildfly +tag_prefix: ^ +separator: "."