.gitignore

@@ -8,4 +8,3 @@
 /xz-java-1.7.zip
 /xz-java-1.8.zip
 /xz-java-1.9.zip
-/xz-java-1.12.zip

changelog

@@ -1,144 +0,0 @@
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.9-10
-- Rebuilt for java-21-openjdk as system jdk
-
-* Wed Feb 21 2024 Marian Koncek <mkoncek@redhat.com> - 1.9-9
-- Set OpenJDK version to 8
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-7
-- Convert License tag to SPDX format
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.9-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-11
-- Bootstrap build
-- Non-bootstrap build
-
-* Thu Apr 22 2021 Nicolas De Amicis <deamicis@bluewin.ch> - 1.9-11
-- Rebuild for new version 1.9
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.8-8
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1.8-7
-- Allow building against Java 11
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-4
-- Mass rebuild for javapackages-tools 201902
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
-- Mass rebuild for javapackages-tools 201901
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Jan 05 2018 Michael Simacek <msimacek@redhat.com> - 1.8-1
-- Update to upstream version 1.8
-
-* Tue Jan  2 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-1
-- Update to upstream version 1.7
-
-* Mon Nov 27 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-5
-- Make use of %%license macro
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Mar 21 2017 Michael Simacek <msimacek@redhat.com> - 1.6-3
-- Install with XMvn
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Nov 28 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-1
-- Update to upstream version 1.6
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-2
-- Use .mfiles generated during build
-
-* Mon Mar 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-1
-- Update to upstream version 1.5
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4-2
-- Use Requires: java-headless rebuild (#1067528)
-
-* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-1
-- Update to upstream version 1.4
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-1
-- Update to upstream version 1.3
-
-* Tue Jan 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
-- Update to upstream version 1.2
-
-* Thu Jan 3 2013 Krzysztof Daniel <kdaniel@redhat.com> 1.1-2
-- Add patch for OSGi Manifest.
-
-* Fri Aug 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-1
-- Update to upstream version 1.1
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jun 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-3
-- Install xz.jar symlink
-
-* Thu Apr 5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> 1.0-2
-- Fix issues found during package review
-- Include missing COPYING files.
-- Add missing RPM group.
-- Comment on touching package-list.
-
-* Wed Apr 4 2012 Mikolaj Izdebski <mizdebsk@redhat.com> 1.0-1
-- Initial packaging.

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f43
+  ref: f37
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (xz-java-1.12.zip) = ea6b6fa8b7021a3e8caa9b750156078182fcde1c4c9926740fea51827facba8227d3d2fe6c95de7a4e9ce9cda531f4706d9a582a04155ac2eaac36c5f51c8bf7
+SHA512 (xz-java-1.9.zip) = 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb

xz-java.spec

@@ -1,24 +1,22 @@
 %bcond_with bootstrap
 
 Name:           xz-java
-Version:        1.12
+Version:        1.9
-Release:        %autorelease
+Release:        6%{?dist}
 Summary:        Java implementation of XZ data compression
-License:        LicenseRef-Fedora-Public-Domain
+License:        Public Domain
-URL:            https://tukaani.org/xz/java.html
+URL:            http://tukaani.org/xz/java.html
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://tukaani.org/xz/xz-java-%{version}.zip
+Source0:        http://tukaani.org/xz/xz-java-%{version}.zip
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  javapackages-local-openjdk25
+BuildRequires:  javapackages-local
-BuildRequires:  ant-openjdk25 
+BuildRequires:  ant
 %endif
-# TODO Remove in Fedora 46
-Obsoletes:      %{name}-javadoc < 1.9-25
 
 %description
 A complete implementation of XZ data compression in Java.
@@ -28,8 +26,14 @@ single-threaded streamed compression and decompression, single-threaded
 decompression with limited random access support, raw streams (no .xz headers)
 for advanced users, including LZMA2 with preset dictionary.
 
+%package javadoc
+Summary:        Javadocs for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
 %prep
-%autosetup -p1 -C
+%setup -q -c %{name}-%{version}
 
 %mvn_file : %{name} xz
 
@@ -38,16 +42,147 @@ for advanced users, including LZMA2 with preset dictionary.
 # package-list from oracle.com. Create a dummy package-list to prevent that.
 mkdir -p extdoc && touch extdoc/package-list
 
-%ant -Dsourcever=8 -Dsourcever9=9 maven
+%ant maven
 
 %install
 %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar
 
-%mvn_install
+%mvn_install -J build/doc
 
 %files -f .mfiles
-%doc README.md THANKS.md
+%doc README THANKS
+%license COPYING
+
+%files javadoc -f .mfiles-javadoc
 %license COPYING
 
 %changelog
-%autochangelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.9-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-11
+- Bootstrap build
+- Non-bootstrap build
+
+* Thu Apr 22 2021 Nicolas De Amicis <deamicis@bluewin.ch> - 1.9-11
+- Rebuild for new version 1.9
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.8-8
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 1.8-7
+- Allow building against Java 11
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-4
+- Mass rebuild for javapackages-tools 201902
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
+- Mass rebuild for javapackages-tools 201901
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 05 2018 Michael Simacek <msimacek@redhat.com> - 1.8-1
+- Update to upstream version 1.8
+
+* Tue Jan  2 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-1
+- Update to upstream version 1.7
+
+* Mon Nov 27 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-5
+- Make use of %%license macro
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Mar 21 2017 Michael Simacek <msimacek@redhat.com> - 1.6-3
+- Install with XMvn
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Nov 28 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-1
+- Update to upstream version 1.6
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-2
+- Use .mfiles generated during build
+
+* Mon Mar 10 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-1
+- Update to upstream version 1.5
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.4-2
+- Use Requires: java-headless rebuild (#1067528)
+
+* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-1
+- Update to upstream version 1.3
+
+* Tue Jan 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-1
+- Update to upstream version 1.2
+
+* Thu Jan 3 2013 Krzysztof Daniel <kdaniel@redhat.com> 1.1-2
+- Add patch for OSGi Manifest.
+
+* Fri Aug 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-1
+- Update to upstream version 1.1
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jun 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-3
+- Install xz.jar symlink
+
+* Thu Apr 5 2012 Mikolaj Izdebski <mizdebsk@redhat.com> 1.0-2
+- Fix issues found during package review
+- Include missing COPYING files.
+- Add missing RPM group.
+- Comment on touching package-list.
+
+* Wed Apr 4 2012 Mikolaj Izdebski <mizdebsk@redhat.com> 1.0-1
+- Initial packaging.