diff --git a/Xerces-J-src.2.12.0.tar.gz b/Xerces-J-src.2.12.0.tar.gz
deleted file mode 100644
index 3755245..0000000
--- a/Xerces-J-src.2.12.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c27b81e139ecfc219202bcad79e77529b082e9ed9797bc1a4c13e1bd8f8e31c9
-size 1810232
diff --git a/Xerces-J-src.2.12.1.tar.gz b/Xerces-J-src.2.12.1.tar.gz
new file mode 100644
index 0000000..8a66ca6
--- /dev/null
+++ b/Xerces-J-src.2.12.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dadc818032dc2acf0dfea39a093827efaece371067b998025476f067069e2411
+size 1812031
diff --git a/xerces-2_11_0-jdk7.patch b/xerces-2_11_0-jdk7.patch
deleted file mode 100644
index 21735b2..0000000
--- a/xerces-2_11_0-jdk7.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java 2010-11-26 21:42:02.000000000 +0100
-+++ xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java 2017-10-03 17:28:29.096819783 +0200
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
-
- import org.w3c.dom.html.HTMLFrameElement;
-+import org.w3c.dom.Document;
-
- /**
- * @xerces.internal
-@@ -127,6 +128,11 @@
- setAttribute( "src", src );
- }
-
-+ public Document getContentDocument()
-+ {
-+ return null;
-+ }
-+
-
- /**
- * Constructor requires owner document.
---- xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java 2010-11-26 21:42:08.000000000 +0100
-+++ xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java 2017-10-03 17:28:12.576819720 +0200
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
-
- import org.w3c.dom.html.HTMLIFrameElement;
-+import org.w3c.dom.Document;
-
- /**
- * @xerces.internal
-@@ -150,6 +151,11 @@
- setAttribute( "width", width );
- }
-
-+ public Document getContentDocument()
-+ {
-+ return null;
-+ }
-+
-
- /**
- * Constructor requires owner document.
---- xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java 2010-11-26 21:42:05.000000000 +0100
-+++ xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java 2017-10-03 17:27:57.048819662 +0200
-@@ -17,6 +17,7 @@
- package org.apache.html.dom;
-
- import org.w3c.dom.html.HTMLObjectElement;
-+import org.w3c.dom.Document;
-
- /**
- * @xerces.internal
-@@ -239,6 +240,10 @@
- setAttribute( "width", width );
- }
-
-+ public Document getContentDocument()
-+ {
-+ return null;
-+ }
-
-
- /**
diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
index 44b4a6b..286ccbf 100644
--- a/xerces-j2-build.patch
+++ b/xerces-j2-build.patch
@@ -1,6 +1,8 @@
---- xerces-2_12_0/build.xml 2018-11-18 20:10:36.933534130 +0100
-+++ xerces-2_12_0/build.xml 2018-11-18 20:12:28.714126419 +0100
-@@ -38,13 +38,6 @@
+Index: xerces-2_12_1/build.xml
+===================================================================
+--- xerces-2_12_1.orig/build.xml
++++ xerces-2_12_1/build.xml
+@@ -38,13 +38,6 @@ Authors:
@@ -14,7 +16,7 @@
-@@ -71,7 +64,6 @@
+@@ -71,7 +64,6 @@ Authors:
@@ -22,7 +24,7 @@
-@@ -108,7 +100,6 @@
+@@ -108,7 +100,6 @@ Authors:
@@ -30,7 +32,7 @@
-@@ -135,7 +126,6 @@
+@@ -135,7 +126,6 @@ Authors:
@@ -38,7 +40,7 @@
-@@ -247,30 +237,6 @@
+@@ -247,30 +237,6 @@ Authors:
@@ -69,7 +71,7 @@
-@@ -286,7 +252,7 @@
+@@ -286,7 +252,7 @@ Authors:
@@ -78,7 +80,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -354,7 +320,7 @@
+@@ -354,7 +320,7 @@ Authors:
@@ -87,7 +89,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -374,7 +340,7 @@
+@@ -374,7 +340,7 @@ Authors:
@@ -96,7 +98,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -438,7 +404,7 @@
+@@ -438,7 +404,7 @@ Authors:
@@ -105,7 +107,7 @@
INTERNAL:
Usage of this class is not supported. It may be altered or removed at any time.]]>
-@@ -453,46 +419,33 @@
+@@ -453,46 +419,33 @@ Authors:
@@ -155,7 +157,7 @@
/>
-@@ -504,25 +457,23 @@
+@@ -504,25 +457,23 @@ Authors:
org.apache.xerces.util,
org.apache.xerces.xinclude,
org.apache.xerces.xpointer'
@@ -183,7 +185,7 @@
/>
-@@ -998,7 +949,7 @@
+@@ -1004,7 +955,7 @@ Authors:
@@ -192,7 +194,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -1233,30 +1184,6 @@
+@@ -1239,30 +1190,6 @@ Authors:
@@ -223,7 +225,7 @@
@@ -232,7 +234,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -1448,7 +1375,7 @@
+@@ -1454,7 +1381,7 @@ Authors:
@@ -241,7 +243,7 @@
destdir="${build.dest}"
source="${javac.source}"
target="${javac.target}"
-@@ -1512,36 +1439,4 @@
+@@ -1518,36 +1445,4 @@ Authors:
diff --git a/xerces-j2.changes b/xerces-j2.changes
index 4855934..565a5d9 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 28 17:26:24 UTC 2021 - David Anes
+
+- Update to upstream 2.12.1
+- Removed patch xerces-2_11_0-jdk7.patch:
+ * this patch is already applied upstream
+
-------------------------------------------------------------------
Wed Apr 17 10:41:24 UTC 2019 - Fridrich Strba
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 1a0818e..60a3014 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -1,7 +1,7 @@
#
# spec file for package xerces-j2
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,25 @@
#
-%global cvs_version 2_12_0
+%global cvs_version 2_12_1
%define __requires_exclude system.bundle
Name: xerces-j2
-Version: 2.12.0
+Version: 2.12.1
Release: 0
Summary: Java XML parser
License: Apache-2.0 AND W3C
Group: Development/Libraries/Java
-URL: http://xerces.apache.org/xerces2-j/
-Source0: http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz
+URL: https://xerces.apache.org/xerces2-j/
+Source0: https://dlcdn.apache.org//xerces/j/source/Xerces-J-src.%{version}.tar.gz
Source1: %{name}-version.sh
Source2: %{name}-constants.sh
Source3: %{name}-version.1
Source4: %{name}-constants.1
-Source5: http://repo.maven.apache.org/maven2/xerces/xercesImpl/%{version}/xercesImpl-%{version}.pom
+Source5: https://repo.maven.apache.org/maven2/xerces/xercesImpl/%{version}/xercesImpl-%{version}.pom
# Patch the build so that it doesn't try to use bundled xml-commons source
# Also remove the use of the special taglets and xjavac task
Patch0: %{name}-build.patch
-Patch1: xerces-2_11_0-jdk7.patch
-Patch2: %{name}-manifest.patch
+Patch1: %{name}-manifest.patch
BuildRequires: ant
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -88,9 +87,9 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n xerces-%{cvs_version}
find "(" -name "*.class" -o -name "*.jar" ")" -delete
find -type f -exec dos2unix {} \;
+
%patch0 -p1
-%patch1 -p1
-%patch2
+%patch1
%build
mkdir -p tools
diff --git a/xercesImpl-2.12.0.pom b/xercesImpl-2.12.1.pom
similarity index 96%
rename from xercesImpl-2.12.0.pom
rename to xercesImpl-2.12.1.pom
index e738fc5..97d21d7 100644
--- a/xercesImpl-2.12.0.pom
+++ b/xercesImpl-2.12.1.pom
@@ -3,7 +3,7 @@
4.0.0
xerces
xercesImpl
- 2.12.0
+ 2.12.1
Xerces2 is the next generation of high performance, fully compliant XML parsers in the Apache Xerces family. This new version of Xerces introduces the Xerces Native Interface (XNI), a complete framework for building parser components and configurations that is extremely modular and easy to program.
@@ -25,7 +25,7 @@
https://svn.apache.org/repos/asf/xerces/java/
- https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_12_0/
+ https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_12_1/