Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
cebc3ff775
!58 [sync] PR-55: Upgrade to 1.4.20 for fix CVE-2022-40151 and CVE-2022-41966
From: @openeuler-sync-bot 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
2023-12-12 02:28:13 +00:00
starlet-dx
48e3bbe100 Upgrade to 1.4.20 for fix CVE-2022-40151 and CVE-2022-41966
(cherry picked from commit 118839b555b27f3be23f74f2a99fd56738adc617)
2023-12-12 09:44:40 +08:00
openeuler-ci-bot
8a4aa33cd5
!45 change source
From: @lyn1001 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
2022-11-10 11:09:33 +00:00
lyn1001
ff4985ab56 Change source 2022-11-10 14:40:45 +08:00
openeuler-ci-bot
d8737659e0
!41 [sync] PR-36: Fix CVE-2021-43859
Merge pull request !41 from openeuler-sync-bot/sync-pr36-openEuler-21.09-to-openEuler-22.03-LTS-Next
2022-02-07 07:15:37 +00:00
wk333
71adb70575 Fix CVE-2021-43859
(cherry picked from commit cf2ddb216806b30d6ab567b2652d76bf85a13a53)
2022-02-07 14:11:47 +08:00
openeuler-ci-bot
413ad8543d !27 [sync] PR-26: Upgrade to 1.4.18 for fix cves
From: @openeuler-sync-bot
Reviewed-by: @wangchong1995924
Signed-off-by: @wangchong1995924
2021-09-07 08:38:29 +00:00
houyingchao
7412421402 Upgrade to 1.4.18 for fix cves
(cherry picked from commit 8438aabec7e357c71285af8ee7d9f95d7bfff45d)
2021-09-04 17:32:07 +08:00
openeuler-ci-bot
5c4bb4ebe6 !25 Change setting.xml to huaweicloud
From: @si-gui
Reviewed-by: @wangchong1995924
Signed-off-by: @wangchong1995924
2021-07-22 11:57:41 +00:00
sunguoshuai
3c6cdec088 Change setting.xml to huaweicloud 2021-07-22 19:45:21 +08:00
3 changed files with 19 additions and 20 deletions

View File

@ -1,13 +0,0 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>aliyun-central</id>
<mirrorOf>*</mirrorOf>
<name>aliyun central</name>
<url>https://maven.aliyun.com/repository/central</url>
</mirror>
</mirrors>
</settings>

View File

@ -1,13 +1,12 @@
%bcond_with jp_minimal %bcond_with jp_minimal
Name: xstream Name: xstream
Version: 1.4.17 Version: 1.4.20
Release: 1 Release: 1
Summary: Java XML serialization library Summary: Java XML serialization library
License: BSD License: BSD
URL: http://x-stream.github.io/ URL: http://x-stream.github.io/
BuildArch: noarch BuildArch: noarch
Source0: http://repo1.maven.org/maven2/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip Source0: https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip
Source1: settings.xml
BuildRequires: maven-local mvn(cglib:cglib) mvn(dom4j:dom4j) mvn(javax.xml.bind:jaxb-api) BuildRequires: maven-local mvn(cglib:cglib) mvn(dom4j:dom4j) mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(joda-time:joda-time) mvn(net.sf.kxml:kxml2-min) BuildRequires: mvn(joda-time:joda-time) mvn(net.sf.kxml:kxml2-min)
@ -16,7 +15,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) mvn(org.jdom:jdom) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) mvn(org.jdom:jdom)
BuildRequires: mvn(org.jdom:jdom2) mvn(stax:stax) mvn(stax:stax-api) mvn(xpp3:xpp3) BuildRequires: mvn(org.jdom:jdom2) mvn(stax:stax) mvn(stax:stax-api) mvn(xpp3:xpp3)
BuildRequires: mvn(xpp3:xpp3_min) maven BuildRequires: mvn(xpp3:xpp3_min) maven mvn(org.codehaus.mojo:build-helper-maven-plugin)
%if %{without jp_minimal} %if %{without jp_minimal}
BuildRequires: mvn(javassist:javassist) mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(javassist:javassist) mvn(org.codehaus.jettison:jettison)
BuildRequires: mvn(org.hibernate:hibernate-core) mvn(org.hibernate:hibernate-envers) BuildRequires: mvn(org.hibernate:hibernate-core) mvn(org.hibernate:hibernate-envers)
@ -68,7 +67,7 @@ Requires: xstream = %{version}-%{release}
Parent POM for xstream. Parent POM for xstream.
%prep %prep
%setup -qn xstream-%{version} %autosetup -n xstream-%{version} -p1
sed -i "s/3.2.7/4.0.0/g" pom.xml sed -i "s/3.2.7/4.0.0/g" pom.xml
find . -name "*.class" -print -delete find . -name "*.class" -print -delete
@ -107,10 +106,8 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/
%mvn_file :xstream xstream/xstream xstream %mvn_file :xstream xstream/xstream xstream
%mvn_file :xstream-benchmark xstream/xstream-benchmark xstream-benchmark %mvn_file :xstream-benchmark xstream/xstream-benchmark xstream-benchmark
%mvn_package :xstream %mvn_package :xstream
cp -a %{_sourcedir}/settings.xml .
%build %build
mvn install --settings ./settings.xml -Dmaven.test.skip=true
%mvn_build -f -s -- -Dversion.java.source=8 %mvn_build -f -s -- -Dversion.java.source=8
%install %install
@ -132,6 +129,21 @@ mvn install --settings ./settings.xml -Dmaven.test.skip=true
%license LICENSE.txt %license LICENSE.txt
%changelog %changelog
* Tue Dec 12 2023 yaoxin <yao_xin001@hoperun.com> - 1.4.20-1
- Upgrade to 1.4.20 for fix CVE-2022-40151 and CVE-2022-41966
* Thu Nov 10 2022 liyanan <liyanan32@h-partners.com> - 1.4.18-3
- Change source
* Mon Feb 7 2022 wangkai <wangkai385@huawei.com> - 1.4.18-2
- Fix CVE-2021-43859
* Sat Sep 4 2021 houyingchao <houyingchao@huawei.com> - 1.4.18-1
- Upgrade 1.4.18 to fix cves
* Thu 22 Jul 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.4.17-2
- Change setting.xml to huaweicloud
* Thu May 27 2021 wutao <wutao61@huawei.com> - 1.4.17-1 * Thu May 27 2021 wutao <wutao61@huawei.com> - 1.4.17-1
- upgrade to 1.4.17 to fix CVE-2021-29505 - upgrade to 1.4.17 to fix CVE-2021-29505