diff --git a/.gitignore b/.gitignore index 3b18f98..f42f734 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.18-src.zip /xstream-distribution-1.4.19-src.zip /xstream-distribution-1.4.20-src.zip +/xstream-distribution-1.4.21-src.zip diff --git a/sources b/sources index 76fe289..2df2f7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.20-src.zip) = baf3024b687a78456930f371d8119300526f5c40fa394405201805b4a993da41f790190743b38bc214d17b681b6b51dab13a601b90b79c337fc082dd7ae10381 +SHA512 (xstream-distribution-1.4.21-src.zip) = 495a415bad652bd3ad3ea91f8e8e12a4cfa34c3ba87e8822e3686f545b8e5a38aceb93e854da4d52ab5a5388f50a586f44b03e4c6f884ead30304672afb08a55 diff --git a/xstream.spec b/xstream.spec index 2ccc46a..9270386 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,13 +1,10 @@ %bcond_without activation %bcond_without cglib -%if 0%{?rhel} -%bcond_with dom4j -%else %bcond_without dom4j -%endif %bcond_without jdom %bcond_without jdom2 %bcond_with jettison +%bcond_with joda-time %bcond_with kxml2 %bcond_with stax %bcond_with woodstox @@ -15,23 +12,25 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.20 -Release: 1%{?dist} +Version: 1.4.21 +Release: 2%{?dist} Summary: Java XML serialization library -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://x-stream.github.io BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(io.github.x-stream:mxparser) -BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api:2) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %if %{with activation} -BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api:1) %endif %if %{with cglib} BuildRequires: mvn(cglib:cglib-nodep) @@ -48,6 +47,9 @@ BuildRequires: mvn(org.jdom:jdom2) %if %{with jettison} BuildRequires: mvn(org.codehaus.jettison:jettison) %endif +%if %{with joda-time} +BuildRequires: mvn(joda-time:joda-time) +%endif %if %{with kxml2} BuildRequires: mvn(net.sf.kxml:kxml2-min) %endif @@ -99,13 +101,10 @@ Benchmark module for %{name}. find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete # change javax to jakarta # https://jakarta.ee/about/faq#What_happened_with_javax.*_namespace? -%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api %{name} +%pom_change_dep -r javax.activation:activation jakarta.activation:jakarta.activation-api:1 +%pom_change_dep -r javax.xml.bind:jaxb-api jakarta.xml.bind:jakarta.xml.bind-api:2 # remove dependency plugin %pom_remove_plugin -r :maven-dependency-plugin -%if 0%{?rhel} -%pom_remove_plugin :maven-javadoc-plugin xstream -%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -%endif # optional dep: activation %if %{without activation} %pom_remove_dep -r jakarta.activation:jakarta.activation-api @@ -148,9 +147,11 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java %endif -# Joda Time for optional ISO8601 date/time converters in JDK 1.7 or below removed. +# optional dep: joda-time +%if %{without joda-time} %pom_remove_dep -r joda-time:joda-time rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java +%endif # optional dep: kxml2 %if %{without kxml2} %pom_remove_dep -r net.sf.kxml:kxml2-min @@ -200,7 +201,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %mvn_package :%{name}-parent __noinstall %build -%mvn_build -s -f -- -Dversion.java.source=1.8 -Dversion.java.target=1.8 +%mvn_build -s -f -- -Dversion.java.5=1.8 -Dversion.java.6=1.8 -Dversion.java.source=1.8 -Dversion.java.target=1.8 %install %mvn_install @@ -213,16 +214,64 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.4.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Mon Mar 09 2026 Ondřej Pohořelský - 1.4.21-1 +- New upstream release 1.4.21 + +* Sat Jan 17 2026 Fedora Release Engineering - 1.4.20-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Tue Jul 29 2025 jiri vanek - 1.4.20-10 +- Rebuilt for java-25-openjdk as preffered jdk + +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.20-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.20-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 1.4.20-7 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.20-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.4.20-5 +- Rebuilt for java-21-openjdk as system jdk + +* Mon Jan 29 2024 Fedora Release Engineering - 1.4.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.4.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 20 2023 Didik Supriadi - 1.4.20-2 +- Depend on compat versions of activation and XML bind (by @mkoncek) +- Re-enable activation + * Mon Feb 20 2023 Didik Supriadi - 1.4.20-1 - New upstream release 1.4.20 +- Disable activation + +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.4.19-3 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 1.4.19-2 +- Rebuilt for java-17-openjdk as system jdk * Sat Jan 29 2022 Didik Supriadi - 1.4.19-1 - New upstream release 1.4.19 -* Tue Oct 05 2021 Stefan Bluhm - 1.4.18-3 -- Disabled dom4j for RHEL. -- Minimum supported version: Java 1.8 -- Removed joda-time dependency. +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Mon Oct 04 2021 Didik Supriadi - 1.4.18-2 - Enable activation, cglib, dom4j, jdom, and jdom2 @@ -232,202 +281,202 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ * Fri Jul 23 2021 Fedora Release Engineering - 1.4.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - + * Thu Jan 28 2021 Fedora Release Engineering - 1.4.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - + * Tue Nov 17 2020 Ding-Yi Chen - 1.4.14-1 - Upstream update to 1.4.14 - + * Fri Aug 07 2020 Mat Booth - 1.4.12-6 - Allow building on JDK11 - + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - + * Sat Jul 11 2020 Jiri Vanek - 1.4.12-4 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - + * Wed Jun 17 2020 Fabio Valentini - 1.4.12-3 - Disable unused optional dom4j, jdom, jdom2, kxml, and woodstox support. - + * Mon Jun 08 2020 Fabio Valentini - 1.4.12-2 - Disable optional support for joda-time by default. - + * Mon Apr 27 2020 Fabio Valentini - 1.4.12-1 - Update to version 1.4.12. - Disable optional support for BEA Stax by default. - + * Fri Jan 31 2020 Fedora Release Engineering - 1.4.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - + * Tue Nov 05 2019 Fabio Valentini - 1.4.11.1-4 - Use Java version override compatible with both xmvn 3.0.0 and 3.1.0. - + * Fri Jul 26 2019 Fabio Valentini - 1.4.11.1-3 - Disable hibernate support by default. - + * Tue Mar 05 2019 Mat Booth - 1.4.11.1-2 - Allow building with reduced dependency set - + * Thu Feb 14 2019 Mat Booth - 1.4.11.1-1 - Update to latest upstream release - + * Sun Feb 03 2019 Fedora Release Engineering - 1.4.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - + * Fri Feb 09 2018 Fedora Release Engineering - 1.4.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - + * Thu Jul 27 2017 Fedora Release Engineering - 1.4.9-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - + * Wed Apr 12 2017 Michael Simacek - 1.4.9-5 - Backport fix for void deserialization - Resolves rhbz#1441542 - Update upstream URL - + * Mon Feb 06 2017 Michael Simacek - 1.4.9-4 - Add conditional for hibernate - + * Mon Jul 18 2016 Michael Simacek - 1.4.9-3 - Regenerate buildrequires - + * Wed Jun 15 2016 Mikolaj Izdebski - 1.4.9-2 - Regenerate build-requires - + * Wed Mar 30 2016 Michal Srb - 1.4.9-1 - Update to 1.4.9 - Resolves: CVE-2016-3674 - + * Fri Feb 05 2016 Fedora Release Engineering - 1.4.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - + * Tue Jan 19 2016 Mikolaj Izdebski - 1.4.8-3 - Fix dependency on xpp3 - + * Fri Jun 19 2015 Fedora Release Engineering - 1.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - + * Thu Feb 19 2015 Michal Srb - 1.4.8-1 - Update to upstream version 1.4.8 - + * Mon Nov 10 2014 Michael Simacek - 1.4.7-9 - Change org.json:json dependency scope to test - + * Wed Nov 5 2014 Mikolaj Izdebski - 1.4.7-8 - Remove workaround for RPM bug #646523 - + * Fri Oct 24 2014 Mikolaj Izdebski - 1.4.7-7 - Fix dependencies in parent POM - + * Mon Aug 4 2014 Mikolaj Izdebski - 1.4.7-6 - Fix build-requires on codehaus-parent - + * Sun Jun 08 2014 Fedora Release Engineering - 1.4.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - + * Fri Mar 07 2014 Michael Simacek - 1.4.7-4 - Split into subpackages - + * Tue Mar 04 2014 Stanislav Ochotnicky - 1.4.7-3 - Use Requires: java-headless rebuild (#1067528) - + * Wed Feb 19 2014 Michal Srb - 1.4.7-2 - Spec file cleanup - Fix BR - Build with kxml2 and json - + * Mon Feb 10 2014 Michal Srb - 1.4.7-1 - Update to latest upstream release 1.4.7 - + * Thu Jan 02 2014 Michal Srb - 1.4.6-1 - Update to upstream release 1.4.6 - + * Thu Oct 24 2013 Mikolaj Izdebski - 1.4.5-3 - Rebuild to move arch-independant JARs out of %%_jnidir * Wed Oct 23 2013 Mikolaj Izdebski - 1.4.5-2 - Rebuild to regenerate broken POM files - Related: rhbz#1021484 - + * Sun Oct 20 2013 Matt Spaulding 1.4.5-1 - update to 1.4.5 - + * Tue Aug 20 2013 gil cattaneo 1.4.4-1 - update to 1.4.4 - switch to XMvn - + * Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - + * Fri Jul 12 2013 Mikolaj Izdebski - 1.3.1-7 - Update to current packaging guidelines - + * Fri Jun 28 2013 Mikolaj Izdebski - 1.3.1-6 - Rebuild to regenerate API documentation - Resolves: CVE-2013-1571 - + * Fri Feb 15 2013 Fedora Release Engineering - 1.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - + * Sun Jul 22 2012 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - + * Sat Jan 14 2012 Fedora Release Engineering - 1.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - + * Tue Feb 08 2011 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - + * Mon Jun 14 2010 Alexander Kurtakov 1.3.1-1 - Update to 1.3.1. - Install maven pom and depmap. - + * Wed Dec 02 2009 Lubomir Rintel - 1.2.2-4 - Cosmetic fixes - + * Fri Nov 27 2009 Lubomir Rintel - 0:1.2.2-3 - Drop gcj (suggested by Jochen Schmitt), we seem to need OpenJDK anyway - Fix -javadoc Require - Drop epoch - + * Sun Nov 01 2009 Lubomir Rintel - 0:1.2.2-2 - Greatly simplify for Fedora - Disable tests, we don't have all that's required to run them - Remove maven build - + * Fri Jul 20 2007 Ralph Apel - 0:1.2.2-1jpp - Upgrade to 1.2.2 - Build with maven2 by default - Add poms and depmap frags - + * Tue May 23 2006 Ralph Apel - 0:1.1.3-1jpp - Upgrade to 1.1.3 - Patched to work with bea - + * Mon Sep 13 2004 Ralph Apel - 0:1.0.2-2jpp - Drop saxpath requirement - Require jaxen >= 0:1.1 - + * Mon Aug 30 2004 Ralph Apel - 0:1.0.2-1jpp - Upgrade to 1.0.2 - Delete included binary jars - Change -Dbuild.sysclasspath "from only" to "first" (DynamicProxyTest) - Relax some versioned dependencies - Build with ant-1.6.2 - + * Fri Aug 06 2004 Ralph Apel - 0:1.0.1-2jpp - Upgrade to ant-1.6.X - + * Tue Jun 01 2004 Ralph Apel - 0:1.0.1-1jpp - Upgrade to 1.0.1 - + * Fri Feb 13 2004 Ralph Apel - 0:0.3-1jpp - Upgrade to 0.3 - Add manual subpackage - + * Mon Jan 19 2004 Ralph Apel - 0:0.2-1jpp - First JPackage release