From 50f05f9d3799d039143eb1cf45769bafcfbd4899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 18 Aug 2021 10:35:49 +0200 Subject: [PATCH 01/31] Retired, failed to install for 8+ weeks https://pagure.io/releng/issue/10268 https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ --- .gitignore | 12 - dead.package | 4 + sources | 1 - xstream-java-8-target.patch | 26 -- xstream.spec | 494 ------------------------------------ 5 files changed, 4 insertions(+), 533 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xstream-java-8-target.patch delete mode 100644 xstream.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6b45429..0000000 --- a/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -xstream-distribution-1.2.2-src.zip -xstream-distribution-1.3.1-src.zip -/xstream-distribution-1.4.4-src.zip -/xstream-distribution-1.4.5-src.zip -/xstream-distribution-1.4.6-src.zip -/xstream-distribution-1.4.7-src.zip -/xstream-distribution-1.4.8-src.zip -/xstream-distribution-1.4.9-src.zip -/xstream-distribution-1.4.11.1-src.zip -/xstream-distribution-1.4.12-src.zip -/xstream-distribution-1.4.13-src.zip -/xstream-distribution-1.4.14-src.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3df8bda --- /dev/null +++ b/dead.package @@ -0,0 +1,4 @@ +Retired, failed to install for 8+ weeks + +https://pagure.io/releng/issue/10268 +https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ diff --git a/sources b/sources deleted file mode 100644 index c395d78..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xstream-distribution-1.4.14-src.zip) = 331a8ee4d81c1cb7e4d87246c312609c3a266bac1a06beaedf5086dff32d46a3e624a903290381bda725b2cf9d52df8dce63c545d0ae29de26b17ccc538e485f diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch deleted file mode 100644 index 2f7d66d..0000000 --- a/xstream-java-8-target.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 2ab1bd4..4e6ea8b 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -84,8 +84,8 @@ - 1.8 - - -- 1.4 -- 1.4 -+ 1.8 -+ 1.8 - - - -@@ -1100,8 +1100,8 @@ - - 1.5 - 1.6 -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - [1.4,) - - 1.3 diff --git a/xstream.spec b/xstream.spec deleted file mode 100644 index 2718ac8..0000000 --- a/xstream.spec +++ /dev/null @@ -1,494 +0,0 @@ -# Copyright statement from JPackage this file is derived from: - -# Copyright (c) 2000-2007, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%bcond_with dom4j -%bcond_with hibernate -%bcond_with jdom -%bcond_with jdom2 -%bcond_with joda -%bcond_with kxml -%bcond_with stax -%bcond_with woodstox - -Name: xstream -Version: 1.4.14 -Release: 3%{?dist} -Summary: Java XML serialization library -License: BSD -URL: http://x-stream.github.io/ -BuildArch: noarch - -Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip - -# patch pom.xml to target Java 8 / 1.8 -Patch0: xstream-java-8-target.patch - -BuildRequires: maven-local -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.sun.activation:jakarta.activation) -BuildRequires: mvn(javax.xml.bind:jaxb-api) -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.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(xpp3:xpp3) -BuildRequires: mvn(xpp3:xpp3_min) - - -%if %{with dom4j} -BuildRequires: mvn(dom4j:dom4j) -%endif - -%if %{with hibernate} -BuildRequires: mvn(javassist:javassist) -BuildRequires: mvn(org.codehaus.jettison:jettison) -BuildRequires: mvn(org.hibernate:hibernate-core) -BuildRequires: mvn(org.hibernate:hibernate-envers) -BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildRequires: mvn(xom:xom) -%endif - -%if %{with jdom} -BuildRequires: mvn(org.jdom:jdom) -%endif - -%if %{with jdom2} -BuildRequires: mvn(org.jdom:jdom2) -%endif - -%if %{with joda} -BuildRequires: mvn(joda-time:joda-time) -%endif - -%if %{with kxml} -BuildRequires: mvn(net.sf.kxml:kxml2-min) -%endif - -%if %{with stax} -BuildRequires: mvn(stax:stax) -BuildRequires: mvn(stax:stax-api) -%endif - -%if %{with woodstox} -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -%endif - - -%description -XStream is a simple library to serialize objects to XML -and back again. A high level facade is supplied that -simplifies common use cases. Custom objects can be serialized -without need for specifying mappings. Speed and low memory -footprint are a crucial part of the design, making it suitable -for large object graphs or systems with high message throughput. -No information is duplicated that can be obtained via reflection. -This results in XML that is easier to read for humans and more -compact than native Java serialization. XStream serializes internal -fields, including private and final. Supports non-public and inner -classes. Classes are not required to have default constructor. -Duplicate references encountered in the object-model will be -maintained. Supports circular references. By implementing an -interface, XStream can serialize directly to/from any tree -structure (not just XML). Strategies can be registered allowing -customization of how particular types are represented as XML. -When an exception occurs due to malformed XML, detailed diagnostics -are provided to help isolate and fix the problem. - - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -%{name} API documentation. - -%if %{with hibernate} -%package hibernate -Summary: hibernate module for %{name} -Requires: %{name} = %{version}-%{release} - -%description hibernate -hibernate module for %{name}. -%endif - -%package benchmark -Summary: benchmark module for %{name} -Requires: %{name} = %{version}-%{release} - -%description benchmark -benchmark module for %{name}. - -%package parent -Summary: Parent POM for %{name} -Requires: %{name} = %{version}-%{release} - -%description parent -Parent POM for %{name}. - - -%prep -%setup -qn %{name}-%{version} -find . -name "*.class" -print -delete -find . -name "*.jar" -print -delete - -%patch0 -p1 - -# Require org.codehaus.xsite:xsite-maven-plugin -%pom_disable_module xstream-distribution - -# missing artifacts: -# org.openjdk.jmh:jmh-core:jar:1.11.1 -# org.openjdk.jmh:jmh-generator-annprocess:jar:1.11.1 -%pom_disable_module xstream-jmh - -# Unwanted -%pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-dependency-plugin -%pom_remove_plugin :maven-eclipse-plugin -%pom_remove_plugin :maven-release-plugin -%pom_remove_plugin :xsite-maven-plugin - -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream -# Replace old xmlpull dependency with xpp3 -%pom_change_dep :xmlpull xpp3:xpp3:1.1.4c xstream -# Require unavailable proxytoys:proxytoys -%pom_remove_plugin :maven-dependency-plugin xstream - -%pom_remove_plugin :maven-javadoc-plugin xstream - -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream-hibernate -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-hibernate -%pom_remove_plugin :maven-dependency-plugin xstream-hibernate -%pom_remove_plugin :maven-javadoc-plugin xstream-hibernate - -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark -%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark - -# Fix dep on activation -%pom_change_dep javax.activation:activation com.sun.activation:jakarta.activation . xstream - -%if %{without dom4j} -%pom_remove_dep -r dom4j:dom4j -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JDriver.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JReader.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JWriter.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java -%endif - -%if %{without hibernate} -# Don't build hibernate module -%pom_disable_module xstream-hibernate -# Disable support for some lesser used XML backends -%pom_remove_dep -r xom:xom -%pom_remove_dep -r org.codehaus.jettison:jettison -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xom* -rm xstream/src/java/com/thoughtworks/xstream/io/json/Jettison* -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java -%endif - -%if %{without jdom} -%pom_remove_dep -r org.jdom:jdom -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomReader.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomWriter.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamJDom.java -%endif - -%if %{without jdom2} -%pom_remove_dep -r org.jdom:jdom2 -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java -%endif - -%if %{without joda} -%pom_remove_dep -r joda-time:joda-time -rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java -rm xstream/src/test/com/thoughtworks/acceptance/JodaTimeTypesTest.java -%endif - -%if %{without kxml} -%pom_remove_dep -r net.sf.kxml:kxml2-min -rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java -rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2DOM.java -%endif - -%if %{without stax} -%pom_remove_dep -r stax:stax -%pom_remove_dep -r stax:stax-api -rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxWriterTest.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java -%endif - -%if %{without woodstox} -%pom_remove_dep -r org.codehaus.woodstox:woodstox-core-asl -rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java -%endif - -%mvn_file :%{name} %{name}/%{name} %{name} -%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark - -%mvn_package :%{name} - -%build -# test skipped for unavailable test deps (com.megginson.sax:xml-writer) -%mvn_build -f -s - -%install -%mvn_install - -%files -f .mfiles -%doc README.txt -%license LICENSE.txt - -%files parent -f .mfiles-%{name}-parent - -%if %{with hibernate} -%files hibernate -f .mfiles-%{name}-hibernate -%endif - -%files benchmark -f .mfiles-%{name}-benchmark - -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt - -%changelog -* 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 From 1c380655430177740ba4f5b8e6799b922ad639b5 Mon Sep 17 00:00:00 2001 From: sbluhm Date: Fri, 3 Sep 2021 08:26:32 +0200 Subject: [PATCH 02/31] Replaced BuildRequires with package names. --- xstream.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index 2718ac8..62336f4 100644 --- a/xstream.spec +++ b/xstream.spec @@ -54,8 +54,8 @@ Patch0: xstream-java-8-target.patch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.sun.activation:jakarta.activation) -BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: jaf +BuildRequires: glassfish-jaxb-api 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) From 81a80ac8b6b36a9e242237b583379e798799371d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 4 Oct 2021 12:02:42 +0200 Subject: [PATCH 03/31] Revert "Retired, failed to install for 8+ weeks" This reverts commit 50f05f9d3799d039143eb1cf45769bafcfbd4899. Unretirement request: https://pagure.io/releng/issue/10324 Signed-off-by: Tomas Hrcka --- .gitignore | 12 + dead.package | 4 - sources | 1 + xstream-java-8-target.patch | 26 ++ xstream.spec | 494 ++++++++++++++++++++++++++++++++++++ 5 files changed, 533 insertions(+), 4 deletions(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 sources create mode 100644 xstream-java-8-target.patch create mode 100644 xstream.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b45429 --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +xstream-distribution-1.2.2-src.zip +xstream-distribution-1.3.1-src.zip +/xstream-distribution-1.4.4-src.zip +/xstream-distribution-1.4.5-src.zip +/xstream-distribution-1.4.6-src.zip +/xstream-distribution-1.4.7-src.zip +/xstream-distribution-1.4.8-src.zip +/xstream-distribution-1.4.9-src.zip +/xstream-distribution-1.4.11.1-src.zip +/xstream-distribution-1.4.12-src.zip +/xstream-distribution-1.4.13-src.zip +/xstream-distribution-1.4.14-src.zip diff --git a/dead.package b/dead.package deleted file mode 100644 index 3df8bda..0000000 --- a/dead.package +++ /dev/null @@ -1,4 +0,0 @@ -Retired, failed to install for 8+ weeks - -https://pagure.io/releng/issue/10268 -https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ diff --git a/sources b/sources new file mode 100644 index 0000000..c395d78 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xstream-distribution-1.4.14-src.zip) = 331a8ee4d81c1cb7e4d87246c312609c3a266bac1a06beaedf5086dff32d46a3e624a903290381bda725b2cf9d52df8dce63c545d0ae29de26b17ccc538e485f diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch new file mode 100644 index 0000000..2f7d66d --- /dev/null +++ b/xstream-java-8-target.patch @@ -0,0 +1,26 @@ +diff --git a/pom.xml b/pom.xml +index 2ab1bd4..4e6ea8b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -84,8 +84,8 @@ + 1.8 + + +- 1.4 +- 1.4 ++ 1.8 ++ 1.8 + + + +@@ -1100,8 +1100,8 @@ + + 1.5 + 1.6 +- 1.5 +- 1.5 ++ 1.8 ++ 1.8 + [1.4,) + + 1.3 diff --git a/xstream.spec b/xstream.spec new file mode 100644 index 0000000..2718ac8 --- /dev/null +++ b/xstream.spec @@ -0,0 +1,494 @@ +# Copyright statement from JPackage this file is derived from: + +# Copyright (c) 2000-2007, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%bcond_with dom4j +%bcond_with hibernate +%bcond_with jdom +%bcond_with jdom2 +%bcond_with joda +%bcond_with kxml +%bcond_with stax +%bcond_with woodstox + +Name: xstream +Version: 1.4.14 +Release: 3%{?dist} +Summary: Java XML serialization library +License: BSD +URL: http://x-stream.github.io/ +BuildArch: noarch + +Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip + +# patch pom.xml to target Java 8 / 1.8 +Patch0: xstream-java-8-target.patch + +BuildRequires: maven-local +BuildRequires: mvn(cglib:cglib) +BuildRequires: mvn(com.sun.activation:jakarta.activation) +BuildRequires: mvn(javax.xml.bind:jaxb-api) +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.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(xpp3:xpp3) +BuildRequires: mvn(xpp3:xpp3_min) + + +%if %{with dom4j} +BuildRequires: mvn(dom4j:dom4j) +%endif + +%if %{with hibernate} +BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(org.codehaus.jettison:jettison) +BuildRequires: mvn(org.hibernate:hibernate-core) +BuildRequires: mvn(org.hibernate:hibernate-envers) +BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildRequires: mvn(xom:xom) +%endif + +%if %{with jdom} +BuildRequires: mvn(org.jdom:jdom) +%endif + +%if %{with jdom2} +BuildRequires: mvn(org.jdom:jdom2) +%endif + +%if %{with joda} +BuildRequires: mvn(joda-time:joda-time) +%endif + +%if %{with kxml} +BuildRequires: mvn(net.sf.kxml:kxml2-min) +%endif + +%if %{with stax} +BuildRequires: mvn(stax:stax) +BuildRequires: mvn(stax:stax-api) +%endif + +%if %{with woodstox} +BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +%endif + + +%description +XStream is a simple library to serialize objects to XML +and back again. A high level facade is supplied that +simplifies common use cases. Custom objects can be serialized +without need for specifying mappings. Speed and low memory +footprint are a crucial part of the design, making it suitable +for large object graphs or systems with high message throughput. +No information is duplicated that can be obtained via reflection. +This results in XML that is easier to read for humans and more +compact than native Java serialization. XStream serializes internal +fields, including private and final. Supports non-public and inner +classes. Classes are not required to have default constructor. +Duplicate references encountered in the object-model will be +maintained. Supports circular references. By implementing an +interface, XStream can serialize directly to/from any tree +structure (not just XML). Strategies can be registered allowing +customization of how particular types are represented as XML. +When an exception occurs due to malformed XML, detailed diagnostics +are provided to help isolate and fix the problem. + + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +%{name} API documentation. + +%if %{with hibernate} +%package hibernate +Summary: hibernate module for %{name} +Requires: %{name} = %{version}-%{release} + +%description hibernate +hibernate module for %{name}. +%endif + +%package benchmark +Summary: benchmark module for %{name} +Requires: %{name} = %{version}-%{release} + +%description benchmark +benchmark module for %{name}. + +%package parent +Summary: Parent POM for %{name} +Requires: %{name} = %{version}-%{release} + +%description parent +Parent POM for %{name}. + + +%prep +%setup -qn %{name}-%{version} +find . -name "*.class" -print -delete +find . -name "*.jar" -print -delete + +%patch0 -p1 + +# Require org.codehaus.xsite:xsite-maven-plugin +%pom_disable_module xstream-distribution + +# missing artifacts: +# org.openjdk.jmh:jmh-core:jar:1.11.1 +# org.openjdk.jmh:jmh-generator-annprocess:jar:1.11.1 +%pom_disable_module xstream-jmh + +# Unwanted +%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-dependency-plugin +%pom_remove_plugin :maven-eclipse-plugin +%pom_remove_plugin :maven-release-plugin +%pom_remove_plugin :xsite-maven-plugin + +%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl +%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream +%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib +%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream +# Replace old xmlpull dependency with xpp3 +%pom_change_dep :xmlpull xpp3:xpp3:1.1.4c xstream +# Require unavailable proxytoys:proxytoys +%pom_remove_plugin :maven-dependency-plugin xstream + +%pom_remove_plugin :maven-javadoc-plugin xstream + +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream-hibernate +%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-hibernate +%pom_remove_plugin :maven-dependency-plugin xstream-hibernate +%pom_remove_plugin :maven-javadoc-plugin xstream-hibernate + +%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark +%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark + +# Fix dep on activation +%pom_change_dep javax.activation:activation com.sun.activation:jakarta.activation . xstream + +%if %{without dom4j} +%pom_remove_dep -r dom4j:dom4j +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JReader.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JWriter.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java +%endif + +%if %{without hibernate} +# Don't build hibernate module +%pom_disable_module xstream-hibernate +# Disable support for some lesser used XML backends +%pom_remove_dep -r xom:xom +%pom_remove_dep -r org.codehaus.jettison:jettison +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xom* +rm xstream/src/java/com/thoughtworks/xstream/io/json/Jettison* +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java +%endif + +%if %{without jdom} +%pom_remove_dep -r org.jdom:jdom +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomReader.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomWriter.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamJDom.java +%endif + +%if %{without jdom2} +%pom_remove_dep -r org.jdom:jdom2 +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java +%endif + +%if %{without joda} +%pom_remove_dep -r joda-time:joda-time +rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java +rm xstream/src/test/com/thoughtworks/acceptance/JodaTimeTypesTest.java +%endif + +%if %{without kxml} +%pom_remove_dep -r net.sf.kxml:kxml2-min +rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2DOM.java +%endif + +%if %{without stax} +%pom_remove_dep -r stax:stax +%pom_remove_dep -r stax:stax-api +rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java +rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java +rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxWriterTest.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java +%endif + +%if %{without woodstox} +%pom_remove_dep -r org.codehaus.woodstox:woodstox-core-asl +rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java +%endif + +%mvn_file :%{name} %{name}/%{name} %{name} +%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark + +%mvn_package :%{name} + +%build +# test skipped for unavailable test deps (com.megginson.sax:xml-writer) +%mvn_build -f -s + +%install +%mvn_install + +%files -f .mfiles +%doc README.txt +%license LICENSE.txt + +%files parent -f .mfiles-%{name}-parent + +%if %{with hibernate} +%files hibernate -f .mfiles-%{name}-hibernate +%endif + +%files benchmark -f .mfiles-%{name}-benchmark + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt + +%changelog +* 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 From 8da97ca0c62ca5c1c5532fbdef8a5a0e78f01710 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 4 Oct 2021 17:53:48 +0700 Subject: [PATCH 04/31] Update to version 1.4.18 .. and enable optional packages that is currently maintained in fedora --- .gitignore | 1 + sources | 2 +- xstream-java-8-target.patch | 26 --- xstream.spec | 381 +++++++++++++++--------------------- 4 files changed, 163 insertions(+), 247 deletions(-) delete mode 100644 xstream-java-8-target.patch diff --git a/.gitignore b/.gitignore index 6b45429..2d4c33c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.12-src.zip /xstream-distribution-1.4.13-src.zip /xstream-distribution-1.4.14-src.zip +/xstream-distribution-1.4.18-src.zip diff --git a/sources b/sources index c395d78..ba018f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.14-src.zip) = 331a8ee4d81c1cb7e4d87246c312609c3a266bac1a06beaedf5086dff32d46a3e624a903290381bda725b2cf9d52df8dce63c545d0ae29de26b17ccc538e485f +SHA512 (xstream-distribution-1.4.18-src.zip) = f25944615c9d8ff0917e2008632312eea3e44de15f7e556df5972a55b7350d0132d7449035651eda6a4ca6c918fa8e7f9bf273761b8133bafa3ff4593e72cd1a diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch deleted file mode 100644 index 2f7d66d..0000000 --- a/xstream-java-8-target.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 2ab1bd4..4e6ea8b 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -84,8 +84,8 @@ - 1.8 - - -- 1.4 -- 1.4 -+ 1.8 -+ 1.8 - - - -@@ -1100,8 +1100,8 @@ - - 1.5 - 1.6 -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - [1.4,) - - 1.3 diff --git a/xstream.spec b/xstream.spec index 2718ac8..a67827e 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,82 +1,47 @@ -# Copyright statement from JPackage this file is derived from: - -# Copyright (c) 2000-2007, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%bcond_with dom4j -%bcond_with hibernate -%bcond_with jdom -%bcond_with jdom2 -%bcond_with joda -%bcond_with kxml +%bcond_without activation +%bcond_without cglib +%bcond_without dom4j +%bcond_without jdom +%bcond_without jdom2 +%bcond_with jettison +%bcond_with joda-time +%bcond_with kxml2 %bcond_with stax %bcond_with woodstox +%bcond_with xom +%bcond_with xpp3 Name: xstream -Version: 1.4.14 -Release: 3%{?dist} +Version: 1.4.18 +Release: 2%{?dist} Summary: Java XML serialization library License: BSD -URL: http://x-stream.github.io/ +URL: https://x-stream.github.io BuildArch: noarch Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip -# patch pom.xml to target Java 8 / 1.8 -Patch0: xstream-java-8-target.patch - BuildRequires: maven-local -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(com.sun.activation:jakarta.activation) +BuildRequires: mvn(io.github.x-stream:mxparser) BuildRequires: mvn(javax.xml.bind:jaxb-api) 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) -BuildRequires: mvn(xpp3:xpp3) -BuildRequires: mvn(xpp3:xpp3_min) +%if %{with activation} +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +%endif + +%if %{with cglib} +BuildRequires: mvn(cglib:cglib-nodep) +%endif %if %{with dom4j} BuildRequires: mvn(dom4j:dom4j) %endif -%if %{with hibernate} -BuildRequires: mvn(javassist:javassist) -BuildRequires: mvn(org.codehaus.jettison:jettison) -BuildRequires: mvn(org.hibernate:hibernate-core) -BuildRequires: mvn(org.hibernate:hibernate-envers) -BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildRequires: mvn(xom:xom) -%endif - %if %{with jdom} BuildRequires: mvn(org.jdom:jdom) %endif @@ -85,11 +50,15 @@ BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) %endif -%if %{with joda} +%if %{with jettison} +BuildRequires: mvn(org.codehaus.jettison:jettison) +%endif + +%if %{with joda-time} BuildRequires: mvn(joda-time:joda-time) %endif -%if %{with kxml} +%if %{with kxml2} BuildRequires: mvn(net.sf.kxml:kxml2-min) %endif @@ -99,9 +68,16 @@ BuildRequires: mvn(stax:stax-api) %endif %if %{with woodstox} -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +BuildRequires: mvn(org.codehaus.woodstox:wstx-asl) %endif +%if %{with xom} +BuildRequires: mvn(xom:xom) +%endif + +%if %{with xpp3} +BuildRequires: mvn(xpp3:xpp3_min) +%endif %description XStream is a simple library to serialize objects to XML @@ -123,80 +99,36 @@ customization of how particular types are represented as XML. When an exception occurs due to malformed XML, detailed diagnostics are provided to help isolate and fix the problem. +%package -n %{name}-benchmark +Summary: Benchmark module for %{name} +%description -n %{name}-benchmark +Benchmark module for %{name}. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -%{name} API documentation. - -%if %{with hibernate} -%package hibernate -Summary: hibernate module for %{name} -Requires: %{name} = %{version}-%{release} - -%description hibernate -hibernate module for %{name}. -%endif - -%package benchmark -Summary: benchmark module for %{name} -Requires: %{name} = %{version}-%{release} - -%description benchmark -benchmark module for %{name}. - -%package parent -Summary: Parent POM for %{name} -Requires: %{name} = %{version}-%{release} - -%description parent -Parent POM for %{name}. - +%{?javadoc_package} %prep -%setup -qn %{name}-%{version} -find . -name "*.class" -print -delete -find . -name "*.jar" -print -delete +%autosetup -n %{name}-%{version} -%patch0 -p1 +find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete -# Require org.codehaus.xsite:xsite-maven-plugin -%pom_disable_module xstream-distribution +# https://jakarta.ee/about/faq#What_happened_with_javax.*_namespace? +%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api %{name} -# missing artifacts: -# org.openjdk.jmh:jmh-core:jar:1.11.1 -# org.openjdk.jmh:jmh-generator-annprocess:jar:1.11.1 -%pom_disable_module xstream-jmh +%pom_xpath_remove 'pom:execution[pom:id = "compile-jdk15"]' %{name} -# Unwanted -%pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-dependency-plugin -%pom_remove_plugin :maven-eclipse-plugin -%pom_remove_plugin :maven-release-plugin -%pom_remove_plugin :xsite-maven-plugin +%pom_remove_plugin -r :maven-dependency-plugin -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream -# Replace old xmlpull dependency with xpp3 -%pom_change_dep :xmlpull xpp3:xpp3:1.1.4c xstream -# Require unavailable proxytoys:proxytoys -%pom_remove_plugin :maven-dependency-plugin xstream +%if %{without activation} +%pom_remove_dep -r jakarta.activation:jakarta.activation-api +rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java +%endif -%pom_remove_plugin :maven-javadoc-plugin xstream - -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream-hibernate -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-hibernate -%pom_remove_plugin :maven-dependency-plugin xstream-hibernate -%pom_remove_plugin :maven-javadoc-plugin xstream-hibernate - -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark -%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark - -# Fix dep on activation -%pom_change_dep javax.activation:activation com.sun.activation:jakarta.activation . xstream +%if %{without cglib} +%pom_remove_dep -r cglib:cglib-nodep +rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java +rm xstream/src/java/com/thoughtworks/xstream/mapper/CGLIBMapper.java +rm xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java +%endif %if %{without dom4j} %pom_remove_dep -r dom4j:dom4j @@ -207,17 +139,6 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java %endif -%if %{without hibernate} -# Don't build hibernate module -%pom_disable_module xstream-hibernate -# Disable support for some lesser used XML backends -%pom_remove_dep -r xom:xom -%pom_remove_dep -r org.codehaus.jettison:jettison -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xom* -rm xstream/src/java/com/thoughtworks/xstream/io/json/Jettison* -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java -%endif - %if %{without jdom} %pom_remove_dep -r org.jdom:jdom rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java @@ -233,13 +154,18 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java %endif -%if %{without joda} -%pom_remove_dep -r joda-time:joda-time -rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java -rm xstream/src/test/com/thoughtworks/acceptance/JodaTimeTypesTest.java +%if %{without jettison} +%pom_remove_dep -r org.codehaus.jettison:jettison +rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java %endif -%if %{without kxml} +%if %{without joda-time} +%pom_remove_dep -r joda-time:joda-time +rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java +%endif + +%if %{without kxml2} %pom_remove_dep -r net.sf.kxml:kxml2-min rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java @@ -251,244 +177,259 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %pom_remove_dep -r stax:stax %pom_remove_dep -r stax:stax-api rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxWriterTest.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java %endif %if %{without woodstox} -%pom_remove_dep -r org.codehaus.woodstox:woodstox-core-asl +%pom_remove_dep -r org.codehaus.woodstox:wstx-asl rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif -%mvn_file :%{name} %{name}/%{name} %{name} -%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark +%if %{without xom} +%pom_remove_dep -r xom:xom +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomReader.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomWriter.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java +%endif -%mvn_package :%{name} +%if %{without xpp3} +%pom_remove_dep -r xpp3:xpp3_min +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3Driver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3DOM.java +%endif + +%pom_disable_module %{name}-distribution + +%pom_disable_module %{name}-hibernate + +%pom_disable_module %{name}-jmh + +%mvn_package :%{name}-parent __noinstall %build -# test skipped for unavailable test deps (com.megginson.sax:xml-writer) -%mvn_build -f -s +%mvn_build -s -f -- -Dversion.java.source=1.8 -Dversion.java.target=1.8 %install %mvn_install -%files -f .mfiles +%files -n %{name} -f .mfiles-%{name} +%license LICENSE.txt %doc README.txt + +%files -n %{name}-benchmark -f .mfiles-%{name}-benchmark %license LICENSE.txt - -%files parent -f .mfiles-%{name}-parent - -%if %{with hibernate} -%files hibernate -f .mfiles-%{name}-hibernate -%endif - -%files benchmark -f .mfiles-%{name}-benchmark - -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt +%doc README.txt %changelog +* Mon Oct 04 2021 Didik Supriadi - 1.4.18-2 +- Enable activation, cglib, dom4j, jdom, and jdom2 + +* Fri Oct 01 2021 Didik Supriadi - 1.4.18-1 +- Update to version 1.4.18 + * 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 From dd065775eebd779c8a67dd5e51677b230f5c2c56 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 4 Oct 2021 17:53:48 +0700 Subject: [PATCH 05/31] Update to version 1.4.18 .. and enable optional packages that is currently maintained in fedora --- .gitignore | 1 + sources | 2 +- xstream-java-8-target.patch | 26 --- xstream.spec | 383 +++++++++++++++--------------------- 4 files changed, 164 insertions(+), 248 deletions(-) delete mode 100644 xstream-java-8-target.patch diff --git a/.gitignore b/.gitignore index 6b45429..2d4c33c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.12-src.zip /xstream-distribution-1.4.13-src.zip /xstream-distribution-1.4.14-src.zip +/xstream-distribution-1.4.18-src.zip diff --git a/sources b/sources index c395d78..ba018f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.14-src.zip) = 331a8ee4d81c1cb7e4d87246c312609c3a266bac1a06beaedf5086dff32d46a3e624a903290381bda725b2cf9d52df8dce63c545d0ae29de26b17ccc538e485f +SHA512 (xstream-distribution-1.4.18-src.zip) = f25944615c9d8ff0917e2008632312eea3e44de15f7e556df5972a55b7350d0132d7449035651eda6a4ca6c918fa8e7f9bf273761b8133bafa3ff4593e72cd1a diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch deleted file mode 100644 index 2f7d66d..0000000 --- a/xstream-java-8-target.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 2ab1bd4..4e6ea8b 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -84,8 +84,8 @@ - 1.8 - - -- 1.4 -- 1.4 -+ 1.8 -+ 1.8 - - - -@@ -1100,8 +1100,8 @@ - - 1.5 - 1.6 -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - [1.4,) - - 1.3 diff --git a/xstream.spec b/xstream.spec index 62336f4..a67827e 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,82 +1,47 @@ -# Copyright statement from JPackage this file is derived from: - -# Copyright (c) 2000-2007, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%bcond_with dom4j -%bcond_with hibernate -%bcond_with jdom -%bcond_with jdom2 -%bcond_with joda -%bcond_with kxml +%bcond_without activation +%bcond_without cglib +%bcond_without dom4j +%bcond_without jdom +%bcond_without jdom2 +%bcond_with jettison +%bcond_with joda-time +%bcond_with kxml2 %bcond_with stax %bcond_with woodstox +%bcond_with xom +%bcond_with xpp3 Name: xstream -Version: 1.4.14 -Release: 3%{?dist} +Version: 1.4.18 +Release: 2%{?dist} Summary: Java XML serialization library License: BSD -URL: http://x-stream.github.io/ +URL: https://x-stream.github.io BuildArch: noarch Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip -# patch pom.xml to target Java 8 / 1.8 -Patch0: xstream-java-8-target.patch - BuildRequires: maven-local -BuildRequires: mvn(cglib:cglib) -BuildRequires: jaf -BuildRequires: glassfish-jaxb-api +BuildRequires: mvn(io.github.x-stream:mxparser) +BuildRequires: mvn(javax.xml.bind:jaxb-api) 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) -BuildRequires: mvn(xpp3:xpp3) -BuildRequires: mvn(xpp3:xpp3_min) +%if %{with activation} +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +%endif + +%if %{with cglib} +BuildRequires: mvn(cglib:cglib-nodep) +%endif %if %{with dom4j} BuildRequires: mvn(dom4j:dom4j) %endif -%if %{with hibernate} -BuildRequires: mvn(javassist:javassist) -BuildRequires: mvn(org.codehaus.jettison:jettison) -BuildRequires: mvn(org.hibernate:hibernate-core) -BuildRequires: mvn(org.hibernate:hibernate-envers) -BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildRequires: mvn(xom:xom) -%endif - %if %{with jdom} BuildRequires: mvn(org.jdom:jdom) %endif @@ -85,11 +50,15 @@ BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) %endif -%if %{with joda} +%if %{with jettison} +BuildRequires: mvn(org.codehaus.jettison:jettison) +%endif + +%if %{with joda-time} BuildRequires: mvn(joda-time:joda-time) %endif -%if %{with kxml} +%if %{with kxml2} BuildRequires: mvn(net.sf.kxml:kxml2-min) %endif @@ -99,9 +68,16 @@ BuildRequires: mvn(stax:stax-api) %endif %if %{with woodstox} -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +BuildRequires: mvn(org.codehaus.woodstox:wstx-asl) %endif +%if %{with xom} +BuildRequires: mvn(xom:xom) +%endif + +%if %{with xpp3} +BuildRequires: mvn(xpp3:xpp3_min) +%endif %description XStream is a simple library to serialize objects to XML @@ -123,80 +99,36 @@ customization of how particular types are represented as XML. When an exception occurs due to malformed XML, detailed diagnostics are provided to help isolate and fix the problem. +%package -n %{name}-benchmark +Summary: Benchmark module for %{name} +%description -n %{name}-benchmark +Benchmark module for %{name}. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -%{name} API documentation. - -%if %{with hibernate} -%package hibernate -Summary: hibernate module for %{name} -Requires: %{name} = %{version}-%{release} - -%description hibernate -hibernate module for %{name}. -%endif - -%package benchmark -Summary: benchmark module for %{name} -Requires: %{name} = %{version}-%{release} - -%description benchmark -benchmark module for %{name}. - -%package parent -Summary: Parent POM for %{name} -Requires: %{name} = %{version}-%{release} - -%description parent -Parent POM for %{name}. - +%{?javadoc_package} %prep -%setup -qn %{name}-%{version} -find . -name "*.class" -print -delete -find . -name "*.jar" -print -delete +%autosetup -n %{name}-%{version} -%patch0 -p1 +find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete -# Require org.codehaus.xsite:xsite-maven-plugin -%pom_disable_module xstream-distribution +# https://jakarta.ee/about/faq#What_happened_with_javax.*_namespace? +%pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api %{name} -# missing artifacts: -# org.openjdk.jmh:jmh-core:jar:1.11.1 -# org.openjdk.jmh:jmh-generator-annprocess:jar:1.11.1 -%pom_disable_module xstream-jmh +%pom_xpath_remove 'pom:execution[pom:id = "compile-jdk15"]' %{name} -# Unwanted -%pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-dependency-plugin -%pom_remove_plugin :maven-eclipse-plugin -%pom_remove_plugin :maven-release-plugin -%pom_remove_plugin :xsite-maven-plugin +%pom_remove_plugin -r :maven-dependency-plugin -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl -%pom_xpath_set "pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib -%pom_xpath_set "pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream -# Replace old xmlpull dependency with xpp3 -%pom_change_dep :xmlpull xpp3:xpp3:1.1.4c xstream -# Require unavailable proxytoys:proxytoys -%pom_remove_plugin :maven-dependency-plugin xstream +%if %{without activation} +%pom_remove_dep -r jakarta.activation:jakarta.activation-api +rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java +%endif -%pom_remove_plugin :maven-javadoc-plugin xstream - -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream-hibernate -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-hibernate -%pom_remove_plugin :maven-dependency-plugin xstream-hibernate -%pom_remove_plugin :maven-javadoc-plugin xstream-hibernate - -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark -%pom_remove_plugin :maven-javadoc-plugin xstream-benchmark - -# Fix dep on activation -%pom_change_dep javax.activation:activation com.sun.activation:jakarta.activation . xstream +%if %{without cglib} +%pom_remove_dep -r cglib:cglib-nodep +rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java +rm xstream/src/java/com/thoughtworks/xstream/mapper/CGLIBMapper.java +rm xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java +%endif %if %{without dom4j} %pom_remove_dep -r dom4j:dom4j @@ -207,17 +139,6 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java %endif -%if %{without hibernate} -# Don't build hibernate module -%pom_disable_module xstream-hibernate -# Disable support for some lesser used XML backends -%pom_remove_dep -r xom:xom -%pom_remove_dep -r org.codehaus.jettison:jettison -rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xom* -rm xstream/src/java/com/thoughtworks/xstream/io/json/Jettison* -rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java -%endif - %if %{without jdom} %pom_remove_dep -r org.jdom:jdom rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java @@ -233,13 +154,18 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java %endif -%if %{without joda} -%pom_remove_dep -r joda-time:joda-time -rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java -rm xstream/src/test/com/thoughtworks/acceptance/JodaTimeTypesTest.java +%if %{without jettison} +%pom_remove_dep -r org.codehaus.jettison:jettison +rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java %endif -%if %{without kxml} +%if %{without joda-time} +%pom_remove_dep -r joda-time:joda-time +rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java +%endif + +%if %{without kxml2} %pom_remove_dep -r net.sf.kxml:kxml2-min rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java @@ -251,244 +177,259 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %pom_remove_dep -r stax:stax %pom_remove_dep -r stax:stax-api rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxReaderTest.java -rm xstream/src/test/com/thoughtworks/xstream/io/xml/BEAStaxWriterTest.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java %endif %if %{without woodstox} -%pom_remove_dep -r org.codehaus.woodstox:woodstox-core-asl +%pom_remove_dep -r org.codehaus.woodstox:wstx-asl rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif -%mvn_file :%{name} %{name}/%{name} %{name} -%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark +%if %{without xom} +%pom_remove_dep -r xom:xom +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomReader.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomWriter.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java +%endif -%mvn_package :%{name} +%if %{without xpp3} +%pom_remove_dep -r xpp3:xpp3_min +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3Driver.java +rm xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3.java +rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3DOM.java +%endif + +%pom_disable_module %{name}-distribution + +%pom_disable_module %{name}-hibernate + +%pom_disable_module %{name}-jmh + +%mvn_package :%{name}-parent __noinstall %build -# test skipped for unavailable test deps (com.megginson.sax:xml-writer) -%mvn_build -f -s +%mvn_build -s -f -- -Dversion.java.source=1.8 -Dversion.java.target=1.8 %install %mvn_install -%files -f .mfiles +%files -n %{name} -f .mfiles-%{name} +%license LICENSE.txt %doc README.txt + +%files -n %{name}-benchmark -f .mfiles-%{name}-benchmark %license LICENSE.txt - -%files parent -f .mfiles-%{name}-parent - -%if %{with hibernate} -%files hibernate -f .mfiles-%{name}-hibernate -%endif - -%files benchmark -f .mfiles-%{name}-benchmark - -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt +%doc README.txt %changelog +* Mon Oct 04 2021 Didik Supriadi - 1.4.18-2 +- Enable activation, cglib, dom4j, jdom, and jdom2 + +* Fri Oct 01 2021 Didik Supriadi - 1.4.18-1 +- Update to version 1.4.18 + * 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 From 2aa608e80bbf1ecd211d7aad8384e833c8eb0874 Mon Sep 17 00:00:00 2001 From: sbluhm Date: Tue, 5 Oct 2021 23:37:38 +0200 Subject: [PATCH 06/31] Modified for RHEL. --- xstream.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/xstream.spec b/xstream.spec index a67827e..f2a7d07 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,10 +1,13 @@ %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 @@ -13,7 +16,7 @@ Name: xstream Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -54,10 +57,6 @@ BuildRequires: mvn(org.jdom:jdom2) 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 @@ -118,6 +117,11 @@ find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete %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 + %if %{without activation} %pom_remove_dep -r jakarta.activation:jakarta.activation-api rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java @@ -160,10 +164,9 @@ rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.jav rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java %endif -%if %{without joda-time} +# Joda Time for optional ISO8601 date/time converters in JDK 1.7 or below removed. %pom_remove_dep -r joda-time:joda-time rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java -%endif %if %{without kxml2} %pom_remove_dep -r net.sf.kxml:kxml2-min @@ -226,6 +229,11 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* Tue Oct 05 2021 Stefan Bluhm - 1.4.18-3 +- Disabled dom4j for RHEL. +- Minimum supported version: Java 1.8 +- Removed joda-time dependency. + * Mon Oct 04 2021 Didik Supriadi - 1.4.18-2 - Enable activation, cglib, dom4j, jdom, and jdom2 From 6fda885dc568e4e2c84ed59109e6c73b1d1b300a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:33:42 +0000 Subject: [PATCH 07/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index a67827e..66ae339 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -226,6 +226,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 0efe85f61ac0a45c6756a6422817d2bdfe2d42c3 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Sun, 30 Jan 2022 03:17:57 +0700 Subject: [PATCH 08/31] New upstream release 1.4.19 --- .gitignore | 1 + sources | 2 +- xstream.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2d4c33c..32f098e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.13-src.zip /xstream-distribution-1.4.14-src.zip /xstream-distribution-1.4.18-src.zip +/xstream-distribution-1.4.19-src.zip diff --git a/sources b/sources index ba018f8..8a36a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.18-src.zip) = f25944615c9d8ff0917e2008632312eea3e44de15f7e556df5972a55b7350d0132d7449035651eda6a4ca6c918fa8e7f9bf273761b8133bafa3ff4593e72cd1a +SHA512 (xstream-distribution-1.4.19-src.zip) = 1a9b999347c5383801dbe3d068ff61c8566ca43f56da30ddf5bce5f0936be37058ca14a5d42685540288040bc9b49ec61369989661a02e19816c4a79466e84eb diff --git a/xstream.spec b/xstream.spec index 66ae339..9d59e78 100644 --- a/xstream.spec +++ b/xstream.spec @@ -12,8 +12,8 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.18 -Release: 3%{?dist} +Version: 1.4.19 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -109,13 +109,11 @@ Benchmark module for %{name}. %prep %autosetup -n %{name}-%{version} -find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete +find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete # https://jakarta.ee/about/faq#What_happened_with_javax.*_namespace? %pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api %{name} -%pom_xpath_remove 'pom:execution[pom:id = "compile-jdk15"]' %{name} - %pom_remove_plugin -r :maven-dependency-plugin %if %{without activation} @@ -226,6 +224,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* Sat Jan 29 2022 Didik Supriadi - 1.4.19-1 +- New upstream release 1.4.19 + * Sat Jan 22 2022 Fedora Release Engineering - 1.4.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 92f13228cccae24f5f1bfaa3a226ec15ab12ab71 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:50:24 +0100 Subject: [PATCH 09/31] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 9d59e78..5a2010e 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -224,6 +224,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 8123ab8015a63e9d00bfcf6cc7c28227bde1c812 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Tue, 15 Mar 2022 19:23:12 +0700 Subject: [PATCH 10/31] Add comments --- xstream.spec | 54 +++++++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/xstream.spec b/xstream.spec index 5a2010e..41e16e7 100644 --- a/xstream.spec +++ b/xstream.spec @@ -18,9 +18,7 @@ Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io BuildArch: noarch - Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip - BuildRequires: maven-local BuildRequires: mvn(io.github.x-stream:mxparser) BuildRequires: mvn(javax.xml.bind:jaxb-api) @@ -29,52 +27,40 @@ 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) %endif - %if %{with cglib} BuildRequires: mvn(cglib:cglib-nodep) %endif - %if %{with dom4j} BuildRequires: mvn(dom4j:dom4j) %endif - %if %{with jdom} BuildRequires: mvn(org.jdom:jdom) %endif - %if %{with jdom2} BuildRequires: mvn(org.jdom:jdom2) %endif - %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 - %if %{with stax} BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) %endif - %if %{with woodstox} BuildRequires: mvn(org.codehaus.woodstox:wstx-asl) %endif - %if %{with xom} BuildRequires: mvn(xom:xom) %endif - %if %{with xpp3} BuildRequires: mvn(xpp3:xpp3_min) %endif @@ -107,27 +93,28 @@ Benchmark module for %{name}. %{?javadoc_package} %prep +# -n: base directory name %autosetup -n %{name}-%{version} - +# delete precompiled jar and class files 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} - +# remove dependency plugin %pom_remove_plugin -r :maven-dependency-plugin - +# optional dep: activation %if %{without activation} %pom_remove_dep -r jakarta.activation:jakarta.activation-api rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java %endif - +# optional dep: cglib %if %{without cglib} %pom_remove_dep -r cglib:cglib-nodep rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java rm xstream/src/java/com/thoughtworks/xstream/mapper/CGLIBMapper.java rm xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java %endif - +# optional dep: dom4j %if %{without dom4j} %pom_remove_dep -r dom4j:dom4j rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JDriver.java @@ -136,7 +123,7 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JWriter.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java %endif - +# optional dep: jdom %if %{without jdom} %pom_remove_dep -r org.jdom:jdom rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java @@ -144,25 +131,25 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomReader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamJDom.java %endif - +# optional dep: jdom2 %if %{without jdom2} %pom_remove_dep -r org.jdom:jdom2 rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java %endif - +# optional dep: jettison %if %{without jettison} %pom_remove_dep -r org.codehaus.jettison:jettison rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java rm xstream/src/java/com/thoughtworks/xstream/io/json/JettisonStaxWriter.java %endif - +# 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 rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java @@ -170,20 +157,20 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2DOM.java %endif - +# optional dep: stax %if %{without stax} %pom_remove_dep -r stax:stax %pom_remove_dep -r stax:stax-api rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java %endif - +# optional dep: woodstox %if %{without woodstox} %pom_remove_dep -r org.codehaus.woodstox:wstx-asl rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif - +# optional dep: xom %if %{without xom} %pom_remove_dep -r xom:xom rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomDriver.java @@ -191,7 +178,7 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomReader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java %endif - +# optional dep: xpp3 %if %{without xpp3} %pom_remove_dep -r xpp3:xpp3_min rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.java @@ -200,13 +187,13 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3DOM.java %endif - +# disable module distribution %pom_disable_module %{name}-distribution - +# disable module hibernate %pom_disable_module %{name}-hibernate - +# disable module jmh %pom_disable_module %{name}-jmh - +# don't install parent package %mvn_package :%{name}-parent __noinstall %build @@ -218,7 +205,6 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %files -n %{name} -f .mfiles-%{name} %license LICENSE.txt %doc README.txt - %files -n %{name}-benchmark -f .mfiles-%{name}-benchmark %license LICENSE.txt %doc README.txt From 7db1a4ef1c334202ec907732881961f51a875af6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 17:04:48 +0200 Subject: [PATCH 11/31] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- xstream.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 41e16e7..8ad6ed8 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,11 +13,12 @@ Name: xstream Version: 1.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: 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: mvn(io.github.x-stream:mxparser) @@ -210,6 +211,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From abdf4532b54b495528e17cda3b7dabac3ce63e8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:35:25 +0000 Subject: [PATCH 12/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 8ad6ed8..45f1d6f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -211,6 +211,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From a54966db5731d127d5a9debcdf9770c6f3a4b903 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:55:22 +0000 Subject: [PATCH 13/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 45f1d6f..1867bfb 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -211,6 +211,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 95a84ad1b79afc469384c60da736d1b0d5d03250 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 20 Feb 2023 18:04:36 +0700 Subject: [PATCH 14/31] New upstream release 1.4.20 Disable activation Signed-off-by: Didik Supriadi --- .gitignore | 1 + sources | 2 +- xstream.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 32f098e..3b18f98 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.14-src.zip /xstream-distribution-1.4.18-src.zip /xstream-distribution-1.4.19-src.zip +/xstream-distribution-1.4.20-src.zip diff --git a/sources b/sources index 8a36a02..76fe289 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.19-src.zip) = 1a9b999347c5383801dbe3d068ff61c8566ca43f56da30ddf5bce5f0936be37058ca14a5d42685540288040bc9b49ec61369989661a02e19816c4a79466e84eb +SHA512 (xstream-distribution-1.4.20-src.zip) = baf3024b687a78456930f371d8119300526f5c40fa394405201805b4a993da41f790190743b38bc214d17b681b6b51dab13a601b90b79c337fc082dd7ae10381 diff --git a/xstream.spec b/xstream.spec index 1867bfb..e57f03d 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,8 +1,8 @@ -%bcond_without activation %bcond_without cglib %bcond_without dom4j %bcond_without jdom %bcond_without jdom2 +%bcond_with activation %bcond_with jettison %bcond_with joda-time %bcond_with kxml2 @@ -12,8 +12,8 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.19 -Release: 5%{?dist} +Version: 1.4.20 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -168,6 +168,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ # optional dep: woodstox %if %{without woodstox} %pom_remove_dep -r org.codehaus.woodstox:wstx-asl +%pom_remove_dep -r com.fasterxml.woodstox:woodstox-core rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif @@ -211,6 +212,10 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From ac4b6e4993287084deb2b22a54f64719b22c0508 Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 20 Feb 2023 19:05:47 +0700 Subject: [PATCH 15/31] Depend on compat versions of activation and XML bind (by @mkoncek) Re-enable activation Signed-off-by: Didik Supriadi --- xstream.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xstream.spec b/xstream.spec index e57f03d..00b899a 100644 --- a/xstream.spec +++ b/xstream.spec @@ -1,8 +1,8 @@ +%bcond_without activation %bcond_without cglib %bcond_without dom4j %bcond_without jdom %bcond_without jdom2 -%bcond_with activation %bcond_with jettison %bcond_with joda-time %bcond_with kxml2 @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -22,14 +22,14 @@ 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: 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) @@ -100,7 +100,8 @@ 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 # optional dep: activation @@ -212,6 +213,10 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From fb8b6b169cd26ea3257d0f6620b23898d543c76d Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Sun, 30 Jan 2022 03:17:57 +0700 Subject: [PATCH 16/31] New upstream release 1.4.19 (cherry picked from commit 0efe85f61ac0a45c6756a6422817d2bdfe2d42c3) --- .gitignore | 1 + sources | 2 +- xstream.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2d4c33c..32f098e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.13-src.zip /xstream-distribution-1.4.14-src.zip /xstream-distribution-1.4.18-src.zip +/xstream-distribution-1.4.19-src.zip diff --git a/sources b/sources index ba018f8..8a36a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.18-src.zip) = f25944615c9d8ff0917e2008632312eea3e44de15f7e556df5972a55b7350d0132d7449035651eda6a4ca6c918fa8e7f9bf273761b8133bafa3ff4593e72cd1a +SHA512 (xstream-distribution-1.4.19-src.zip) = 1a9b999347c5383801dbe3d068ff61c8566ca43f56da30ddf5bce5f0936be37058ca14a5d42685540288040bc9b49ec61369989661a02e19816c4a79466e84eb diff --git a/xstream.spec b/xstream.spec index f2a7d07..c63cfa7 100644 --- a/xstream.spec +++ b/xstream.spec @@ -15,8 +15,8 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.18 -Release: 3%{?dist} +Version: 1.4.19 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -108,13 +108,11 @@ Benchmark module for %{name}. %prep %autosetup -n %{name}-%{version} -find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete +find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete # https://jakarta.ee/about/faq#What_happened_with_javax.*_namespace? %pom_change_dep javax.activation:activation jakarta.activation:jakarta.activation-api %{name} -%pom_xpath_remove 'pom:execution[pom:id = "compile-jdk15"]' %{name} - %pom_remove_plugin -r :maven-dependency-plugin %if 0%{?rhel} @@ -229,6 +227,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 90cdecdbd13dd5588e007540b36e0efee0c3f6ed Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Tue, 15 Mar 2022 19:23:12 +0700 Subject: [PATCH 17/31] Add comments (cherry picked from commit 8123ab8015a63e9d00bfcf6cc7c28227bde1c812) --- xstream.spec | 53 +++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/xstream.spec b/xstream.spec index c63cfa7..e73e991 100644 --- a/xstream.spec +++ b/xstream.spec @@ -21,9 +21,7 @@ Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io BuildArch: noarch - Source0: https://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip - BuildRequires: maven-local BuildRequires: mvn(io.github.x-stream:mxparser) BuildRequires: mvn(javax.xml.bind:jaxb-api) @@ -32,48 +30,37 @@ 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) %endif - %if %{with cglib} BuildRequires: mvn(cglib:cglib-nodep) %endif - %if %{with dom4j} BuildRequires: mvn(dom4j:dom4j) %endif - %if %{with jdom} BuildRequires: mvn(org.jdom:jdom) %endif - %if %{with jdom2} BuildRequires: mvn(org.jdom:jdom2) %endif - %if %{with jettison} BuildRequires: mvn(org.codehaus.jettison:jettison) %endif - %if %{with kxml2} BuildRequires: mvn(net.sf.kxml:kxml2-min) %endif - %if %{with stax} BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) %endif - %if %{with woodstox} BuildRequires: mvn(org.codehaus.woodstox:wstx-asl) %endif - %if %{with xom} BuildRequires: mvn(xom:xom) %endif - %if %{with xpp3} BuildRequires: mvn(xpp3:xpp3_min) %endif @@ -106,32 +93,32 @@ Benchmark module for %{name}. %{?javadoc_package} %prep +# -n: base directory name %autosetup -n %{name}-%{version} - +# delete precompiled jar and class files 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} - +# 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 rm xstream/src/java/com/thoughtworks/xstream/converters/extended/ActivationDataFlavorConverter.java %endif - +# optional dep: cglib %if %{without cglib} %pom_remove_dep -r cglib:cglib-nodep rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/CGLIBEnhancedConverter.java rm xstream/src/java/com/thoughtworks/xstream/mapper/CGLIBMapper.java rm xstream/src/java/com/thoughtworks/xstream/security/CGLIBProxyTypePermission.java %endif - +# optional dep: dom4j %if %{without dom4j} %pom_remove_dep -r dom4j:dom4j rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JDriver.java @@ -140,7 +127,7 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JWriter.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/Dom4JXmlWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamDom4J.java %endif - +# optional dep: jdom %if %{without jdom} %pom_remove_dep -r org.jdom:jdom rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomDriver.java @@ -148,24 +135,23 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomReader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDomWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamJDom.java %endif - +# optional dep: jdom2 %if %{without jdom2} %pom_remove_dep -r org.jdom:jdom2 rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Driver.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Reader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/JDom2Writer.java %endif - +# optional dep: jettison %if %{without jettison} %pom_remove_dep -r org.codehaus.jettison:jettison 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. %pom_remove_dep -r joda-time:joda-time rm xstream/src/java/com/thoughtworks/xstream/core/util/ISO8601JodaTimeConverter.java - +# optional dep: kxml2 %if %{without kxml2} %pom_remove_dep -r net.sf.kxml:kxml2-min rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2DomDriver.java @@ -173,20 +159,20 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/KXml2Driver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamKXml2DOM.java %endif - +# optional dep: stax %if %{without stax} %pom_remove_dep -r stax:stax %pom_remove_dep -r stax:stax-api rm xstream/src/java/com/thoughtworks/xstream/io/xml/BEAStaxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamBEAStax.java %endif - +# optional dep: woodstox %if %{without woodstox} %pom_remove_dep -r org.codehaus.woodstox:wstx-asl rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif - +# optional dep: xom %if %{without xom} %pom_remove_dep -r xom:xom rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomDriver.java @@ -194,7 +180,7 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomReader.java rm xstream/src/java/com/thoughtworks/xstream/io/xml/XomWriter.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXom.java %endif - +# optional dep: xpp3 %if %{without xpp3} %pom_remove_dep -r xpp3:xpp3_min rm xstream/src/java/com/thoughtworks/xstream/io/xml/Xpp3DomDriver.java @@ -203,13 +189,13 @@ rm xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamXpp3DOM.java %endif - +# disable module distribution %pom_disable_module %{name}-distribution - +# disable module hibernate %pom_disable_module %{name}-hibernate - +# disable module jmh %pom_disable_module %{name}-jmh - +# don't install parent package %mvn_package :%{name}-parent __noinstall %build @@ -221,7 +207,6 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %files -n %{name} -f .mfiles-%{name} %license LICENSE.txt %doc README.txt - %files -n %{name}-benchmark -f .mfiles-%{name}-benchmark %license LICENSE.txt %doc README.txt From b88f77221ccf59d1040c6d4a986a20ee1c38873a Mon Sep 17 00:00:00 2001 From: Didik Supriadi Date: Mon, 20 Feb 2023 18:04:36 +0700 Subject: [PATCH 18/31] New upstream release 1.4.20 Signed-off-by: Didik Supriadi (cherry picked from commit 95a84ad1b79afc469384c60da736d1b0d5d03250) --- .gitignore | 1 + sources | 2 +- xstream.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 32f098e..3b18f98 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ xstream-distribution-1.3.1-src.zip /xstream-distribution-1.4.14-src.zip /xstream-distribution-1.4.18-src.zip /xstream-distribution-1.4.19-src.zip +/xstream-distribution-1.4.20-src.zip diff --git a/sources b/sources index 8a36a02..76fe289 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.19-src.zip) = 1a9b999347c5383801dbe3d068ff61c8566ca43f56da30ddf5bce5f0936be37058ca14a5d42685540288040bc9b49ec61369989661a02e19816c4a79466e84eb +SHA512 (xstream-distribution-1.4.20-src.zip) = baf3024b687a78456930f371d8119300526f5c40fa394405201805b4a993da41f790190743b38bc214d17b681b6b51dab13a601b90b79c337fc082dd7ae10381 diff --git a/xstream.spec b/xstream.spec index e73e991..2ccc46a 100644 --- a/xstream.spec +++ b/xstream.spec @@ -15,7 +15,7 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.19 +Version: 1.4.20 Release: 1%{?dist} Summary: Java XML serialization library License: BSD @@ -169,6 +169,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ # optional dep: woodstox %if %{without woodstox} %pom_remove_dep -r org.codehaus.woodstox:wstx-asl +%pom_remove_dep -r com.fasterxml.woodstox:woodstox-core rm xstream/src/java/com/thoughtworks/xstream/io/xml/WstxDriver.java rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/XStreamWoodstox.java %endif @@ -212,6 +213,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* Mon Feb 20 2023 Didik Supriadi - 1.4.20-1 +- New upstream release 1.4.20 + * Sat Jan 29 2022 Didik Supriadi - 1.4.19-1 - New upstream release 1.4.19 From f582b55fbe5eb90381172ef8de397a5eff5e2c7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:20:39 +0000 Subject: [PATCH 19/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 00b899a..1142892 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -213,6 +213,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From a9e00acea14221a7cd78ae1fd7b8065cea1f9a67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 29 Jan 2024 11:19:06 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 1142892..d023afd 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -213,6 +213,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From a9a83044fa0bb9c8e87f2a06e51fbdef7aca1ca0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 5 Feb 2024 12:11:31 +0100 Subject: [PATCH 21/31] Remove trailing whitespace --- xstream.spec | 116 +++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/xstream.spec b/xstream.spec index d023afd..028f492 100644 --- a/xstream.spec +++ b/xstream.spec @@ -253,202 +253,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 From 373f52944a936009f6088c1521949b35220e14b8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:38:11 +0100 Subject: [PATCH 22/31] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 028f492..99af07f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -213,6 +213,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From ad34885095cc0925fe213d53af2e5e27499fb86b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Feb 2024 10:28:24 +0100 Subject: [PATCH 23/31] Set Java version to 1.8 --- xstream.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 99af07f..6c3728c 100644 --- a/xstream.spec +++ b/xstream.spec @@ -200,7 +200,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 From b5a87ca22e94ea3fe171fc74f113790e0156a7b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:31:24 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 6c3728c..6f47da0 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML serialization library License: BSD URL: https://x-stream.github.io @@ -213,6 +213,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 5b4377121c2ed4acf09c78fbef286469dd8da810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:58:37 +0200 Subject: [PATCH 25/31] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xstream.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index 6f47da0..066d566 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,9 +13,10 @@ Name: xstream Version: 1.4.20 -Release: 6%{?dist} +Release: 7%{?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 @@ -213,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From dd68028f6b7914d9cd7d55b8a5ee3d1556e92a89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:21:58 +0000 Subject: [PATCH 26/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 066d566..0768ff4 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -214,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 1383964453547f643f986d19cb1feb6264e9373e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:06:32 +0000 Subject: [PATCH 27/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 0768ff4..391fcd1 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -214,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 078d69522dba5b299a121cba5689b0d694771ac9 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:35:53 +0200 Subject: [PATCH 28/31] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- xstream.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index 391fcd1..dad1ed9 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -21,7 +21,7 @@ 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(jakarta.xml.bind:jakarta.xml.bind-api:2) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -214,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 49f9652f5c7d5f68c529676ae18029cf6a72b4fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:55:54 +0000 Subject: [PATCH 29/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index dad1ed9..6890e11 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.20 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -214,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From 836ff705c247ed9866da88702a2d30f2be6a5e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Mon, 9 Mar 2026 09:28:11 +0100 Subject: [PATCH 30/31] New upstream release 1.4.21 --- .gitignore | 1 + sources | 2 +- xstream.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) 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 6890e11..c318c5f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -12,8 +12,8 @@ %bcond_with xpp3 Name: xstream -Version: 1.4.20 -Release: 11%{?dist} +Version: 1.4.21 +Release: 1%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -214,6 +214,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %doc README.txt %changelog +* 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 From fb2e5574bbc27ee33049fe566fac745d9968714e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:28:32 +0000 Subject: [PATCH 31/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index c318c5f..9270386 100644 --- a/xstream.spec +++ b/xstream.spec @@ -13,7 +13,7 @@ Name: xstream Version: 1.4.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -214,6 +214,9 @@ 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