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