diff --git a/.gitignore b/.gitignore
index 45aab53..eb74f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-xmlgraphics-commons-1.3-src.tar.gz
-xmlgraphics-commons-1.3.1-src.tar.gz
-/xmlgraphics-commons-1.5-src.tar.gz
-/xmlgraphics-commons-2.0-src.tar.gz
-/xmlgraphics-commons-2.0.1-src.tar.gz
-/xmlgraphics-commons-2.2-src.tar.gz
+/xmlgraphics-commons-*-src.tar.gz
+/*.src.rpm
diff --git a/jdk25.patch b/jdk25.patch
new file mode 100644
index 0000000..2b6713a
--- /dev/null
+++ b/jdk25.patch
@@ -0,0 +1,12 @@
+--- xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
++++ xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
+@@ -228,7 +228,7 @@
+ if (padding != 0) {
+ try {
+ iccStream.write(new byte[padding]);
+- } catch (IOException ioe) {
++ } catch (Exception ioe) {
+ throw new IOException("Error while aligning ICC stream: " + ioe.getMessage());
+ }
+ }
+
diff --git a/sources b/sources
index 0c19da9..1bba186 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.2-src.tar.gz) = c0c786e774da535d7ed100c3c78ba1483fde371b7353226bb72076aab39ad33e752fa9d85fd368f65cfb50cc25ae904868d8f939323ea96876523e09f1259211
+SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e8b4110..8f86f5c 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,16 +1,18 @@
Name: xmlgraphics-commons
-Version: 2.2
-Release: 3%{?dist}
+Version: 2.11
+Release: 7%{?dist}
Epoch: 0
Summary: XML Graphics Commons
-License: ASL 2.0
+License: Apache-2.0
URL: http://xmlgraphics.apache.org/
Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
+Patch1: jdk25.patch
BuildArch: noarch
+ExclusiveArch: %{java_arches} noarch
-BuildRequires: maven-local
+BuildRequires: maven-local-openjdk25
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(junit:junit)
@@ -35,12 +37,11 @@ This package contains API documentation for %{name}.
%prep
%setup -q %{name}-%{version}
-
+patch -p1 < %{PATCH1}
find -name "*.jar" -delete
# Disable plugins not needed for RPM build
%pom_remove_plugin :maven-checkstyle-plugin
-%pom_remove_plugin :findbugs-maven-plugin
# Make into OSGi bundle
%pom_xpath_inject pom:project 'bundle'
@@ -67,6 +68,96 @@ find -name "*.jar" -delete
%license LICENSE NOTICE
%changelog
+* Fri Jul 17 2026 Fedora Release Engineering - 0:2.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering - 0:2.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 30 2025 jiri vanek - 0:2.11-4
+- Rrevert to jdk21
+
+* Tue Jul 29 2025 jiri vanek - 0:2.11-3
+- Rebuilt for java-25-openjdk as preffered jdk
+
+* Fri Jul 25 2025 Fedora Release Engineering - 0:2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue May 06 2025 Gwyn Ciesla - 0:2.11-1
+- 2.11
+
+* Sun Jan 19 2025 Fedora Release Engineering - 0:2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Wed Oct 09 2024 Gwyn Ciesla - 0:2.10-1
+- 2.10
+
+* Sat Jul 20 2024 Fedora Release Engineering - 0:2.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek - 0:2.9-3
+- Rebuilt for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering - 0:2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Aug 23 2023 Gwyn Ciesla - 0:2.9-1
+- 2.9
+
+* Sat Jul 22 2023 Fedora Release Engineering - 0:2.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Mar 02 2023 Gwyn Ciesla - 0:2.8-3
+- migrated to SPDX license
+
+* Sat Jan 21 2023 Fedora Release Engineering - 0:2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 09 2022 Gwyn Ciesla - 0:2.8-1
+- 2.8
+
+* Sat Jul 23 2022 Fedora Release Engineering - 0:2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek - 0:2.7-3
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek - 0:2.7-2
+- Rebuilt for java-17-openjdk as system jdk
+
+* Mon Jan 24 2022 Gwyn Ciesla - 0:2.7-1
+- 2.7
+
+* Sat Jan 22 2022 Fedora Release Engineering - 0:2.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering - 0:2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Mar 01 2021 Jie Kang - 0:2.6-1
+- Update to latest upstream release
+
+* Thu Jan 28 2021 Fedora Release Engineering - 0:2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Nov 01 2020 Mat Booth - 0:2.4-1
+- Update to latest upstream release
+
+* Wed Jul 29 2020 Fedora Release Engineering - 0:2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek - 0:2.3-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jan 31 2020 Fedora Release Engineering - 0:2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering - 0:2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed May 15 2019 Mat Booth - 0:2.3-1
+- Update to latest upstream release
+
* Sun Feb 03 2019 Fedora Release Engineering - 0:2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild