From ed4fd51fd2adb59f2cf4288bf75d80cd84b4e2c7 Mon Sep 17 00:00:00 2001 From: Matt Spaulding Date: Thu, 22 Aug 2013 20:31:37 -0700 Subject: [PATCH 01/68] Update to version 1.4.4 (RHBZ#999071) Patch submitted by: gil cattaneo --- .gitignore | 1 + sources | 2 +- xstream.spec | 188 ++++++++++++++++++++++++--------------------------- 3 files changed, 90 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index 1dbae6d..6d33476 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xstream-distribution-1.2.2-src.zip xstream-distribution-1.3.1-src.zip +/xstream-distribution-1.4.4-src.zip diff --git a/sources b/sources index 6161bbc..cbb1c30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a129d9bdf88e385424a917c59e284e2 xstream-distribution-1.3.1-src.zip +c7b3df5cbed667ca87e70935b0462bc3 xstream-distribution-1.4.4-src.zip diff --git a/xstream.spec b/xstream.spec index 548ca3a..40971a4 100644 --- a/xstream.spec +++ b/xstream.spec @@ -35,43 +35,53 @@ %bcond_with test Name: xstream -Version: 1.3.1 -Release: 8%{?dist} +Version: 1.4.4 +Release: 1%{?dist} Summary: Java XML serialization library - -Group: Development/Libraries License: BSD URL: http://xstream.codehaus.org/ -Source0: http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip +Source0: https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip +BuildRequires: java-devel -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: ant >= 0:1.6 -BuildRequires: bea-stax >= 0:1.2.0 -BuildRequires: bea-stax-api >= 0:1.0.1 -BuildRequires: cglib >= 0:2.1.3 -BuildRequires: dom4j >= 0:1.6.1 -BuildRequires: jakarta-commons-lang >= 0:2.1 -BuildRequires: jakarta-oro -BuildRequires: jdom >= 0:1.0 -BuildRequires: jettison >= 0:1.0 -BuildRequires: joda-time >= 0:1.2.1 -BuildRequires: junit >= 0:3.8.1 -BuildRequires: xom >= 0:1.0 -BuildRequires: xpp3 >= 0:1.1.3.4 -BuildRequires: unzip -BuildRequires: java-devel-openjdk +# core deps +BuildRequires: mvn(cglib:cglib) +BuildRequires: mvn(dom4j:dom4j) +BuildRequires: mvn(joda-time:joda-time) +BuildRequires: mvn(net.sf.kxml:kxml2) +BuildRequires: mvn(org.codehaus:codehaus-parent) +BuildRequires: mvn(org.codehaus.jettison:jettison) +BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +BuildRequires: mvn(org.jdom:jdom) +BuildRequires: mvn(stax:stax) +BuildRequires: mvn(stax:stax-api) +BuildRequires: mvn(xom:xom) +BuildRequires: mvn(xpp3:xpp3) +# hibernate deps +BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(org.hibernate:hibernate-core) +BuildRequires: mvn(org.slf4j:slf4j-simple) %if %with test -BuildRequires: jmock >= 0:1.0.1 -BuildRequires: wstx >= 0:3.2.0 +# Not available +BuildRequires: mvn(com.megginson.sax:xml-writer) +BuildRequires: mvn(commons-cli:commons-cli) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +# Not available +BuildRequires: mvn(jmock:jmock) +BuildRequires: mvn(junit:junit) +# Non provides pom file +BuildRequires: mvn(net.sf.kxml:kxml2-min) +# Non free +BuildRequires: mvn(org.json:json) +BuildRequires: mvn(org.hsqldb:hsqldb) +BuildRequires: mvn(oro:oro) +# Not available +BuildRequires: mvn(proxytoys:proxytoys) %endif -Requires: jpackage-utils -Requires: java -Requires: xpp3-minimal -BuildArch: noarch +BuildRequires: maven-local +BuildArch: noarch %description XStream is a simple library to serialize objects to XML @@ -96,8 +106,6 @@ are provided to help isolate and fix the problem. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc %{name} API documentation. @@ -105,75 +113,61 @@ Requires: jpackage-utils %prep %setup -qn %{name}-%{version} -find . -name "*.jar" -delete +find . -name "*.class" -print -delete +find . -name "*.jar" -print -delete -%if %with test -# This test requires megginson's sax2 -rm -f xstream/src/test/com/thoughtworks/xstream/io/xml/SaxWriterTest.java -%endif +# Remove org.apache.maven.wagon:wagon-webdav +%pom_xpath_remove "pom:project/pom:build/pom:extensions" +# Require org.codehaus.xsite:xsite-maven-plugin +%pom_disable_module xstream-distribution +%pom_remove_plugin :xsite-maven-plugin +%pom_remove_plugin :jxr-maven-plugin +# Unwanted +%pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-dependency-plugin +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream +# use xpp3 instead of xpp3_min, requires xmlpull classes +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'xpp3' ]/pom:artifactId" xpp3 xstream +%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream +# Remove no pom file available +%pom_remove_dep :kxml2-min xstream +# Remove xmlpull classes provides by xpp3 +%pom_remove_dep :xmlpull xstream +# Unavailable test deps +%pom_remove_dep jmock:jmock xstream +# Remove non free +%pom_remove_dep org.json:json 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 %build -# Replace bundled tars -pushd xstream/lib -ln -sf $(build-classpath cglib) -ln -sf $(build-classpath commons-lang) -ln -sf $(build-classpath dom4j) -ln -sf $(build-classpath jdom) -ln -sf $(build-classpath jettison) -ln -sf $(build-classpath joda-time) -ln -sf $(build-classpath junit) -ln -sf $(build-classpath oro) -ln -sf $(build-classpath bea-stax-ri) -ln -sf $(build-classpath bea-stax-api) -ln -sf $(build-classpath xom) -ln -sf $(build-classpath xpp3) -%if %with test -ln -sf $(build-classpath jmock) -ln -sf $(build-classpath wstx/wstx-asl) -%endif -popd -# Build -pushd xstream +%mvn_file :%{name} %{name}/%{name} %{name} +%mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark +# test skipped for unavailable test deps %if %with test -ant library javadoc +%mvn_build %else -ant benchmark:compile jar javadoc +%mvn_build -f %endif -popd - %install -rm -rf $RPM_BUILD_ROOT - -# Directory structure -install -d $RPM_BUILD_ROOT%{_javadir} -install -d $RPM_BUILD_ROOT%{_javadocdir} - -# Main jar -pushd xstream -install -p -m644 target/xstream-SNAPSHOT.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -# Benchmarks -install -p -m644 target/xstream-benchmark-SNAPSHOT.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-benchmark.jar - -# API Documentation -cp -pr target/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} -popd - -# POMs -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom -%add_maven_depmap JPP-%{name}-parent.pom - -install -pm 644 xstream/pom.xml \ - %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap +%mvn_install +%files -f .mfiles +%doc LICENSE.txt README.txt # Workaround for RPM bug #646523 - can't change symlink to directory # TODO: Remove this in F-22 @@ -181,20 +175,14 @@ install -pm 644 xstream/pom.xml \ dir = "%{_javadocdir}/%{name}" dummy = posix.readlink(dir) and os.remove(dir) - -%files -%{_javadir}/*.jar -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt - -%files javadoc -%{_javadocdir}/%{name} -%doc LICENSE.txt - - %changelog +* 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 From 1595ab899a179eae0447879fda008afe3c845eec Mon Sep 17 00:00:00 2001 From: Matt Spaulding Date: Mon, 21 Oct 2013 00:22:04 -0700 Subject: [PATCH 02/68] Update to 1.4.5 --- .gitignore | 1 + sources | 2 +- xstream.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6d33476..49f550e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ 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 diff --git a/sources b/sources index cbb1c30..e8050c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7b3df5cbed667ca87e70935b0462bc3 xstream-distribution-1.4.4-src.zip +47b2dcdd23ce4a6635d7b6c0b6401846 xstream-distribution-1.4.5-src.zip diff --git a/xstream.spec b/xstream.spec index 40971a4..a03aadc 100644 --- a/xstream.spec +++ b/xstream.spec @@ -35,7 +35,7 @@ %bcond_with test Name: xstream -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Java XML serialization library License: BSD @@ -48,10 +48,11 @@ BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(dom4j:dom4j) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus:codehaus-parent) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.jdom:jdom) +BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) BuildRequires: mvn(xom:xom) @@ -59,6 +60,7 @@ BuildRequires: mvn(xpp3:xpp3) # hibernate deps BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(org.hibernate:hibernate-core) +BuildRequires: mvn(org.hibernate:hibernate-envers) BuildRequires: mvn(org.slf4j:slf4j-simple) %if %with test # Not available @@ -179,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 3ebf6a93c1f4169953d0b1d5c1bf4e459341e93b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Oct 2013 11:17:13 +0200 Subject: [PATCH 03/68] Rebuild to regenerate broken POM files - Related: rhbz#1021484 --- xstream.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index a03aadc..562b6b4 100644 --- a/xstream.spec +++ b/xstream.spec @@ -36,7 +36,7 @@ Name: xstream Version: 1.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -181,6 +181,10 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 719b04bb7713f8187ceeb54be12a6530b902fec8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 24 Oct 2013 14:44:33 +0200 Subject: [PATCH 04/68] Rebuild to move arch-independant JARs out of %_jnidir --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 562b6b4..1354b9e 100644 --- a/xstream.spec +++ b/xstream.spec @@ -36,7 +36,7 @@ Name: xstream Version: 1.4.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From a22cc1b3826a60f28b2c605ad9781be67eef0bc6 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 2 Jan 2014 08:50:51 +0100 Subject: [PATCH 05/68] Update to upstream release 1.4.6 --- .gitignore | 1 + sources | 2 +- xstream.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49f550e..7c3f88a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/sources b/sources index e8050c9..7076596 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47b2dcdd23ce4a6635d7b6c0b6401846 xstream-distribution-1.4.5-src.zip +903befa37a9c0b9c7b39ba9855e09f07 xstream-distribution-1.4.6-src.zip diff --git a/xstream.spec b/xstream.spec index 1354b9e..560c770 100644 --- a/xstream.spec +++ b/xstream.spec @@ -35,8 +35,8 @@ %bcond_with test Name: xstream -Version: 1.4.5 -Release: 3%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 3ba6150b681d633507b80c68bfa864e8883a1fa3 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 10 Feb 2014 10:50:14 +0100 Subject: [PATCH 06/68] Update to latest upstream release 1.4.7 --- .gitignore | 1 + sources | 2 +- xstream.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7c3f88a..3f750d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ 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 diff --git a/sources b/sources index 7076596..ff6ef26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -903befa37a9c0b9c7b39ba9855e09f07 xstream-distribution-1.4.6-src.zip +5c166fb1ea4ab5c0a1857781064abf79 xstream-distribution-1.4.7-src.zip diff --git a/xstream.spec b/xstream.spec index 560c770..7bf26e4 100644 --- a/xstream.spec +++ b/xstream.spec @@ -35,7 +35,7 @@ %bcond_with test Name: xstream -Version: 1.4.6 +Version: 1.4.7 Release: 1%{?dist} Summary: Java XML serialization library License: BSD @@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 7711271576d9b9d1c4345ddf10ce843a1a2841bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 11 Feb 2014 12:52:15 +0100 Subject: [PATCH 07/68] Apply upstream security patch - Resolves: CVE-2013-7285 --- xstream-CVE-2013-7285.patch | 1136 +++++++++++++++++++++++++++++++++++ xstream.spec | 10 +- 2 files changed, 1145 insertions(+), 1 deletion(-) create mode 100644 xstream-CVE-2013-7285.patch diff --git a/xstream-CVE-2013-7285.patch b/xstream-CVE-2013-7285.patch new file mode 100644 index 0000000..cc56623 --- /dev/null +++ b/xstream-CVE-2013-7285.patch @@ -0,0 +1,1136 @@ +From b235f65141d07e5dc44b5965657bbe1e539cc966 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 11 Feb 2014 10:44:19 +0100 +Subject: [PATCH] Fix for CVE-2013-7285 + +Backported from upstream revision 2210 +--- + xstream/build.xml | 2 +- + .../src/java/com/thoughtworks/xstream/XStream.java | 148 ++++++++++++++- + .../thoughtworks/xstream/core/util/Primitives.java | 4 + + .../thoughtworks/xstream/mapper/CachingMapper.java | 28 ++- + .../xstream/mapper/SecurityMapper.java | 75 ++++++++ + .../xstream/security/AnyTypePermission.java | 35 ++++ + .../xstream/security/ArrayTypePermission.java | 35 ++++ + .../xstream/security/ExplicitTypePermission.java | 38 ++++ + .../xstream/security/ForbiddenClassException.java | 27 +++ + .../xstream/security/NoPermission.java | 40 ++++ + .../xstream/security/NoTypePermission.java | 39 ++++ + .../xstream/security/NullPermission.java | 27 +++ + .../xstream/security/PrimitiveTypePermission.java | 37 ++++ + .../xstream/security/RegExpTypePermission.java | 49 +++++ + .../xstream/security/TypePermission.java | 25 +++ + .../xstream/security/WildcardTypePermission.java | 84 +++++++++ + .../xstream/mapper/SecurityMapperTest.java | 207 +++++++++++++++++++++ + 17 files changed, 890 insertions(+), 10 deletions(-) + create mode 100644 xstream/src/java/com/thoughtworks/xstream/mapper/SecurityMapper.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/AnyTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/ArrayTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/ExplicitTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/ForbiddenClassException.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/NoPermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/NoTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/NullPermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/RegExpTypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/TypePermission.java + create mode 100644 xstream/src/java/com/thoughtworks/xstream/security/WildcardTypePermission.java + create mode 100644 xstream/src/test/com/thoughtworks/xstream/mapper/SecurityMapperTest.java + +diff --git a/xstream/build.xml b/xstream/build.xml +index 18ef35a..eaa187e 100644 +--- a/xstream/build.xml ++++ b/xstream/build.xml +@@ -62,7 +62,7 @@ + + + +- ++ + + + +diff --git a/xstream/src/java/com/thoughtworks/xstream/XStream.java b/xstream/src/java/com/thoughtworks/xstream/XStream.java +index 506e612..8af0f6a 100644 +--- a/xstream/src/java/com/thoughtworks/xstream/XStream.java ++++ b/xstream/src/java/com/thoughtworks/xstream/XStream.java +@@ -1,6 +1,6 @@ + /* + * Copyright (C) 2003, 2004, 2005, 2006 Joe Walnes. +- * Copyright (C) 2006, 2007, 2008 XStream Committers. ++ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 XStream Committers. + * All rights reserved. + * + * The software in this package is published under the terms of the BSD +@@ -92,8 +92,16 @@ import com.thoughtworks.xstream.mapper.Mapper; + import com.thoughtworks.xstream.mapper.MapperWrapper; + import com.thoughtworks.xstream.mapper.OuterClassMapper; + import com.thoughtworks.xstream.mapper.PackageAliasingMapper; ++import com.thoughtworks.xstream.mapper.SecurityMapper; + import com.thoughtworks.xstream.mapper.SystemAttributeAliasingMapper; + import com.thoughtworks.xstream.mapper.XStream11XmlFriendlyMapper; ++import com.thoughtworks.xstream.security.AnyTypePermission; ++import com.thoughtworks.xstream.security.ExplicitTypePermission; ++import com.thoughtworks.xstream.security.NoPermission; ++import com.thoughtworks.xstream.security.NoTypePermission; ++import com.thoughtworks.xstream.security.RegExpTypePermission; ++import com.thoughtworks.xstream.security.TypePermission; ++import com.thoughtworks.xstream.security.WildcardTypePermission; + + import java.io.EOFException; + import java.io.File; +@@ -132,6 +140,7 @@ import java.util.Set; + import java.util.TreeMap; + import java.util.TreeSet; + import java.util.Vector; ++import java.util.regex.Pattern; + + + /** +@@ -256,7 +265,7 @@ import java.util.Vector; + * The XStream instance is thread-safe. That is, once the XStream instance has been created and + * configured, it may be shared across multiple threads allowing objects to be + * serialized/deserialized concurrently. Note, that this only applies if annotations are not +- * auto-detected on -the-fly. ++ * auto-detected on-the-fly. + *

+ *

Implicit collections

+ *

+@@ -292,6 +301,7 @@ public class XStream { + private ImmutableTypesMapper immutableTypesMapper; + private ImplicitCollectionMapper implicitCollectionMapper; + private LocalConversionMapper localConversionMapper; ++ private SecurityMapper securityMapper; + private AnnotationConfiguration annotationConfiguration; + + private transient JVM jvm = new JVM(); +@@ -440,6 +450,7 @@ public class XStream { + this.mapper = mapper == null ? buildMapper() : mapper; + + setupMappers(); ++ setupSecurity(); + setupAliases(); + setupDefaultImplementations(); + setupConverters(); +@@ -470,6 +481,7 @@ public class XStream { + } + mapper = new LocalConversionMapper(mapper); + mapper = new ImmutableTypesMapper(mapper); ++ mapper = new SecurityMapper(mapper); + if (JVM.is15()) { + mapper = buildMapperDynamically( + ANNOTATION_MAPPER_TYPE, +@@ -521,9 +533,19 @@ public class XStream { + .lookupMapperOfType(ImmutableTypesMapper.class); + localConversionMapper = (LocalConversionMapper)this.mapper + .lookupMapperOfType(LocalConversionMapper.class); ++ securityMapper = (SecurityMapper)this.mapper ++ .lookupMapperOfType(SecurityMapper.class); + annotationConfiguration = (AnnotationConfiguration)this.mapper + .lookupMapperOfType(AnnotationConfiguration.class); + } ++ ++ protected void setupSecurity() { ++ if (securityMapper == null) { ++ return; ++ } ++ ++ addPermission(AnyTypePermission.ANY); ++ } + + protected void setupAliases() { + if (classAliasingMapper == null) { +@@ -1620,4 +1642,126 @@ public class XStream { + return this; + } + ++ /** ++ * Add a new security permission. ++ * ++ *

++ * Permissions are evaluated in the added sequence. An instance of {@link NoTypePermission} or ++ * {@link AnyTypePermission} will implicitly wipe any existing permission. ++ *

++ * ++ * @param permission the permission to add ++ * @since upcoming ++ */ ++ public void addPermission(TypePermission permission) { ++ if (securityMapper != null) { ++ securityMapper.addPermission(permission); ++ } ++ } ++ ++ /** ++ * Add security permission for explicit types by name. ++ * ++ * @param names the type names to allow ++ * @since upcoming ++ */ ++ public void allowTypes(String... names) { ++ addPermission(new ExplicitTypePermission(names)); ++ } ++ ++ /** ++ * Add security permission for types matching one of the specified regular expressions. ++ * ++ * @param regexps the regular expressions to allow type names ++ * @since upcoming ++ */ ++ public void allowTypesByRegExp(String... regexps) { ++ addPermission(new RegExpTypePermission(regexps)); ++ } ++ ++ /** ++ * Add security permission for types matching one of the specified regular expressions. ++ * ++ * @param regexps the regular expressions to allow type names ++ * @since upcoming ++ */ ++ public void allowTypesByRegExp(Pattern... regexps) { ++ addPermission(new RegExpTypePermission(regexps)); ++ } ++ ++ /** ++ * Add security permission for types matching one of the specified wildcard patterns. ++ *

++ * Supported are patterns with path expressions using dot as separator: ++ *

++ *
    ++ *
  • ?: one non-control character except separator, e.g. for 'java.net.Inet?Address'
    • ++ *
  • *: arbitrary number of non-control characters except separator, e.g. for types in a package like 'java.lang.*'
    • ++ *
  • **: arbitrary number of non-control characters including separator, e.g. for types in a package and subpackages like 'java.lang.**'
    • ++ *
++ * ++ * @param patterns the patterns to allow type names ++ * @since upcoming ++ */ ++ public void allowTypesByWildcard(String... patterns) { ++ addPermission(new WildcardTypePermission(patterns)); ++ } ++ ++ /** ++ * Add security permission denying another one. ++ * ++ * @param permission the permission to deny ++ * @since upcoming ++ */ ++ public void denyPermission(TypePermission permission) { ++ addPermission(new NoPermission(permission)); ++ } ++ ++ /** ++ * Add security permission forbidding explicit types by name. ++ * ++ * @param names the type names to forbid ++ * @since upcoming ++ */ ++ public void denyTypes(String... names) { ++ denyPermission(new ExplicitTypePermission(names)); ++ } ++ ++ /** ++ * Add security permission forbidding types matching one of the specified regular expressions. ++ * ++ * @param regexps the regular expressions to forbid type names ++ * @since upcoming ++ */ ++ public void denyTypesByRegExp(String... regexps) { ++ denyPermission(new RegExpTypePermission(regexps)); ++ } ++ ++ /** ++ * Add security permission forbidding types matching one of the specified regular expressions. ++ * ++ * @param regexps the regular expressions to forbid type names ++ * @since upcoming ++ */ ++ public void denyTypesByRegExp(Pattern... regexps) { ++ denyPermission(new RegExpTypePermission(regexps)); ++ } ++ ++ /** ++ * Add security permission forbidding types matching one of the specified wildcard patterns. ++ *

++ * Supported are patterns with path expressions using dot as separator: ++ *

++ *
    ++ *
  • ?: one non-control character except separator, e.g. for 'java.net.Inet?Address'
    • ++ *
  • *: arbitrary number of non-control characters except separator, e.g. for types in a package like 'java.lang.*'
    • ++ *
  • **: arbitrary number of non-control characters including separator, e.g. for types in a package and subpackages like 'java.lang.**'
    • ++ *
++ * ++ * @param patterns the patterns to forbid names ++ * @since upcoming ++ */ ++ public void denyTypesByWildcard(String... patterns) { ++ denyPermission(new WildcardTypePermission(patterns)); ++ } + } +diff --git a/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java b/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java +index f6e988e..e0f5fbf 100644 +--- a/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java ++++ b/xstream/src/java/com/thoughtworks/xstream/core/util/Primitives.java +@@ -48,4 +48,8 @@ public final class Primitives { + static public Class unbox(final Class type) { + return (Class)UNBOX.get(type); + } ++ ++ static public boolean isBoxed(final Class type) { ++ return UNBOX.keySet().contains(type); ++ } + } +diff --git a/xstream/src/java/com/thoughtworks/xstream/mapper/CachingMapper.java b/xstream/src/java/com/thoughtworks/xstream/mapper/CachingMapper.java +index 7e865c7..a90c194 100644 +--- a/xstream/src/java/com/thoughtworks/xstream/mapper/CachingMapper.java ++++ b/xstream/src/java/com/thoughtworks/xstream/mapper/CachingMapper.java +@@ -1,6 +1,6 @@ + /* + * Copyright (C) 2005 Joe Walnes. +- * Copyright (C) 2006, 2007, 2008 XStream Committers. ++ * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2013, 2014 XStream Committers. + * All rights reserved. + * + * The software in this package is published under the terms of the BSD +@@ -18,6 +18,9 @@ import java.util.Collections; + import java.util.HashMap; + import java.util.Map; + ++import com.thoughtworks.xstream.XStreamException; ++import com.thoughtworks.xstream.security.ForbiddenClassException; ++ + /** + * Mapper that caches which names map to which classes. Prevents repetitive searching and class loading. + * +@@ -43,15 +46,26 @@ public class CachingMapper extends MapperWrapper { + public Class realClass(String elementName) { + WeakReference reference = (WeakReference) realClassCache.get(elementName); + if (reference != null) { +- Class cached = (Class) reference.get(); ++ Object cached = reference.get(); + if (cached != null) { +- return cached; ++ if (cached instanceof Class) { ++ return (Class)cached; ++ } ++ throw (XStreamException)cached; + } + } +- +- Class result = super.realClass(elementName); +- realClassCache.put(elementName, new WeakReference(result)); +- return result; ++ ++ try { ++ Class result = super.realClass(elementName); ++ realClassCache.put(elementName, result); ++ return result; ++ } catch (ForbiddenClassException e) { ++ realClassCache.put(elementName, e); ++ throw e; ++ } catch (CannotResolveClassException e) { ++ realClassCache.put(elementName, e); ++ throw e; ++ } + } + + private Object readResolve() { +diff --git a/xstream/src/java/com/thoughtworks/xstream/mapper/SecurityMapper.java b/xstream/src/java/com/thoughtworks/xstream/mapper/SecurityMapper.java +new file mode 100644 +index 0000000..151bb91 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/mapper/SecurityMapper.java +@@ -0,0 +1,75 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 08. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.mapper; ++ ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.List; ++ ++import com.thoughtworks.xstream.security.AnyTypePermission; ++import com.thoughtworks.xstream.security.ForbiddenClassException; ++import com.thoughtworks.xstream.security.NoTypePermission; ++import com.thoughtworks.xstream.security.TypePermission; ++ ++ ++/** ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class SecurityMapper extends MapperWrapper { ++ ++ private final List permissions; ++ ++ /** ++ * Construct a SecurityMapper. ++ * ++ * @param wrapped the mapper chain ++ * @since upcoming ++ */ ++ public SecurityMapper(final Mapper wrapped) { ++ this(wrapped, (TypePermission[])null); ++ } ++ ++ /** ++ * Construct a SecurityMapper. ++ * ++ * @param wrapped the mapper chain ++ * @param permissions the predefined permissions ++ * @since upcoming ++ */ ++ public SecurityMapper(final Mapper wrapped, final TypePermission... permissions) { ++ super(wrapped); ++ this.permissions = permissions == null // ++ ? new ArrayList() ++ : new ArrayList(Arrays.asList(permissions)); ++ } ++ ++ /** ++ * Add a new permission. ++ *

++ * Permissions are evaluated in the added sequence. An instance of {@link NoTypePermission} or ++ * {@link AnyTypePermission} will implicitly wipe any existing permission. ++ *

++ * ++ * @param permission the permission to add. ++ * @since upcoming ++ */ ++ public void addPermission(final TypePermission permission) { ++ if (permission.equals(NoTypePermission.NONE) || permission.equals(AnyTypePermission.ANY)) ++ permissions.clear(); ++ permissions.add(permission); ++ } ++ ++ @Override ++ public Class realClass(final String elementName) { ++ final Class type = super.realClass(elementName); ++ for (final TypePermission permission : permissions) ++ if (permission.allows(type)) ++ return type; ++ throw new ForbiddenClassException(type); ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/AnyTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/AnyTypePermission.java +new file mode 100644 +index 0000000..a5ac1b6 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/AnyTypePermission.java +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 08. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * Permission for any type and null. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class AnyTypePermission implements TypePermission { ++ /** ++ * @since upcoming ++ */ ++ public static final TypePermission ANY = new AnyTypePermission(); ++ ++ @Override ++ public boolean allows(Class type) { ++ return true; ++ } ++ ++ @Override ++ public int hashCode() { ++ return 3; ++ } ++ ++ @Override ++ public boolean equals(Object obj) { ++ return obj != null && obj.getClass() == AnyTypePermission.class; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/ArrayTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/ArrayTypePermission.java +new file mode 100644 +index 0000000..0b425ef +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/ArrayTypePermission.java +@@ -0,0 +1,35 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * Permission for any array type. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class ArrayTypePermission implements TypePermission { ++ /** ++ * @since upcoming ++ */ ++ public static final TypePermission ARRAYS = new ArrayTypePermission(); ++ ++ @Override ++ public boolean allows(Class type) { ++ return type != null && type.isArray(); ++ } ++ ++ @Override ++ public int hashCode() { ++ return 13; ++ } ++ ++ @Override ++ public boolean equals(Object obj) { ++ return obj != null && obj.getClass() == ArrayTypePermission.class; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/ExplicitTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/ExplicitTypePermission.java +new file mode 100644 +index 0000000..4294d72 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/ExplicitTypePermission.java +@@ -0,0 +1,38 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++import java.util.Arrays; ++import java.util.Collections; ++import java.util.HashSet; ++import java.util.Set; ++ ++/** ++ * Explicit permission for a type with a name matching one in the provided list. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class ExplicitTypePermission implements TypePermission { ++ ++ final Set names; ++ ++ /** ++ * @since upcoming ++ */ ++ public ExplicitTypePermission(String...names) { ++ this.names = names == null ? Collections.emptySet() : new HashSet(Arrays.asList(names)); ++ } ++ ++ @Override ++ public boolean allows(Class type) { ++ if (type == null) ++ return false; ++ return names.contains(type.getName()); ++ } ++ ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/ForbiddenClassException.java b/xstream/src/java/com/thoughtworks/xstream/security/ForbiddenClassException.java +new file mode 100644 +index 0000000..041e47a +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/ForbiddenClassException.java +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 08. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++import com.thoughtworks.xstream.XStreamException; ++ ++/** ++ * Exception thrown for a forbidden class. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class ForbiddenClassException extends XStreamException { ++ ++ /** ++ * Construct a ForbiddenClassException. ++ * @param type the forbidden class ++ * @since upcoming ++ */ ++ public ForbiddenClassException(Class type) { ++ super(type == null ? "null" : type.getName()); ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/NoPermission.java b/xstream/src/java/com/thoughtworks/xstream/security/NoPermission.java +new file mode 100644 +index 0000000..4845112 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/NoPermission.java +@@ -0,0 +1,40 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * Wrapper to negate another type permission. ++ *

++ * If the wrapped {@link TypePermission} allows the type, this instance will throw a {@link ForbiddenClassException} ++ * instead. An instance of this permission cannot be used to allow a type. ++ *

++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class NoPermission implements TypePermission { ++ ++ private final TypePermission permission; ++ ++ /** ++ * Construct a NoPermission. ++ * ++ * @param permission the permission to negate or null to forbid any type ++ * @since upcoming ++ */ ++ public NoPermission(final TypePermission permission) { ++ this.permission = permission; ++ } ++ ++ @Override ++ public boolean allows(final Class type) { ++ if (permission == null || permission.allows(type)) { ++ throw new ForbiddenClassException(type); ++ } ++ return false; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/NoTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/NoTypePermission.java +new file mode 100644 +index 0000000..bfaa7e7 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/NoTypePermission.java +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 08. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * No permission for any type. ++ *

++ * Can be used to skip any existing default permission. ++ *

++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class NoTypePermission implements TypePermission { ++ ++ /** ++ * @since upcoming ++ */ ++ public static final TypePermission NONE = new NoTypePermission(); ++ ++ @Override ++ public boolean allows(Class type) { ++ throw new ForbiddenClassException(type); ++ } ++ ++ @Override ++ public int hashCode() { ++ return 1; ++ } ++ ++ @Override ++ public boolean equals(Object obj) { ++ return obj != null && obj.getClass() == NoTypePermission.class; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/NullPermission.java b/xstream/src/java/com/thoughtworks/xstream/security/NullPermission.java +new file mode 100644 +index 0000000..a1b0372 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/NullPermission.java +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++import com.thoughtworks.xstream.mapper.Mapper; ++ ++/** ++ * Permission for null or XStream's null replacement type. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class NullPermission implements TypePermission { ++ /** ++ * @since upcoming ++ */ ++ public static final TypePermission NULL = new NullPermission(); ++ ++ @Override ++ public boolean allows(Class type) { ++ return type == null || type == Mapper.Null.class; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java +new file mode 100644 +index 0000000..58257c2 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java +@@ -0,0 +1,37 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++import com.thoughtworks.xstream.core.util.Primitives; ++ ++/** ++ * Permission for any primitive type and its boxed counterpart. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class PrimitiveTypePermission implements TypePermission { ++ /** ++ * @since upcoming ++ */ ++ public static final TypePermission PRIMITIVES = new PrimitiveTypePermission(); ++ ++ @Override ++ public boolean allows(Class type) { ++ return type != null && type.isPrimitive() || Primitives.isBoxed(type); ++ } ++ ++ @Override ++ public int hashCode() { ++ return 7; ++ } ++ ++ @Override ++ public boolean equals(Object obj) { ++ return obj != null && obj.getClass() == PrimitiveTypePermission.class; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/RegExpTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/RegExpTypePermission.java +new file mode 100644 +index 0000000..d5c8b57 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/RegExpTypePermission.java +@@ -0,0 +1,49 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++import java.util.regex.Pattern; ++ ++ ++/** ++ * Permission for any type with a name matching one of the provided regular expressions. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class RegExpTypePermission implements TypePermission { ++ ++ private final Pattern[] patterns; ++ ++ public RegExpTypePermission(final String... patterns) { ++ this(getPatterns(patterns)); ++ } ++ ++ public RegExpTypePermission(final Pattern... patterns) { ++ this.patterns = patterns == null ? new Pattern[0] : patterns; ++ } ++ ++ @Override ++ public boolean allows(final Class type) { ++ if (type != null) { ++ final String name = type.getName(); ++ for (final Pattern pattern : patterns) ++ if (pattern.matcher(name).matches()) ++ return true; ++ } ++ return false; ++ } ++ ++ private static Pattern[] getPatterns(final String... patterns) { ++ if (patterns == null) ++ return null; ++ final Pattern[] array = new Pattern[patterns.length]; ++ for (int i = 0; i < array.length; ++i) ++ array[i] = Pattern.compile(patterns[i]); ++ return array; ++ } ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/TypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/TypePermission.java +new file mode 100644 +index 0000000..7246c22 +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/TypePermission.java +@@ -0,0 +1,25 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 08. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * Definition of a type permission. ++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public interface TypePermission { ++ /** ++ * Check permission for a provided type. ++ * ++ * @param type the type to check ++ * @return true if provided type is allowed, false if permission does not handle the type ++ * @throws ForbiddenClassException if provided type is explicitly forbidden ++ * @since upcoming ++ */ ++ boolean allows(Class type); ++} +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/WildcardTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/WildcardTypePermission.java +new file mode 100644 +index 0000000..ffa93de +--- /dev/null ++++ b/xstream/src/java/com/thoughtworks/xstream/security/WildcardTypePermission.java +@@ -0,0 +1,84 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.security; ++ ++/** ++ * Permission for any type with a name matching one of the provided wildcard expressions. ++ * ++ *

++ * Supported are patterns with path expressions using dot as separator: ++ *

++ *
    ++ *
  • ?: one non-control character except separator, e.g. for 'java.net.Inet?Address'
    • ++ *
  • *: arbitrary number of non-control characters except separator, e.g. for types in a package like 'java.lang.*'
    • ++ *
  • **: arbitrary number of non-control characters including separator, e.g. for types in a package and subpackages like 'java.lang.**'
    • ++ *
++ *

++ * The complete range of UTF-8 characters is supported except control characters. ++ *

++ * ++ * @author Jörg Schaible ++ * @since upcoming ++ */ ++public class WildcardTypePermission extends RegExpTypePermission { ++ ++ /** ++ * @since upcoming ++ */ ++ public WildcardTypePermission(final String... patterns) { ++ super(getRegExpPatterns(patterns)); ++ } ++ ++ private static String[] getRegExpPatterns(final String... wildcards) { ++ if (wildcards == null) ++ return null; ++ final String[] regexps = new String[wildcards.length]; ++ for (int i = 0; i < wildcards.length; ++i) { ++ final String wildcardExpression = wildcards[i]; ++ final StringBuilder result = new StringBuilder(wildcardExpression.length() * 2); ++ result.append("(?u)"); ++ final int length = wildcardExpression.length(); ++ for (int j = 0; j < length; j++) { ++ final char ch = wildcardExpression.charAt(j); ++ switch (ch) { ++ case '\\': ++ case '.': ++ case '+': ++ case '|': ++ case '[': ++ case ']': ++ case '(': ++ case ')': ++ case '^': ++ case '$': ++ result.append('\\').append(ch); ++ break; ++ ++ case '?': ++ result.append('.'); ++ break; ++ ++ case '*': ++ // see "General Category Property" in http://www.unicode.org/reports/tr18/ ++ if (j + 1 < length && wildcardExpression.charAt(j + 1) == '*') { ++ result.append("[\\P{C}]*"); ++ j++; ++ } else { ++ result.append("[\\P{C}&&[^").append('.').append("]]*"); ++ } ++ break; ++ ++ default: ++ result.append(ch); ++ break; ++ } ++ } ++ regexps[i] = result.toString(); ++ } ++ return regexps; ++ } ++} +diff --git a/xstream/src/test/com/thoughtworks/xstream/mapper/SecurityMapperTest.java b/xstream/src/test/com/thoughtworks/xstream/mapper/SecurityMapperTest.java +new file mode 100644 +index 0000000..ebde756 +--- /dev/null ++++ b/xstream/src/test/com/thoughtworks/xstream/mapper/SecurityMapperTest.java +@@ -0,0 +1,207 @@ ++/* ++ * Copyright (C) 2014 XStream Committers. ++ * All rights reserved. ++ * ++ * Created on 09. January 2014 by Joerg Schaible ++ */ ++package com.thoughtworks.xstream.mapper; ++ ++import java.net.URL; ++import java.util.HashMap; ++import java.util.List; ++import java.util.Map; ++ ++import com.thoughtworks.xstream.core.JVM; ++import com.thoughtworks.xstream.core.util.QuickWriter; ++import com.thoughtworks.xstream.security.AnyTypePermission; ++import com.thoughtworks.xstream.security.ArrayTypePermission; ++import com.thoughtworks.xstream.security.ExplicitTypePermission; ++import com.thoughtworks.xstream.security.ForbiddenClassException; ++import com.thoughtworks.xstream.security.NoTypePermission; ++import com.thoughtworks.xstream.security.NullPermission; ++import com.thoughtworks.xstream.security.PrimitiveTypePermission; ++import com.thoughtworks.xstream.security.RegExpTypePermission; ++import com.thoughtworks.xstream.security.TypePermission; ++import com.thoughtworks.xstream.security.WildcardTypePermission; ++ ++import junit.framework.TestCase; ++ ++ ++/** ++ * Tests the {@link SecurityMapper} and the {@link TypePermission} implementations. ++ * ++ * @author Jörg Schaible ++ */ ++public class SecurityMapperTest extends TestCase { ++ ++ private SecurityMapper mapper; ++ private Map> classMap; ++ ++ @Override ++ protected void setUp() throws Exception { ++ super.setUp(); ++ ++ classMap = new HashMap>(); ++ mapper = new SecurityMapper(new MapperWrapper(null) { ++ @Override ++ public Class realClass(final String elementName) { ++ return classMap.get(elementName); ++ } ++ }); ++ } ++ ++ private void register(final Class... types) { ++ for (final Class type : types) { ++ classMap.put(type.getName(), type); ++ } ++ } ++ ++ public void testAnyType() { ++ register(String.class, URL.class, List.class); ++ mapper.addPermission(NoTypePermission.NONE); ++ mapper.addPermission(AnyTypePermission.ANY); ++ assertSame(String.class, mapper.realClass(String.class.getName())); ++ assertSame(List.class, mapper.realClass(List.class.getName())); ++ assertNull(mapper.realClass(null)); ++ } ++ ++ public void testNoType() { ++ register(String.class, URL.class, List.class); ++ mapper.addPermission(NoTypePermission.NONE); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ try { ++ mapper.realClass(null); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals("null", e.getMessage()); ++ } ++ } ++ ++ public void testNullType() { ++ register(String.class, Mapper.Null.class); ++ mapper.addPermission(NullPermission.NULL); ++ assertSame(Mapper.Null.class, mapper.realClass(Mapper.Null.class.getName())); ++ assertNull(mapper.realClass(null)); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ } ++ ++ public void testPrimitiveTypes() { ++ register(String.class, int.class, Integer.class, char[].class, Character[].class); ++ mapper.addPermission(PrimitiveTypePermission.PRIMITIVES); ++ assertSame(int.class, mapper.realClass(int.class.getName())); ++ assertSame(Integer.class, mapper.realClass(Integer.class.getName())); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ try { ++ mapper.realClass(null); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals("null", e.getMessage()); ++ } ++ try { ++ mapper.realClass(char[].class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(char[].class.getName(), e.getMessage()); ++ } ++ } ++ ++ public void testArrayTypes() { ++ register(String.class, int.class, Integer.class, char[].class, Character[].class); ++ mapper.addPermission(ArrayTypePermission.ARRAYS); ++ assertSame(char[].class, mapper.realClass(char[].class.getName())); ++ assertSame(Character[].class, mapper.realClass(Character[].class.getName())); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ try { ++ mapper.realClass(null); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals("null", e.getMessage()); ++ } ++ try { ++ mapper.realClass(int.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(int.class.getName(), e.getMessage()); ++ } ++ } ++ ++ public void testExplicitTypes() { ++ register(String.class, List.class); ++ mapper.addPermission(new ExplicitTypePermission(String.class.getName(), List.class.getName())); ++ assertSame(String.class, mapper.realClass(String.class.getName())); ++ assertSame(List.class, mapper.realClass(List.class.getName())); ++ try { ++ mapper.realClass(null); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals("null", e.getMessage()); ++ } ++ } ++ ++ public void testNamesWithRegExps() { ++ class Foo$_0 {} ++ final Class anonymous = new Object() {}.getClass(); ++ register(String.class, JVM.class, QuickWriter.class, Foo$_0.class, anonymous, DefaultClassMapperTest.class); ++ mapper.addPermission(new RegExpTypePermission(".*Test", ".*\\.core\\..*", ".*SecurityMapperTest\\$.+")); ++ assertSame(DefaultClassMapperTest.class, mapper.realClass(DefaultClassMapperTest.class.getName())); ++ assertSame(JVM.class, mapper.realClass(JVM.class.getName())); ++ assertSame(QuickWriter.class, mapper.realClass(QuickWriter.class.getName())); ++ assertSame(Foo$_0.class, mapper.realClass(Foo$_0.class.getName())); ++ assertSame(anonymous, mapper.realClass(anonymous.getName())); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ } ++ ++ public void testNamesWithWildcardPatterns() { ++ class Foo$_0 {} ++ class Foo$_1 {} ++ final Class anonymous = new Object() {}.getClass(); ++ register(String.class, JVM.class, QuickWriter.class, Foo$_0.class, Foo$_1.class, anonymous); ++ mapper.addPermission(new WildcardTypePermission("**.*_0", "**.core.*", "**.SecurityMapperTest$?")); ++ assertSame(JVM.class, mapper.realClass(JVM.class.getName())); ++ assertSame(Foo$_0.class, mapper.realClass(Foo$_0.class.getName())); ++ assertSame(anonymous, mapper.realClass(anonymous.getName())); ++ try { ++ mapper.realClass(String.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(String.class.getName(), e.getMessage()); ++ } ++ try { ++ mapper.realClass(QuickWriter.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(QuickWriter.class.getName(), e.getMessage()); ++ } ++ try { ++ mapper.realClass(Foo$_1.class.getName()); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ assertEquals(Foo$_1.class.getName(), e.getMessage()); ++ } ++ } ++} +-- +1.8.4.2 + diff --git a/xstream.spec b/xstream.spec index 548ca3a..975720c 100644 --- a/xstream.spec +++ b/xstream.spec @@ -36,7 +36,7 @@ Name: xstream Version: 1.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML serialization library Group: Development/Libraries @@ -44,6 +44,9 @@ License: BSD URL: http://xstream.codehaus.org/ Source0: http://repository.codehaus.org/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip +# Backported from upstream revision 2210 +Patch0: %{name}-CVE-2013-7285.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: jpackage-utils >= 0:1.7.2 @@ -105,6 +108,7 @@ Requires: jpackage-utils %prep %setup -qn %{name}-%{version} +%patch0 -p1 find . -name "*.jar" -delete %if %with test @@ -195,6 +199,10 @@ dummy = posix.readlink(dir) and os.remove(dir) %changelog +* Tue Feb 11 2014 Mikolaj Izdebski - 1.3.1-9 +- Apply upstream security patch +- Resolves: CVE-2013-7285 + * Sun Aug 04 2013 Fedora Release Engineering - 1.3.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From e6e2eee776569f3f0806111fb7ad0c8b24316ba2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 19 Feb 2014 07:20:38 +0100 Subject: [PATCH 08/68] Spec file cleanup Fix BR Build with kxml2 and json There are no known licensing issues with org.json:json --- xstream.spec | 102 ++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 62 deletions(-) diff --git a/xstream.spec b/xstream.spec index 7bf26e4..0ae2d92 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,58 +30,44 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Tests are disabled by default since we don't have -# all the requirements in Fedora yet -%bcond_with test - Name: xstream Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ Source0: https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip BuildRequires: java-devel -# core deps -BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(dom4j:dom4j) -BuildRequires: mvn(joda-time:joda-time) -BuildRequires: mvn(net.sf.kxml:kxml2) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus:codehaus-parent) -BuildRequires: mvn(org.codehaus.jettison:jettison) -BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.jdom:jdom2) -BuildRequires: mvn(stax:stax) -BuildRequires: mvn(stax:stax-api) -BuildRequires: mvn(xom:xom) -BuildRequires: mvn(xpp3:xpp3) -# hibernate deps -BuildRequires: mvn(javassist:javassist) -BuildRequires: mvn(org.hibernate:hibernate-core) -BuildRequires: mvn(org.hibernate:hibernate-envers) -BuildRequires: mvn(org.slf4j:slf4j-simple) -%if %with test -# Not available -BuildRequires: mvn(com.megginson.sax:xml-writer) -BuildRequires: mvn(commons-cli:commons-cli) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) -# Not available -BuildRequires: mvn(jmock:jmock) -BuildRequires: mvn(junit:junit) -# Non provides pom file -BuildRequires: mvn(net.sf.kxml:kxml2-min) -# Non free -BuildRequires: mvn(org.json:json) -BuildRequires: mvn(org.hsqldb:hsqldb) -BuildRequires: mvn(oro:oro) -# Not available -BuildRequires: mvn(proxytoys:proxytoys) -%endif +BuildRequires: maven-local +BuildRequires: mvn(cglib:cglib) +BuildRequires: mvn(commons-cli:commons-cli) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(commons-lang:commons-lang) +BuildRequires: mvn(dom4j:dom4j) +BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(joda-time:joda-time) +BuildRequires: mvn(net.sf.kxml:kxml2) +BuildRequires: mvn(net.sf.kxml:kxml2-min) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus:codehaus-parent) +BuildRequires: mvn(org.codehaus.jettison:jettison) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +BuildRequires: mvn(org.hibernate:hibernate-core) +BuildRequires: mvn(org.hibernate:hibernate-envers) +BuildRequires: mvn(org.hsqldb:hsqldb) +BuildRequires: mvn(org.jdom:jdom) +BuildRequires: mvn(org.jdom:jdom2) +BuildRequires: mvn(org.json:json) +BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildRequires: mvn(oro:oro) +BuildRequires: mvn(stax:stax) +BuildRequires: mvn(stax:stax-api) +BuildRequires: mvn(xom:xom) +BuildRequires: mvn(xpp3:xpp3_min) -BuildRequires: maven-local BuildArch: noarch @@ -130,17 +116,8 @@ find . -name "*.jar" -print -delete %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream -# use xpp3 instead of xpp3_min, requires xmlpull classes -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'xpp3' ]/pom:artifactId" xpp3 xstream -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream -# Remove no pom file available -%pom_remove_dep :kxml2-min xstream # Remove xmlpull classes provides by xpp3 %pom_remove_dep :xmlpull xstream -# Unavailable test deps -%pom_remove_dep jmock:jmock xstream -# Remove non free -%pom_remove_dep org.json:json xstream # Require unavailable proxytoys:proxytoys %pom_remove_plugin :maven-dependency-plugin xstream @@ -154,33 +131,34 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -%build - %mvn_file :%{name} %{name}/%{name} %{name} %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark -# test skipped for unavailable test deps -%if %with test -%mvn_build -%else + +%build +# test skipped for unavailable test deps (com.megginson.sax:xml-writer) %mvn_build -f -%endif %install %mvn_install -%files -f .mfiles -%doc LICENSE.txt README.txt - # Workaround for RPM bug #646523 - can't change symlink to directory # TODO: Remove this in F-22 %pretrans javadoc -p dir = "%{_javadocdir}/%{name}" dummy = posix.readlink(dir) and os.remove(dir) +%files -f .mfiles +%doc LICENSE.txt README.txt + %files javadoc -f .mfiles-javadoc %doc LICENSE.txt %changelog +* 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 From 142ab33dc3d2c6b29205bfacdbc20ce0f4f16416 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:04:58 +0100 Subject: [PATCH 09/68] Use Requires: java-headless rebuild (#1067528) --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 0ae2d92..21fe702 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -154,6 +154,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From fc8b71ba9c11d0a494d58efeadb664be88e542d1 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 25 Feb 2014 15:36:17 +0100 Subject: [PATCH 10/68] Split into subpackages --- xstream.spec | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index 21fe702..b7b75ea 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -98,6 +98,27 @@ Summary: Javadoc for %{name} %description javadoc %{name} API documentation. +%package hibernate +Summary: hibernate module for %{name} +Requires: %{name} = %{version}-%{release} + +%description hibernate +hibernate module for %{name}. + +%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} @@ -134,9 +155,11 @@ find . -name "*.jar" -print -delete %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 +%mvn_build -f -s %install %mvn_install @@ -149,11 +172,18 @@ dummy = posix.readlink(dir) and os.remove(dir) %files -f .mfiles %doc LICENSE.txt README.txt +%dir %{_javadir}/%{name} +%files parent -f .mfiles-%{name}-parent +%files hibernate -f .mfiles-%{name}-hibernate +%files benchmark -f .mfiles-%{name}-benchmark %files javadoc -f .mfiles-javadoc %doc LICENSE.txt %changelog +* 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) From d1af6b56e4be6c97156e324f03365fb224386c30 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:55:00 -0500 Subject: [PATCH 11/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index b7b75ea..b55b57a 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From c5293629d44b0bfaf3f927e97e675ffbdbb2aeb8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Aug 2014 07:14:07 +0200 Subject: [PATCH 12/68] Fix build-requires on codehaus-parent --- xstream.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index b55b57a..22c1eba 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -51,7 +51,7 @@ BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2-min) BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus:codehaus-parent) +BuildRequires: mvn(org.codehaus:codehaus-parent:pom:) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) @@ -181,6 +181,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From caca0b353ab99eb038d1961676e06e0f9ee005d0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Oct 2014 14:35:59 +0200 Subject: [PATCH 13/68] Fix dependencies in parent POM --- xstream.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xstream.spec b/xstream.spec index 22c1eba..f71502c 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -135,8 +135,10 @@ find . -name "*.jar" -print -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-dependency-plugin -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox' ]/pom:artifactId" woodstox-core-asl xstream -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'cglib' ]/pom:artifactId" cglib xstream +%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 # Remove xmlpull classes provides by xpp3 %pom_remove_dep :xmlpull xstream # Require unavailable proxytoys:proxytoys @@ -181,6 +183,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 5c4cf89894357af65d4af24ed3983c0740e3d9c5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Nov 2014 07:31:36 +0100 Subject: [PATCH 14/68] Remove workaround for RPM bug #646523 --- xstream.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/xstream.spec b/xstream.spec index f71502c..cd62a4f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -166,12 +166,6 @@ find . -name "*.jar" -print -delete %install %mvn_install -# Workaround for RPM bug #646523 - can't change symlink to directory -# TODO: Remove this in F-22 -%pretrans javadoc -p -dir = "%{_javadocdir}/%{name}" -dummy = posix.readlink(dir) and os.remove(dir) - %files -f .mfiles %doc LICENSE.txt README.txt %dir %{_javadir}/%{name} @@ -183,6 +177,9 @@ dummy = posix.readlink(dir) and os.remove(dir) %doc LICENSE.txt %changelog +* 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 From 403093cff8d65e76347ca806e331b973aac1f524 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 10 Nov 2014 12:53:10 +0100 Subject: [PATCH 15/68] Change org.json:json dependency scope to test --- xstream.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index cd62a4f..d2d2022 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -154,6 +154,9 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark +# test-only dependency without test scope (reported as XSTR-763) +%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'json' ]" "test" xstream + %mvn_file :%{name} %{name}/%{name} %{name} %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark @@ -177,6 +180,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 44bab17d74ab04bf69474e9de290c9c756b253da Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Thu, 19 Feb 2015 09:57:01 +0100 Subject: [PATCH 16/68] Update to upstream version 1.4.8 --- .gitignore | 1 + sources | 2 +- xstream.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3f750d1..e8e5b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xstream-distribution-1.3.1-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 diff --git a/sources b/sources index ff6ef26..12325ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c166fb1ea4ab5c0a1857781064abf79 xstream-distribution-1.4.7-src.zip +94b452e5b45812b9994d304b532e2dc9 xstream-distribution-1.4.8-src.zip diff --git a/xstream.spec b/xstream.spec index d2d2022..3ef57b1 100644 --- a/xstream.spec +++ b/xstream.spec @@ -31,8 +31,8 @@ # Name: xstream -Version: 1.4.7 -Release: 9%{?dist} +Version: 1.4.8 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -154,9 +154,6 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -# test-only dependency without test scope (reported as XSTR-763) -%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'json' ]" "test" xstream - %mvn_file :%{name} %{name}/%{name} %{name} %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark @@ -180,6 +177,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From b38e5acb0fd36816f9df5c317fd46669821f8deb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:29:06 +0000 Subject: [PATCH 17/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 3ef57b1..a0d142d 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -177,6 +177,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 543432268421b77b5eddb4a1d5c13a50d938be4b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 19 Jan 2016 11:35:15 +0100 Subject: [PATCH 18/68] Fix dependency on xpp3 --- xstream.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xstream.spec b/xstream.spec index a0d142d..d89f3f9 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -139,8 +139,8 @@ find . -name "*.jar" -print -delete %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 -# Remove xmlpull classes provides by xpp3 -%pom_remove_dep :xmlpull 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 @@ -177,6 +177,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 3043f4d2d13bf52a8022ee3d4223c9531f9ae280 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:51:32 +0000 Subject: [PATCH 19/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index d89f3f9..c9d4807 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -177,6 +177,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 3074ddf3efeab7998d47fb7c535a8bc0cbbd6366 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 30 Mar 2016 14:18:40 +0200 Subject: [PATCH 20/68] Update to 1.4.9 - Resolves: CVE-2016-3674 --- .gitignore | 1 + sources | 1 + xstream.spec | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8e5b0d..7453b23 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xstream-distribution-1.3.1-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 diff --git a/sources b/sources index 12325ac..60eac12 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 94b452e5b45812b9994d304b532e2dc9 xstream-distribution-1.4.8-src.zip +834424a0bbe68791ec5b71489011081e xstream-distribution-1.4.9-src.zip diff --git a/xstream.spec b/xstream.spec index c9d4807..7024833 100644 --- a/xstream.spec +++ b/xstream.spec @@ -31,12 +31,12 @@ # Name: xstream -Version: 1.4.8 -Release: 4%{?dist} +Version: 1.4.9 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ -Source0: https://nexus.codehaus.org/content/repositories/releases/com/thoughtworks/xstream/xstream-distribution/%{version}/xstream-distribution-%{version}-src.zip +Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip BuildRequires: java-devel BuildRequires: maven-local @@ -129,6 +129,12 @@ find . -name "*.jar" -print -delete %pom_xpath_remove "pom:project/pom:build/pom:extensions" # 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 + %pom_remove_plugin :xsite-maven-plugin %pom_remove_plugin :jxr-maven-plugin # Unwanted @@ -146,6 +152,9 @@ find . -name "*.jar" -print -delete %pom_remove_plugin :maven-javadoc-plugin xstream +# provided by JDK +%pom_remove_dep javax.activation:activation 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 @@ -177,6 +186,10 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From eac4e063ebbe4d3dbc4c15b68c2da7d5a1ba9f92 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 15 Jun 2016 12:57:41 +0200 Subject: [PATCH 21/68] Regenerate build-requires --- xstream.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/xstream.spec b/xstream.spec index 7024833..597c6f8 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,45 +32,37 @@ Name: xstream Version: 1.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ +BuildArch: noarch + Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip -BuildRequires: java-devel BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(commons-cli:commons-cli) -BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(dom4j:dom4j) BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2-min) -BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus:codehaus-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) BuildRequires: mvn(org.hibernate:hibernate-core) BuildRequires: mvn(org.hibernate:hibernate-envers) -BuildRequires: mvn(org.hsqldb:hsqldb) BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) -BuildRequires: mvn(org.json:json) BuildRequires: mvn(org.slf4j:slf4j-simple) -BuildRequires: mvn(oro:oro) BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) BuildRequires: mvn(xom:xom) +BuildRequires: mvn(xpp3:xpp3) BuildRequires: mvn(xpp3:xpp3_min) -BuildArch: noarch - %description XStream is a simple library to serialize objects to XML and back again. A high level facade is supplied that @@ -140,6 +132,8 @@ find . -name "*.jar" -print -delete # 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_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 @@ -186,6 +180,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From f1918db87a3074c40187dedd43fd02214a7bfa74 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 18 Jul 2016 17:33:09 +0200 Subject: [PATCH 22/68] Regenerate buildrequires --- xstream.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 597c6f8..9774d7b 100644 --- a/xstream.spec +++ b/xstream.spec @@ -32,7 +32,7 @@ Name: xstream Version: 1.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -48,6 +48,7 @@ BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2-min) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) @@ -180,6 +181,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From c3aa18da59c827d1b13e078b7e31487bbd39affb Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Feb 2017 15:42:47 +0100 Subject: [PATCH 23/68] Add conditional for hibernate --- xstream.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 9774d7b..d881b77 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,9 +30,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +%bcond_without hibernate + Name: xstream Version: 1.4.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: http://xstream.codehaus.org/ @@ -52,8 +54,10 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) +%if %{with hibernate} BuildRequires: mvn(org.hibernate:hibernate-core) BuildRequires: mvn(org.hibernate:hibernate-envers) +%endif BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.slf4j:slf4j-simple) @@ -91,12 +95,14 @@ 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} @@ -158,6 +164,10 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark +%if %{without hibernate} +%pom_disable_module xstream-hibernate +%endif + %mvn_file :%{name} %{name}/%{name} %{name} %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark @@ -174,13 +184,18 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt README.txt %dir %{_javadir}/%{name} %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 %doc LICENSE.txt %changelog +* 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 From 16dc9e606c91553631c9144e508ecb8c066ac3c4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 12 Apr 2017 12:05:18 +0200 Subject: [PATCH 24/68] Backport fix for void deserialization - Resolves rhbz#1441542 - Update upstream URL --- 0001-Prevent-deserialization-of-void.patch | 123 +++++++++++++++++++++ xstream.spec | 16 ++- 2 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 0001-Prevent-deserialization-of-void.patch diff --git a/0001-Prevent-deserialization-of-void.patch b/0001-Prevent-deserialization-of-void.patch new file mode 100644 index 0000000..6bb9965 --- /dev/null +++ b/0001-Prevent-deserialization-of-void.patch @@ -0,0 +1,123 @@ +From 376175c482a4914c8d288cf663f978dfb5e55849 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 12 Apr 2017 12:19:21 +0200 +Subject: [PATCH] Prevent deserialization of void + +--- + .../SunLimitedUnsafeReflectionProvider.java | 22 ++++++++++++-------- + .../xstream/security/PrimitiveTypePermission.java | 5 +++-- + .../acceptance/SecurityVulnerabilityTest.java | 24 +++++++++++++++++++++- + 3 files changed, 39 insertions(+), 12 deletions(-) + +diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java +index 2c569ae..491f0d6 100644 +--- a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java ++++ b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java +@@ -1,6 +1,6 @@ + /* + * Copyright (C) 2004, 2005 Joe Walnes. +- * Copyright (C) 2006, 2007, 2008, 2011, 2013, 2014, 2016 XStream Committers. ++ * Copyright (C) 2006, 2007, 2008, 2011, 2013, 2014, 2016, 2017 XStream Committers. + * All rights reserved. + * + * Created on 08. January 2014 by Joerg Schaible, factored out from SunUnsafeReflectionProvider +@@ -78,14 +78,18 @@ public class SunLimitedUnsafeReflectionProvider extends PureJavaReflectionProvid + throw ex; + } + ErrorWritingException ex = null; +- try { +- return unsafe.allocateInstance(type); +- } catch (SecurityException e) { +- ex = new ObjectAccessException("Cannot construct type", e); +- } catch (InstantiationException e) { +- ex = new ConversionException("Cannot construct type", e); +- } catch (IllegalArgumentException e) { +- ex = new ObjectAccessException("Cannot construct type", e); ++ if (type == void.class || type == Void.class) { ++ ex = new ConversionException("Type void cannot have an instance"); ++ } else { ++ try { ++ return unsafe.allocateInstance(type); ++ } catch (SecurityException e) { ++ ex = new ObjectAccessException("Cannot construct type", e); ++ } catch (InstantiationException e) { ++ ex = new ConversionException("Cannot construct type", e); ++ } catch (IllegalArgumentException e) { ++ ex = new ObjectAccessException("Cannot construct type", e); ++ } + } + ex.add("construction-type", type.getName()); + throw ex; +diff --git a/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java +index fb69b95..c3cbad9 100644 +--- a/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java ++++ b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2014 XStream Committers. ++ * Copyright (C) 2014, 2017 XStream Committers. + * All rights reserved. + * + * Created on 09. January 2014 by Joerg Schaible +@@ -8,8 +8,9 @@ package com.thoughtworks.xstream.security; + + import com.thoughtworks.xstream.core.util.Primitives; + ++ + /** +- * Permission for any primitive type and its boxed counterpart (incl. void). ++ * Permission for any primitive type and its boxed counterpart (excl. void). + * + * @author Jörg Schaible + * @since 1.4.7 +diff --git a/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java b/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java +index c77b3ce..0180fd7 100644 +--- a/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java ++++ b/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2013, 2014 XStream Committers. ++ * Copyright (C) 2013, 2014, 2017 XStream Committers. + * All rights reserved. + * + * The software in this package is published under the terms of the BSD +@@ -13,9 +13,12 @@ package com.thoughtworks.acceptance; + import java.beans.EventHandler; + + import com.thoughtworks.xstream.XStreamException; ++import com.thoughtworks.xstream.converters.ConversionException; + import com.thoughtworks.xstream.converters.reflection.ReflectionConverter; ++import com.thoughtworks.xstream.security.ForbiddenClassException; + import com.thoughtworks.xstream.security.ProxyTypePermission; + ++ + /** + * @author Jörg Schaible + */ +@@ -80,4 +83,23 @@ public class SecurityVulnerabilityTest extends AbstractAcceptanceTest { + BUFFER.append("Executed!"); + } + } ++ ++ public void testDeniedInstanceOfVoid() { ++ try { ++ xstream.fromXML(""); ++ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); ++ } catch (final ForbiddenClassException e) { ++ // OK ++ } ++ } ++ ++ public void testAllowedInstanceOfVoid() { ++ xstream.allowTypes(void.class, Void.class); ++ try { ++ xstream.fromXML(""); ++ fail("Thrown " + ConversionException.class.getName() + " expected"); ++ } catch (final ConversionException e) { ++ assertEquals("void", e.get("construction-type")); ++ } ++ } + } +-- +2.9.3 + diff --git a/xstream.spec b/xstream.spec index d881b77..2893473 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,14 +34,19 @@ Name: xstream Version: 1.4.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD -URL: http://xstream.codehaus.org/ +URL: http://x-stream.github.io/ BuildArch: noarch Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip +# Fixes deserialization of void +# https://bugzilla.redhat.com/show_bug.cgi?id=1441542 +# backport of https://github.com/x-stream/xstream/commit/b3570be2f39234e61f99f9a20640756ea71b1b40 +Patch0: 0001-Prevent-deserialization-of-void.patch + BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(dom4j:dom4j) @@ -124,6 +129,8 @@ Parent POM for %{name}. find . -name "*.class" -print -delete find . -name "*.jar" -print -delete +%patch0 -p1 + # Remove org.apache.maven.wagon:wagon-webdav %pom_xpath_remove "pom:project/pom:build/pom:extensions" # Require org.codehaus.xsite:xsite-maven-plugin @@ -193,6 +200,11 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 598f3d56921cb0c02ca0f2530f1c197239735e78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:28:35 +0000 Subject: [PATCH 25/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index 2893473..ee5915a 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -200,6 +200,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 80e5369b3698f05d409808ef2661173bce0dfa66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:08:09 +0000 Subject: [PATCH 26/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 ee5915a..89cfb72 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -200,6 +200,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 9bee76b0d6fb21aae4b8a9f84850334c87f53069 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:36:39 +0000 Subject: [PATCH 27/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 89cfb72..6aeebe9 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -200,6 +200,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From adf21f58c03ef19305b402d1178aa404583cb949 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:51:27 +0000 Subject: [PATCH 28/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 6aeebe9..86cb85f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -200,6 +200,9 @@ find . -name "*.jar" -print -delete %doc LICENSE.txt %changelog +* 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 From 9ccd7ef8fa350056afc21299a44ef5a3f89e8b95 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 14 Feb 2019 14:34:12 +0000 Subject: [PATCH 29/68] Update to latest upstream release --- 0001-Prevent-deserialization-of-void.patch | 123 --------------------- xstream.spec | 31 +++--- 2 files changed, 14 insertions(+), 140 deletions(-) delete mode 100644 0001-Prevent-deserialization-of-void.patch diff --git a/0001-Prevent-deserialization-of-void.patch b/0001-Prevent-deserialization-of-void.patch deleted file mode 100644 index 6bb9965..0000000 --- a/0001-Prevent-deserialization-of-void.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 376175c482a4914c8d288cf663f978dfb5e55849 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 12 Apr 2017 12:19:21 +0200 -Subject: [PATCH] Prevent deserialization of void - ---- - .../SunLimitedUnsafeReflectionProvider.java | 22 ++++++++++++-------- - .../xstream/security/PrimitiveTypePermission.java | 5 +++-- - .../acceptance/SecurityVulnerabilityTest.java | 24 +++++++++++++++++++++- - 3 files changed, 39 insertions(+), 12 deletions(-) - -diff --git a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java -index 2c569ae..491f0d6 100644 ---- a/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java -+++ b/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SunLimitedUnsafeReflectionProvider.java -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2004, 2005 Joe Walnes. -- * Copyright (C) 2006, 2007, 2008, 2011, 2013, 2014, 2016 XStream Committers. -+ * Copyright (C) 2006, 2007, 2008, 2011, 2013, 2014, 2016, 2017 XStream Committers. - * All rights reserved. - * - * Created on 08. January 2014 by Joerg Schaible, factored out from SunUnsafeReflectionProvider -@@ -78,14 +78,18 @@ public class SunLimitedUnsafeReflectionProvider extends PureJavaReflectionProvid - throw ex; - } - ErrorWritingException ex = null; -- try { -- return unsafe.allocateInstance(type); -- } catch (SecurityException e) { -- ex = new ObjectAccessException("Cannot construct type", e); -- } catch (InstantiationException e) { -- ex = new ConversionException("Cannot construct type", e); -- } catch (IllegalArgumentException e) { -- ex = new ObjectAccessException("Cannot construct type", e); -+ if (type == void.class || type == Void.class) { -+ ex = new ConversionException("Type void cannot have an instance"); -+ } else { -+ try { -+ return unsafe.allocateInstance(type); -+ } catch (SecurityException e) { -+ ex = new ObjectAccessException("Cannot construct type", e); -+ } catch (InstantiationException e) { -+ ex = new ConversionException("Cannot construct type", e); -+ } catch (IllegalArgumentException e) { -+ ex = new ObjectAccessException("Cannot construct type", e); -+ } - } - ex.add("construction-type", type.getName()); - throw ex; -diff --git a/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java -index fb69b95..c3cbad9 100644 ---- a/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java -+++ b/xstream/src/java/com/thoughtworks/xstream/security/PrimitiveTypePermission.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2014 XStream Committers. -+ * Copyright (C) 2014, 2017 XStream Committers. - * All rights reserved. - * - * Created on 09. January 2014 by Joerg Schaible -@@ -8,8 +8,9 @@ package com.thoughtworks.xstream.security; - - import com.thoughtworks.xstream.core.util.Primitives; - -+ - /** -- * Permission for any primitive type and its boxed counterpart (incl. void). -+ * Permission for any primitive type and its boxed counterpart (excl. void). - * - * @author Jörg Schaible - * @since 1.4.7 -diff --git a/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java b/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java -index c77b3ce..0180fd7 100644 ---- a/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java -+++ b/xstream/src/test/com/thoughtworks/acceptance/SecurityVulnerabilityTest.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2013, 2014 XStream Committers. -+ * Copyright (C) 2013, 2014, 2017 XStream Committers. - * All rights reserved. - * - * The software in this package is published under the terms of the BSD -@@ -13,9 +13,12 @@ package com.thoughtworks.acceptance; - import java.beans.EventHandler; - - import com.thoughtworks.xstream.XStreamException; -+import com.thoughtworks.xstream.converters.ConversionException; - import com.thoughtworks.xstream.converters.reflection.ReflectionConverter; -+import com.thoughtworks.xstream.security.ForbiddenClassException; - import com.thoughtworks.xstream.security.ProxyTypePermission; - -+ - /** - * @author Jörg Schaible - */ -@@ -80,4 +83,23 @@ public class SecurityVulnerabilityTest extends AbstractAcceptanceTest { - BUFFER.append("Executed!"); - } - } -+ -+ public void testDeniedInstanceOfVoid() { -+ try { -+ xstream.fromXML(""); -+ fail("Thrown " + ForbiddenClassException.class.getName() + " expected"); -+ } catch (final ForbiddenClassException e) { -+ // OK -+ } -+ } -+ -+ public void testAllowedInstanceOfVoid() { -+ xstream.allowTypes(void.class, Void.class); -+ try { -+ xstream.fromXML(""); -+ fail("Thrown " + ConversionException.class.getName() + " expected"); -+ } catch (final ConversionException e) { -+ assertEquals("void", e.get("construction-type")); -+ } -+ } - } --- -2.9.3 - diff --git a/xstream.spec b/xstream.spec index 86cb85f..1d81370 100644 --- a/xstream.spec +++ b/xstream.spec @@ -33,8 +33,8 @@ %bcond_without hibernate Name: xstream -Version: 1.4.9 -Release: 9%{?dist} +Version: 1.4.11.1 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -42,15 +42,11 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip -# Fixes deserialization of void -# https://bugzilla.redhat.com/show_bug.cgi?id=1441542 -# backport of https://github.com/x-stream/xstream/commit/b3570be2f39234e61f99f9a20640756ea71b1b40 -Patch0: 0001-Prevent-deserialization-of-void.patch - BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(dom4j:dom4j) BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2-min) @@ -129,10 +125,6 @@ Parent POM for %{name}. find . -name "*.class" -print -delete find . -name "*.jar" -print -delete -%patch0 -p1 - -# Remove org.apache.maven.wagon:wagon-webdav -%pom_xpath_remove "pom:project/pom:build/pom:extensions" # Require org.codehaus.xsite:xsite-maven-plugin %pom_disable_module xstream-distribution @@ -141,13 +133,12 @@ find . -name "*.jar" -print -delete # org.openjdk.jmh:jmh-generator-annprocess:jar:1.11.1 %pom_disable_module xstream-jmh -%pom_remove_plugin :xsite-maven-plugin -%pom_remove_plugin :jxr-maven-plugin # 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 @@ -182,24 +173,30 @@ find . -name "*.jar" -print -delete %build # test skipped for unavailable test deps (com.megginson.sax:xml-writer) -%mvn_build -f -s +%mvn_build -f -s -- -Dversion.java.source=8 %install %mvn_install %files -f .mfiles -%doc LICENSE.txt README.txt -%dir %{_javadir}/%{name} +%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 -%doc LICENSE.txt +%license LICENSE.txt %changelog +* 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 From 8bfd07bb63aec57b2976a122fb7d6e040d54c852 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 14 Feb 2019 14:58:19 +0000 Subject: [PATCH 30/68] Updated source --- .gitignore | 1 + sources | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7453b23..69a5274 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xstream-distribution-1.3.1-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 diff --git a/sources b/sources index 60eac12..833b4c6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -94b452e5b45812b9994d304b532e2dc9 xstream-distribution-1.4.8-src.zip -834424a0bbe68791ec5b71489011081e xstream-distribution-1.4.9-src.zip +SHA512 (xstream-distribution-1.4.11.1-src.zip) = 273c712a57800089f72899b5df65584788d02df3493fb32549066fcebc40decc57c4c10ea05ec387dede328516047bb8a2d62cc64e27ec14156dd361f3959a81 From 2f04a7295519af49a25cdb7bf1e278fe4958d4e7 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Tue, 5 Mar 2019 11:54:44 +0000 Subject: [PATCH 31/68] Allow building with reduced dependency set --- xstream.spec | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/xstream.spec b/xstream.spec index 1d81370..70fcac7 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,11 +30,12 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%bcond_without hibernate +# Allow building with a minimal dependency set +%bcond_with jp_minimal Name: xstream Version: 1.4.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -45,29 +46,29 @@ Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-d BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(dom4j:dom4j) -BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(joda-time:joda-time) -BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(net.sf.kxml:kxml2-min) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) -%if %{with hibernate} -BuildRequires: mvn(org.hibernate:hibernate-core) -BuildRequires: mvn(org.hibernate:hibernate-envers) -%endif BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) -BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) -BuildRequires: mvn(xom:xom) BuildRequires: mvn(xpp3:xpp3) BuildRequires: mvn(xpp3:xpp3_min) +%if %{without jp_minimal} +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 + %description XStream is a simple library to serialize objects to XML @@ -96,7 +97,7 @@ Summary: Javadoc for %{name} %description javadoc %{name} API documentation. -%if %{with hibernate} +%if %{without jp_minimal} %package hibernate Summary: hibernate module for %{name} Requires: %{name} = %{version}-%{release} @@ -162,8 +163,15 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -%if %{without hibernate} +%if %{with jp_minimal} +# 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 %mvn_file :%{name} %{name}/%{name} %{name} @@ -184,7 +192,7 @@ find . -name "*.jar" -print -delete %files parent -f .mfiles-%{name}-parent -%if %{with hibernate} +%if %{without jp_minimal} %files hibernate -f .mfiles-%{name}-hibernate %endif @@ -194,6 +202,9 @@ find . -name "*.jar" -print -delete %license LICENSE.txt %changelog +* 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 From 3fb52d3cd9a58cc2967af5147a19853405848502 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 26 Jul 2019 12:22:29 +0200 Subject: [PATCH 32/68] disable hibernate support by default --- xstream.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xstream.spec b/xstream.spec index 70fcac7..a1bf412 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,12 +30,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Allow building with a minimal dependency set -%bcond_with jp_minimal +%bcond_with hibernate Name: xstream Version: 1.4.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -60,7 +59,7 @@ BuildRequires: mvn(stax:stax-api) BuildRequires: mvn(xpp3:xpp3) BuildRequires: mvn(xpp3:xpp3_min) -%if %{without jp_minimal} +%if %{with hibernate} BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.hibernate:hibernate-core) @@ -97,7 +96,7 @@ Summary: Javadoc for %{name} %description javadoc %{name} API documentation. -%if %{without jp_minimal} +%if %{with hibernate} %package hibernate Summary: hibernate module for %{name} Requires: %{name} = %{version}-%{release} @@ -163,7 +162,7 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -%if %{with jp_minimal} +%if %{without hibernate} # Don't build hibernate module %pom_disable_module xstream-hibernate # Disable support for some lesser used XML backends @@ -192,7 +191,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %files parent -f .mfiles-%{name}-parent -%if %{without jp_minimal} +%if %{with hibernate} %files hibernate -f .mfiles-%{name}-hibernate %endif @@ -202,6 +201,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From 949d0657af50a163e5adfcfaad82dad164d3b5e7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 5 Nov 2019 13:30:17 +0100 Subject: [PATCH 33/68] use Java version override compatible with both xmvn 3.0.0 and 3.1.0 --- xstream-java-8-target.patch | 26 ++++++++++++++++++++++++++ xstream.spec | 12 ++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 xstream-java-8-target.patch diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch new file mode 100644 index 0000000..8ab9ad9 --- /dev/null +++ b/xstream-java-8-target.patch @@ -0,0 +1,26 @@ +diff --git a/pom.xml b/pom.xml +index 5d52a8f..acfd319 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -64,8 +64,8 @@ + 1.8 + + +- 1.4 +- 1.4 ++ 1.8 ++ 1.8 + + + +@@ -944,8 +944,8 @@ + UTF-8 + + 1.5 +- 1.5 +- 1.5 ++ 1.8 ++ 1.8 + [1.4,) + + 1.2.1 diff --git a/xstream.spec b/xstream.spec index a1bf412..9f5366f 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -42,6 +42,9 @@ BuildArch: noarch Source0: http://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(dom4j:dom4j) @@ -125,6 +128,8 @@ Parent POM for %{name}. find . -name "*.class" -print -delete find . -name "*.jar" -print -delete +%patch0 -p1 + # Require org.codehaus.xsite:xsite-maven-plugin %pom_disable_module xstream-distribution @@ -180,7 +185,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %build # test skipped for unavailable test deps (com.megginson.sax:xml-writer) -%mvn_build -f -s -- -Dversion.java.source=8 +%mvn_build -f -s %install %mvn_install @@ -201,6 +206,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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. From 92418f5a6f59ea12ab315d7fb72559171686e7cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:57:57 +0000 Subject: [PATCH 34/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 9f5366f..5953531 100644 --- a/xstream.spec +++ b/xstream.spec @@ -34,7 +34,7 @@ Name: xstream Version: 1.4.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -206,6 +206,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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. From 58b4be26c9dd4eac19daa54b016cfafbfd307d81 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 27 Apr 2020 14:27:59 +0200 Subject: [PATCH 35/68] update to version 1.4.12, disable optional BEA Stax support by default --- .gitignore | 1 + sources | 2 +- xstream-java-8-target.patch | 10 +++++----- xstream.spec | 28 +++++++++++++++++++++++----- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 69a5274..19f3dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xstream-distribution-1.3.1-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 diff --git a/sources b/sources index 833b4c6..bf3631b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.11.1-src.zip) = 273c712a57800089f72899b5df65584788d02df3493fb32549066fcebc40decc57c4c10ea05ec387dede328516047bb8a2d62cc64e27ec14156dd361f3959a81 +SHA512 (xstream-distribution-1.4.12-src.zip) = 490b6e62bbee7c721640ce955252881d0a26e9fafc3992df8507a9e616a3f4b00e44bd6cf45d2ea310ea6c2d48bea23e741c52e66c991a398c0876c6970397ec diff --git a/xstream-java-8-target.patch b/xstream-java-8-target.patch index 8ab9ad9..2f7d66d 100644 --- a/xstream-java-8-target.patch +++ b/xstream-java-8-target.patch @@ -1,8 +1,8 @@ diff --git a/pom.xml b/pom.xml -index 5d52a8f..acfd319 100644 +index 2ab1bd4..4e6ea8b 100644 --- a/pom.xml +++ b/pom.xml -@@ -64,8 +64,8 @@ +@@ -84,8 +84,8 @@ 1.8 @@ -13,14 +13,14 @@ index 5d52a8f..acfd319 100644 -@@ -944,8 +944,8 @@ - UTF-8 +@@ -1100,8 +1100,8 @@ 1.5 + 1.6 - 1.5 - 1.5 + 1.8 + 1.8 [1.4,) - 1.2.1 + 1.3 diff --git a/xstream.spec b/xstream.spec index 5953531..76e2322 100644 --- a/xstream.spec +++ b/xstream.spec @@ -31,16 +31,17 @@ # %bcond_with hibernate +%bcond_with stax Name: xstream -Version: 1.4.11.1 -Release: 5%{?dist} +Version: 1.4.12 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ BuildArch: noarch -Source0: http://repo1.maven.org/maven2/com/thoughtworks/%{name}/%{name}-distribution/%{version}/%{name}-distribution-%{version}-src.zip +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 @@ -52,13 +53,12 @@ BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2-min) 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(org.codehaus.woodstox:woodstox-core-asl) BuildRequires: mvn(org.jdom:jdom) BuildRequires: mvn(org.jdom:jdom2) -BuildRequires: mvn(stax:stax) -BuildRequires: mvn(stax:stax-api) BuildRequires: mvn(xpp3:xpp3) BuildRequires: mvn(xpp3:xpp3_min) @@ -71,6 +71,11 @@ BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(xom:xom) %endif +%if %{with stax} +BuildRequires: mvn(stax:stax) +BuildRequires: mvn(stax:stax-api) +%endif + %description XStream is a simple library to serialize objects to XML @@ -178,6 +183,15 @@ 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 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 + %mvn_file :%{name} %{name}/%{name} %{name} %mvn_file :%{name}-benchmark %{name}/%{name}-benchmark %{name}-benchmark @@ -206,6 +220,10 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From 29ebf510eba6708a1331bd651ebf23d5251f4833 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 8 Jun 2020 13:40:23 +0200 Subject: [PATCH 36/68] disable optional support for joda-time by default --- xstream.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/xstream.spec b/xstream.spec index 76e2322..fe5f993 100644 --- a/xstream.spec +++ b/xstream.spec @@ -31,11 +31,12 @@ # %bcond_with hibernate +%bcond_with joda %bcond_with stax Name: xstream Version: 1.4.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -50,7 +51,6 @@ BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(dom4j:dom4j) BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(joda-time:joda-time) BuildRequires: mvn(net.sf.kxml:kxml2-min) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -71,6 +71,10 @@ BuildRequires: mvn(org.slf4j:slf4j-simple) BuildRequires: mvn(xom:xom) %endif +%if %{with joda} +BuildRequires: mvn(joda-time:joda-time) +%endif + %if %{with stax} BuildRequires: mvn(stax:stax) BuildRequires: mvn(stax:stax-api) @@ -183,6 +187,12 @@ 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 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 stax} %pom_remove_dep -r stax:stax %pom_remove_dep -r stax:stax-api @@ -220,6 +230,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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. From 77803218239a3b9319e8e6731ad9581926315b84 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 17 Jun 2020 20:05:37 +0200 Subject: [PATCH 37/68] disable unused optional dom4j, jdom, jdom2, kxml, and woodstox support --- xstream.spec | 73 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/xstream.spec b/xstream.spec index fe5f993..eefa700 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,13 +30,18 @@ # 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.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -49,19 +54,18 @@ Patch0: xstream-java-8-target.patch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) -BuildRequires: mvn(dom4j:dom4j) BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.sf.kxml:kxml2-min) 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(org.codehaus.woodstox:woodstox-core-asl) -BuildRequires: mvn(org.jdom:jdom) -BuildRequires: mvn(org.jdom:jdom2) 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) @@ -71,15 +75,31 @@ 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 @@ -176,6 +196,15 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark +%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 @@ -187,12 +216,35 @@ 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 @@ -202,6 +254,12 @@ 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 @@ -230,6 +288,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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. From c78eda7ed2d33ab0b9f0b2bb25154f1cde75bcb2 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 09:08:01 +0200 Subject: [PATCH 38/68] Rebuilt for JDK-11 --- xstream.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstream.spec b/xstream.spec index eefa700..180c243 100644 --- a/xstream.spec +++ b/xstream.spec @@ -41,7 +41,7 @@ Name: xstream Version: 1.4.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -288,6 +288,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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. From 331a4dfc44bf01acc75df72f09554873c3484ce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:07:16 +0000 Subject: [PATCH 39/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 180c243..9600343 100644 --- a/xstream.spec +++ b/xstream.spec @@ -41,7 +41,7 @@ Name: xstream Version: 1.4.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -288,6 +288,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From 4bcb67e99ba92303dfdae2c39a2b1c3ad2ad2936 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Aug 2020 13:50:26 +0100 Subject: [PATCH 40/68] Allow building on JDK11 --- xstream.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xstream.spec b/xstream.spec index 9600343..2a54db0 100644 --- a/xstream.spec +++ b/xstream.spec @@ -41,7 +41,7 @@ Name: xstream Version: 1.4.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -54,6 +54,7 @@ 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) @@ -62,6 +63,7 @@ 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 @@ -185,9 +187,6 @@ find . -name "*.jar" -print -delete %pom_remove_plugin :maven-javadoc-plugin xstream -# provided by JDK -%pom_remove_dep javax.activation:activation 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 @@ -196,6 +195,9 @@ find . -name "*.jar" -print -delete %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 @@ -288,6 +290,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From 073a53cbdc1b75772384a033b85064e0bcaf1fa5 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Tue, 17 Nov 2020 17:17:33 +1000 Subject: [PATCH 41/68] Upstream update to 1.4.14 --- .gitignore | 2 ++ sources | 2 +- xstream.spec | 41 ++++++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 19f3dcb..6b45429 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ xstream-distribution-1.3.1-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/sources b/sources index bf3631b..c395d78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xstream-distribution-1.4.12-src.zip) = 490b6e62bbee7c721640ce955252881d0a26e9fafc3992df8507a9e616a3f4b00e44bd6cf45d2ea310ea6c2d48bea23e741c52e66c991a398c0876c6970397ec +SHA512 (xstream-distribution-1.4.14-src.zip) = 331a8ee4d81c1cb7e4d87246c312609c3a266bac1a06beaedf5086dff32d46a3e624a903290381bda725b2cf9d52df8dce63c545d0ae29de26b17ccc538e485f diff --git a/xstream.spec b/xstream.spec index 2a54db0..e707f67 100644 --- a/xstream.spec +++ b/xstream.spec @@ -40,8 +40,8 @@ %bcond_with woodstox Name: xstream -Version: 1.4.12 -Release: 6%{?dist} +Version: 1.4.14 +Release: 1%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -104,23 +104,23 @@ BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl) %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 +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. @@ -290,6 +290,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From 95c725f04b43db6b3e61a780fd84afe53c894c18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:25:47 +0000 Subject: [PATCH 42/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 e707f67..e6f3a0b 100644 --- a/xstream.spec +++ b/xstream.spec @@ -41,7 +41,7 @@ Name: xstream Version: 1.4.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -290,6 +290,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* 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 From cd291b33f42897836dec97d836327ed4c191eda8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:00:05 +0000 Subject: [PATCH 43/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 e6f3a0b..2718ac8 100644 --- a/xstream.spec +++ b/xstream.spec @@ -41,7 +41,7 @@ Name: xstream Version: 1.4.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -290,6 +290,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %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 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 44/68] 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 81a80ac8b6b36a9e242237b583379e798799371d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 4 Oct 2021 12:02:42 +0200 Subject: [PATCH 45/68] 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 46/68] 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 6fda885dc568e4e2c84ed59109e6c73b1d1b300a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:33:42 +0000 Subject: [PATCH 47/68] - 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 48/68] 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 49/68] 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 50/68] 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 51/68] 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 52/68] 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 53/68] 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 54/68] 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 55/68] 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 f582b55fbe5eb90381172ef8de397a5eff5e2c7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:20:39 +0000 Subject: [PATCH 56/68] 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 57/68] 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 58/68] 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 59/68] 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 60/68] 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 61/68] 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 62/68] 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 63/68] 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 64/68] 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 65/68] 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 66/68] 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 67/68] 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 68/68] 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