Compare commits

..

No commits in common. "cebc3ff775041dc41eb0a978d976b8c5e69d3e43" and "9f2f3cbffb3a6303e3e55611128cb9db9ea9637c" have entirely different histories.

3 changed files with 20 additions and 19 deletions

13
settings.xml Normal file
View File

@ -0,0 +1,13 @@
<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,12 +1,13 @@
%bcond_with jp_minimal %bcond_with jp_minimal
Name: xstream Name: xstream
Version: 1.4.20 Version: 1.4.17
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: https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip Source0: http://repo1.maven.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)
@ -15,7 +16,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 mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(xpp3:xpp3_min) maven
%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)
@ -67,7 +68,7 @@ Requires: xstream = %{version}-%{release}
Parent POM for xstream. Parent POM for xstream.
%prep %prep
%autosetup -n xstream-%{version} -p1 %setup -qn xstream-%{version}
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
@ -106,8 +107,10 @@ 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
@ -129,21 +132,6 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/
%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