Compare commits

..

No commits in common. "f0000008f909d64bb7f0a9d025aee9d9f1cd76df" and "982fb28ec07c93b9b60fd526fe4ebf3e18b477ee" have entirely different histories.

8 changed files with 52 additions and 109 deletions

5
README
View File

@ -1,5 +0,0 @@
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

View File

@ -1,13 +1,22 @@
# ovirt-engine-wildfly-overlay # ovirt-engine-wildfly-overlay
#### Description #### Description
This package contains upgraded parts of WildFly 8.2.1, which fix bugs {**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**}
affecting oVirt engine:
1. hibernate-validator 5.2.2.Final #### Software Architecture
- Fixes https://hibernate.atlassian.net/browse/HV-861 Software architecture description
2. apache-commons-collections 3.2.2
- Fixes https://issues.apache.org/jira/browse/COLLECTIONS-580 #### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution #### Contribution
@ -15,3 +24,13 @@ affecting oVirt engine:
2. Create Feat_xxx branch 2. Create Feat_xxx branch
3. Commit your code 3. Commit your code
4. Create Pull Request 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/)

View File

@ -1,13 +1,26 @@
# ovirt-engine-wildfly-overlay # ovirt-engine-wildfly-overlay
#### 介绍 #### 介绍
此软件包包含WildFly 8.2.1的升级部分修复了影响oVirt引擎的相关bug {**以下是码云平台说明,您可以替换此简介**
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN。专为开发者提供稳定、高效、安全的云端软件开发协作平台
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
1. hibernate-validator5.2.2.Final #### 软件架构
- https://hibernate.atlassian.net/browse/HV-861 软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
2. apache-commons-collections 3.2.2
- https://issues.apache.org/jira/browse/COLLECTIONS-580
#### 参与贡献 #### 参与贡献
1. Fork 本仓库 1. Fork 本仓库
@ -15,3 +28,12 @@
3. 提交代码 3. 提交代码
4. 新建 Pull Request 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/)

Binary file not shown.

Binary file not shown.

View File

@ -1,40 +0,0 @@
<?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>

View File

@ -1,49 +0,0 @@
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

View File

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