!17 Correct the spec license

From: @yanjianqing_kylin Reviewed-by: @jxy_git Signed-off-by: @jxy_git
Correct the spec license
2024-04-01 06:08:17 +00:00 · 2024-04-01 13:54:44 +08:00 · 2022-04-02 03:22:18 +00:00 · 2022-04-02 11:01:06 +08:00 · 2021-09-06 07:24:56 +00:00 · 2021-09-06 11:15:57 +08:00
8 changed files with 109 additions and 52 deletions
--- a/5
+++ b/5
@ -0,0 +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
--- a/README.en.md
+++ b/README.en.md
@ -1,22 +1,13 @@
 # ovirt-engine-wildfly-overlay

 #### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
+This package contains upgraded parts of WildFly 8.2.1, which fix bugs
+affecting oVirt engine:

-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1. hibernate-validator 5.2.2.Final
+     - Fixes https://hibernate.atlassian.net/browse/HV-861
+2. apache-commons-collections 3.2.2
+     - Fixes https://issues.apache.org/jira/browse/COLLECTIONS-580

 #### Contribution

@ -24,13 +15,3 @@ Software architecture description
 2.  Create Feat_xxx branch
 3.  Commit your code
 4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/README.md
+++ b/README.md
@ -1,26 +1,13 @@
 # ovirt-engine-wildfly-overlay

 #### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+此软件包包含WildFly 8.2.1的升级部分，修复了影响oVirt引擎的相关bug：

-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1. hibernate-validator5.2.2.Final
+    - https://hibernate.atlassian.net/browse/HV-861

+2. apache-commons-collections 3.2.2
+    - https://issues.apache.org/jira/browse/COLLECTIONS-580
 #### 参与贡献

 1.  Fork 本仓库
@ -28,12 +15,3 @@
 3.  提交代码
 4.  新建 Pull Request

-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
--- a/httpclient-4.5.12.jar
+++ b/httpclient-4.5.12.jar
--- a/httpcore-4.4.13.jar
+++ b/httpcore-4.4.13.jar
--- a/org.apache.httpcomponents.core-module.xml
+++ b/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>
--- a/ovirt-engine-wildfly-overlay.spec
+++ b/ovirt-engine-wildfly-overlay.spec
@ -0,0 +1,49 @@
+Name:		ovirt-engine-wildfly-overlay
+Version:	19.1.0
+Release:	2
+Summary:	WildFly overlay for ovirt-engine
+Group:		Virtualization/Management
+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}
+
+
+%description
+WildFly overlay for ovirt-engine
+
+%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
+* Mon Apr  1 2024 yanjianqing <yanjianqing@kylinos.cn> - 19.1.0-2
+- Correct the spec license
+
+* 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
+
+* Tue Jul  6 2021 lijunwei <lijunwei@kylinos.cn> - 22.0.0-1
+- Update version
+
+* Thu Mar  5 2020 changjie.fu <changjie.fu@cs2c.com.cn> - 17.0.1-1
+- Package Initialization
--- a/ovirt-engine-wildfly-overlay.yaml
+++ b/ovirt-engine-wildfly-overlay.yaml
@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly/wildfly
+tag_prefix: ^
+separator: "."
Author	SHA1	Message	Date
openeuler-ci-bot	f0000008f9	!17 Correct the spec license From: @yanjianqing_kylin Reviewed-by: @jxy_git Signed-off-by: @jxy_git	2024-04-01 06:08:17 +00:00
yanjianqing	55577afeab	Correct the spec license	2024-04-01 13:54:44 +08:00
openeuler-ci-bot	552ae40a11	!14 sync 22.03 to master From: @liqiuyu123 Reviewed-by: @jxy_git Signed-off-by: @jxy_git	2022-04-02 03:22:18 +00:00
liqiuyu	e6cd027922	sync 22.03 to master	2022-04-02 11:01:06 +08:00
openeuler-ci-bot	56b81619f5	!4 ovirt-engine-wildfly-overlay update to 23.0.2 From: @bzg1107 Reviewed-by: @jxy_git Signed-off-by: @jxy_git	2021-09-06 07:24:56 +00:00
baizg1107	10cc7a6642	update to 23.0.2	2021-09-06 11:15:57 +08:00
openeuler-ci-bot	840e9593dd	!3 update version From: @lijunwei_kylin Reviewed-by: @crrs666 Signed-off-by: @crrs666	2021-07-06 09:28:16 +00:00
lijunwei	798845e22f	update version	2021-07-06 16:53:54 +08:00
openeuler-ci-bot	b80be6202d	!1 Package Initialization Merge pull request !1 from Sindweller/openEuler1.0-base	2020-05-25 19:42:10 +08:00
changjie.fu	42308b7453	Package Initialization	2020-04-16 15:19:57 +08:00