diff --git a/jettison-1.3.7.tar.gz b/jettison-1.3.7.tar.gz deleted file mode 100644 index 490149abd0edf1d4d2f11eb8e91f500111926926..0000000000000000000000000000000000000000 Binary files a/jettison-1.3.7.tar.gz and /dev/null differ diff --git a/jettison-1.5.4.tar.gz b/jettison-1.5.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..aa764916c312bcff2cd1f5e02dafc6ffba6b97c5 Binary files /dev/null and b/jettison-1.5.4.tar.gz differ diff --git a/jettison-update-woodstox-version.patch b/jettison-update-woodstox-version.patch deleted file mode 100644 index a42d64c72ccc235b47eae652e0b76f4262d530c4..0000000000000000000000000000000000000000 --- a/jettison-update-woodstox-version.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/pom.xml -+++ b/pom.xml -@@ -26,9 +26,9 @@ - 1.0.1 - - -- woodstox -- wstx-asl -- 3.2.2 -+ org.codehaus.woodstox -+ woodstox-core-asl -+ 4.1.2 - test - - diff --git a/jettison.spec b/jettison.spec index ac0d065e98120112588c8b0b448c68a9956c4efb..3c0d38628ef7439cb3783b8138eb9f41dfd02e9b 100644 --- a/jettison.spec +++ b/jettison.spec @@ -1,12 +1,11 @@ Name: jettison -Version: 1.3.7 +Version: 1.5.4 Release: 1 Summary: A JSON StAX implementation License: ASL 2.0 URL: https://github.com/codehaus/jettison BuildArch: noarch -Source0: https://github.com/codehaus/jettison/archive/%{name}-%{version}.tar.gz -Patch0: %{name}-update-woodstox-version.patch +Source0: https://github.com/codehaus/jettison/archive/refs/tags/%{name}-%{version}.tar.gz BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.codehaus:codehaus-parent:pom:) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) mvn(stax:stax-api) @@ -22,11 +21,10 @@ Summary: Javadocs for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 -%pom_xpath_remove pom:build/pom:extensions +%autosetup -n %{name}-%{name}-%{version} -p1 %pom_remove_plugin :maven-release-plugin -%pom_xpath_remove pom:Private-Package +%pom_remove_plugin :nexus-staging-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin %build %mvn_build -f @@ -35,11 +33,15 @@ This package contains the API documentation for %{name}. %mvn_install %files -f .mfiles -%doc src/main/resources/META-INF/LICENSE +%license LICENSE %files javadoc -f .mfiles-javadoc -%doc src/main/resources/META-INF/LICENSE +%license LICENSE %changelog +* Thu Dec 07 2023 yaoxin - 1.5.4-1 +- Upgrade to 1.5.4 for fix cves: CVE-2022-40149,CVE-2022-40150, + CVE-2022-45685,CVE-2022-45693 and CVE-2023-1436 + * Sat Aug 1 2020 Jeffery.Gao - 1.3.7-1 - Package init