diff --git a/jdk25.patch b/jdk25.patch
deleted file mode 100644
index 2b6713a..0000000
--- a/jdk25.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 1bba186..ef74ff3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c
+SHA512 (xmlgraphics-commons-2.8-src.tar.gz) = 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
diff --git a/test.patch b/test.patch
new file mode 100644
index 0000000..450e1dd
--- /dev/null
+++ b/test.patch
@@ -0,0 +1,21 @@
+--- xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java 2022/10/06 12:37:37 1904425
++++ xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java 2022/11/10 08:15:05 1905215
+@@ -36,9 +36,14 @@
+
+ ImageSessionContext sessionContext = imageContext.newSessionContext();
+ ImageManager manager = imageContext.getImageManager();
+-
+- ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
+- assertEquals(imageInfo.getMimeType(), "image/png");
++ try {
++ ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
++ //IOException should continue to raw png
++ assertEquals(imageInfo.getMimeType(), "image/png");
++ } catch (Exception e) {
++ //Otherwise should throw exception
++ assertEquals(e.getMessage(), "pos < flushedPos!");
++ }
+ }
+
+ }
+
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 8f86f5c..e284f05 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,18 +1,18 @@
Name: xmlgraphics-commons
-Version: 2.11
-Release: 7%{?dist}
+Version: 2.8
+Release: 2%{?dist}
Epoch: 0
Summary: XML Graphics Commons
-License: Apache-2.0
+License: ASL 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
+Patch0: test.patch
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
-BuildRequires: maven-local-openjdk25
+BuildRequires: maven-local
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(junit:junit)
@@ -37,11 +37,14 @@ This package contains API documentation for %{name}.
%prep
%setup -q %{name}-%{version}
-patch -p1 < %{PATCH1}
+
+%patch0 -p3
+
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'
@@ -68,48 +71,6 @@ 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