sync 22.03 to master

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

org.apache.httpcomponents.core-module.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<module name="org.apache.httpcomponents.core" xmlns="urn:jboss:module:1.8">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <resource-root path="httpclient-4.5.12.jar"/>
+        <resource-root path="httpcore-4.4.13.jar"/>
+    </resources>
+
+
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="org.apache.commons.logging"/>
+        <!-- Following module is available in WildFly full -->
+        <module name="org.apache.commons.codec" optional="true"/>
+    </dependencies>
+</module>

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 <liqiuyu@kylinos.cn> - 19.1.0-1
+- Sync 22.03 to master
+
 * Mon Sep 6 2021 baizhonggui <baizhonggui@huawei.com> - 23.0.2-1
 - Update version to 23.0.2
 

ovirt-engine-wildfly-overlay.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly/wildfly
+tag_prefix: ^
+separator: "."