8 changed files with 86 additions and 316 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/6.0.0.tar.gz
+SOURCES/5.3.0.tar.gz
--- a/.javapackages-tools.metadata
+++ b/.javapackages-tools.metadata
@ -1 +1 @@
-0c2f59a61e8e8eb664f679efab383deadaed2cc6 SOURCES/6.0.0.tar.gz
+e8a9e74bf0eb43cc43ac06e7de828d4e00030a4c SOURCES/5.3.0.tar.gz
--- a/SOURCES/0001-Do-not-set-JAVA_HOME-for-ant.patch
+++ b/SOURCES/0001-Do-not-set-JAVA_HOME-for-ant.patch
@ -1,25 +0,0 @@
-From 849e007338475a125cc791a91902b010ff3b5337 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Tue, 22 Oct 2024 00:09:51 +0200
-Subject: [PATCH] Do not set JAVA_HOME for ant
-
---
- macros.d/macros.jpackage | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
-index 13595e9..6c70788 100644
--- a/macros.d/macros.jpackage
-+++ b/macros.d/macros.jpackage
-@@ -15,7 +15,7 @@
- #==============================================================================
- # ---- default Java commands
- 
-%ant            %{?jpb_env} JAVA_HOME=%{java_home} ant
-+%ant            %{?jpb_env} ant
- %jar            %{java_home}/bin/jar
- %java           %(. @{javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
- %javac          %{java_home}/bin/javac
-- 
-2.47.0
-
--- a/SOURCES/javapackages-config.json
+++ b/SOURCES/javapackages-config.json
@ -1,18 +0,0 @@
-{
-    "maven.req": {
-        "always_generate": [
-            "javapackages-filesystem"
-        ],
-        "java_requires": {
-            "skip": true
-        },
-        "java_devel_requires": {
-            "skip": true
-        }
-    },
-    "javadoc.req": {
-        "always_generate": [
-            "javapackages-filesystem"
-        ]
-    }
-}
--- a/SOURCES/toolchains-openjdk11.xml
+++ b/SOURCES/toolchains-openjdk11.xml
@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-11-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>
--- a/SOURCES/toolchains-openjdk17.xml
+++ b/SOURCES/toolchains-openjdk17.xml
@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-17-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>
--- a/SOURCES/toolchains-openjdk8.xml
+++ b/SOURCES/toolchains-openjdk8.xml
@ -1,11 +0,0 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <xmvn>xmvn</xmvn>
-    </provides>
-    <configuration>
-      <jdkHome>/usr/lib/jvm/java-1.8.0-openjdk</jdkHome>
-    </configuration>
-  </toolchain>
-</toolchains>
--- a/SPECS/javapackages-tools.spec
+++ b/SPECS/javapackages-tools.spec
@ -1,51 +1,63 @@
-%bcond_with bootstrap
-
-%bcond_with ivy
-
 # Don't generate requires on jpackage-utils and java-headless for
 # provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
 %global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$

+# Disable automatic bytecode compilation for files in java-utils
+# https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
+%global _python_bytecompile_extra 0
+
+%bcond_without asciidoc
+%bcond_without gradle
+%bcond_without tests
+%bcond_with xmvn_javadoc
+
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global python_prefix python3
-%global python_interpreter %{?__python3}%{!?__python3:dummy}
+%global python_interpreter %{__python3}
+%else
+%global python_prefix python
+%global python_interpreter %{__python2}
+%global rpmmacrodir /etc/rpm
+%endif

-%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
-%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
+%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk
+%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk

 Name:           javapackages-tools
-Version:        6.0.0
-Release:        7%{?dist}
+Version:        5.3.0
+Release:        2%{?dist}
+
 Summary:        Macros and scripts for Java packaging support
+
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
-BuildArch:      noarch
-
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
-Source3:        javapackages-config.json
-
-Source8:        toolchains-openjdk8.xml
-Source11:       toolchains-openjdk11.xml
-Source17:       toolchains-openjdk17.xml

-Patch1:         0001-Do-not-set-JAVA_HOME-for-ant.patch
+BuildArch:      noarch

 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
+%if %{with asciidoc}
+BuildRequires:  asciidoc
+BuildRequires:  xmlto
+%endif
 BuildRequires:  %{python_prefix}-devel
 BuildRequires:  %{python_prefix}-lxml
 BuildRequires:  %{python_prefix}-setuptools
-%if !0%{?rhel}
-BuildRequires:  %{python_prefix}-pytest
-BuildRequires:  %{python_prefix}-pytest-cov
+%if !0%{?_module_build}
+# XXX python-nose is not part of any module yet, but it should get
+# modularized one day, right?  mizdebsk, Sep 2017
+BuildRequires:  %{python_prefix}-nose
 %endif
+BuildRequires:  %{python_prefix}-six

 Requires:       javapackages-filesystem = %{version}-%{release}
 Requires:       coreutils
 Requires:       findutils
 Requires:       which
 # default JRE
-Requires:       java-17-openjdk-headless
+Requires:       java-1.8.0-openjdk-headless

 Provides:       jpackage-utils = %{version}-%{release}
 # These could be generated automatically, but then we would need to
@ -58,6 +70,7 @@ This package provides macros and scripts to support Java packaging.

 %package -n javapackages-filesystem
 Summary:        Java packages filesystem layout
+Obsoletes:      eclipse-filesystem < 2
 Provides:       eclipse-filesystem = %{version}-%{release}

 %description -n javapackages-filesystem
@ -68,23 +81,41 @@ install their content.
 Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
-%if %{without bootstrap}
-Requires:       %{_bindir}/xmvn
-# NOTE keep using Java 11 for the whole lifecycle
-Requires:       maven-openjdk11
-Requires:       mvn(org.fedoraproject.xmvn:xmvn-mojo)
+Requires:       xmvn-minimal
+Requires:       xmvn-mojo
+Requires:       xmvn-connector-aether
 # Common Maven plugins required by almost every build. It wouldn't make
 # sense to explicitly require them in every package built with Maven.
 Requires:       mvn(org.apache.maven.plugins:maven-compiler-plugin)
 Requires:       mvn(org.apache.maven.plugins:maven-jar-plugin)
+%if %{without xmvn_javadoc}
+Requires:       mvn(org.apache.maven.plugins:maven-javadoc-plugin)
+%endif
 Requires:       mvn(org.apache.maven.plugins:maven-resources-plugin)
 Requires:       mvn(org.apache.maven.plugins:maven-surefire-plugin)
-%endif
+# Tests based on JUnit are very common and JUnit itself is small.
+# Include JUnit and JUnit provider for Surefire just for convenience.
+Requires:       mvn(junit:junit)
+Requires:       mvn(org.apache.maven.surefire:surefire-junit4)
+# testng is quite common as well
+Requires:       mvn(org.apache.maven.surefire:surefire-testng)

 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.

-%if %{with ivy}
+%if %{with gradle}
+%package -n gradle-local
+Summary:        Local mode for Gradle
+Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-local = %{version}-%{release}
+Requires:       gradle >= 2.2.1-2
+Requires:       xmvn-connector-gradle
+
+%description -n gradle-local
+This package implements local mode for Gradle, which allows artifact
+resolution using XMvn resolver.
+%endif
+
 %package -n ivy-local
 Summary:        Local mode for Apache Ivy
 Requires:       %{name} = %{version}-%{release}
@ -95,11 +126,12 @@ Requires:       xmvn-connector-ivy
 %description -n ivy-local
 This package implements local mode for Apache Ivy, which allows
 artifact resolution using XMvn resolver.
-%endif

 %package -n %{python_prefix}-javapackages
 Summary:        Module for handling various files for Java packaging
 Requires:       %{python_prefix}-lxml
+Requires:       %{python_prefix}-six
+Obsoletes:      python-javapackages < %{version}-%{release}

 %description -n %{python_prefix}-javapackages
 Module for handling, querying and manipulating of various files for Java
@ -107,63 +139,25 @@ packaging in Linux distributions

 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-%if %{with bootstrap}
-Requires:       javapackages-bootstrap
-%else
-Requires:       %{_bindir}/xmvn-install
-Requires:       %{_bindir}/xmvn-subst
-Requires:       %{_bindir}/xmvn-resolve
-# Java build systems don't have hard requirement on java-devel, so it should be there
-# NOTE keep using Java 11 for the whole lifecycle
-Requires:       java-11-openjdk-devel
-Requires:       (ant-openjdk11 if ant)
-%endif
-
-%description -n javapackages-local
-This package provides non-essential macros and scripts to support Java packaging.
-
-%package -n javapackages-generators
-Summary:        RPM dependency generators for Java packaging support
 Requires:       %{name} = %{version}-%{release}
+Requires:       xmvn-install
+Requires:       xmvn-subst
+Requires:       xmvn-resolve
+# Java build systems don't have hard requirement on java-devel, so it should be there
+Requires:       java-1.8.0-openjdk-devel
 Requires:       %{python_prefix}-javapackages = %{version}-%{release}
 Requires:       %{python_interpreter}

-%description -n javapackages-generators
-RPM dependency generators to support Java packaging.
-
-%package -n maven-local-openjdk8
-Summary:        OpenJDK 8 toolchain for XMvn
-RemovePathPostfixes: -openjdk8
-Requires:       maven-local
-Requires:       java-1.8.0-openjdk-devel
-
-%description -n maven-local-openjdk8
-OpenJDK 8 toolchain for XMvn
-
-%package -n maven-local-openjdk11
-Summary:        OpenJDK 11 toolchain for XMvn
-RemovePathPostfixes: -openjdk11
-Requires:       maven-local
-Requires:       java-11-openjdk-devel
-
-%description -n maven-local-openjdk11
-OpenJDK 11 toolchain for XMvn
-
-%package -n maven-local-openjdk17
-Summary:        OpenJDK 17 toolchain for XMvn
-RemovePathPostfixes: -openjdk17
-Requires:       maven-local
-Requires:       java-17-openjdk-devel
-
-%description -n maven-local-openjdk17
-OpenJDK 17 toolchain for XMvn
+%description -n javapackages-local
+This package provides non-essential macros and scripts to support Java packaging.

 %prep
-%autosetup -p1 -n javapackages-%{version}
+%setup -q -n javapackages-%{version}

+%if %{without asciidoc}
 sed -i '/^manpage /d' build
 sed -i '/${mandir}/d' install
+%endif

 %build
 %configure --pyinterpreter=%{python_interpreter} \
@ -174,192 +168,44 @@ sed -i '/${mandir}/d' install
 %install
 ./install

+%if %{with xmvn_javadoc}
+sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava')
+%endif
 sed -e 's/.[17]$/&*/' -i files-*

+%if %{without gradle}
 rm -rf %{buildroot}%{_bindir}/gradle-local
 rm -rf %{buildroot}%{_datadir}/gradle-local
 rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
-%if %{without ivy}
-rm -rf %{buildroot}%{_sysconfdir}/ivy
-rm -rf %{buildroot}%{_sysconfdir}/ant.d
 %endif

-mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
-cp -p %{SOURCE8} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
-cp -p %{SOURCE11} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
-cp -p %{SOURCE17} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
-
-install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
-
-%if !0%{?rhel}
+%if %{with tests}
+%if !0%{?_module_build}
 %check
-#./check
+./check
+%endif
 %endif

 %files -f files-tools

 %files -n javapackages-filesystem -f files-filesystem

-%files -n javapackages-generators -f files-generators
-
 %files -n javapackages-local -f files-local

 %files -n maven-local

-%if %{with ivy}
-%files -n ivy-local -f files-ivy
+%if %{with gradle}
+%files -n gradle-local -f files-gradle
 %endif

-%files -n maven-local-openjdk8
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
-
-%files -n maven-local-openjdk11
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
-
-%files -n maven-local-openjdk17
-%dir %{_datadir}/xmvn/conf
-%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
+%files -n ivy-local -f files-ivy

 %files -n %{python_prefix}-javapackages -f files-python
 %license LICENSE

 %changelog
-* Mon Nov 18 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-7
- Use Java 11 build tool bindings for package builds
-
-* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
- Drop generated Requires on various Java versions
- Related: RHEL-62409
-
-* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
- Include java-21-headless in generated auto-requires
- Related: RHEL-62409
-
-* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
- Make OpenJDK 17 the default JRE/JDK
- Related: RHEL-62403
-
-* Wed Jan 25 2023 Marián Konček <mkoncek@redhat.com> - 6.0.0-4
- Add generated Requires on multiple versions of java-headless
- Related: rhbz#2164437
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-3
- Implement OpenJDK 11 and 17 toolchains
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.0.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jul 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
- Update to upstream version 6.0.0
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-9
- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-8
- Bootstrap Maven for CentOS Stream 9
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.0.0~alpha-7
- Rebuilt for Python 3.10
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-6
- Bootstrap build
- Non-bootstrap build
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-5
- Implement bootstrap mode
-
-* Thu May 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-4
- Disable skippedPlugins for now
-
-* Thu May 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-3
- Fix typos in Requires
-
-* Thu May 13 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-2
- Disable javapackages-bootstrap for now
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 30 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-14
- Add javapackages-generators provides
-
-* Wed Jul 29 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-1
- Update to upstream version 6.0.0~alpha
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 17 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-9
- Add separate subpackage with RPM generators
-
-* Thu Jul 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-8
- Don't use networking during tests
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.3.0-12
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jun 10 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-11
- Use XMvn Javadoc MOJO for generating API docs
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-10
- Rebuilt for Python 3.9
-
-* Tue Apr 28 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-10
- Switch to OpenJDK 11 as default JDK
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
- Add OpenJDK 8 toolchain configuration
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6
- Mass rebuild for javapackages-tools 201902
-
-* Fri Oct 25 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-5
- Switch to OpenJDK 11 as default JDK
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-8
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-7
- Rebuilt for Python 3.8
-
-* Sun Aug 11 2019 Fabio Valentini <decathorpe@gmail.com> - 5.3.0-6
- Disable gradle support by default.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-4
- Enable namespaced dependency generation
-
-* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-3
- Don't ignore duplicate metadata in namespaced modules
-
-* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-2
- Introduce javapackages-config-maven-3.6
-
-* Fri Jun 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-1
- Update to upstream version 5.3.1
-
-* Mon Jun 10 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-7
- Define maven-3.6 install repository
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-6
- Mass rebuild for javapackages-tools 201901
-
-* Thu Apr 25 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-5
- Move python modules under java-utils directory
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Nov 20 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-3
- Make it possible to build SRPM without python-devel installed
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.3.0-2
+- Rebuilt for MSVSphere 8.8

 * Thu Oct  4 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-2
 - Make javapackages-local require Python interpreter executable path