.gitignore

@@ -0,0 +1 @@
+SOURCES/5.3.1.tar.gz

.javapackages-tools.metadata

@@ -1 +1 @@
-034466b051c016dd8f185858da82fc5ffe6c72f9 SOURCES/6.1.0.tar.gz
+4814361a6ea3fd5d427be7a3110c84cee621ed2f SOURCES/5.3.1.tar.gz

SOURCES/0001-Move-python-modules-under-java-utils-directory.patch

@@ -0,0 +1,245 @@
+From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 26 Apr 2019 00:50:00 +0200
+Subject: [PATCH 1/3] Move python modules under java-utils directory
+
+---
+ depgenerators/javadoc.req        | 3 +++
+ depgenerators/maven.prov         | 2 ++
+ depgenerators/maven.req          | 2 ++
+ depgenerators/osgi.prov          | 2 ++
+ depgenerators/osgi.req           | 2 ++
+ java-utils/builddep.py           | 2 ++
+ java-utils/maven_depmap.py       | 2 ++
+ java-utils/mvn_alias.py          | 2 ++
+ java-utils/mvn_artifact.py       | 4 +++-
+ java-utils/mvn_build.py          | 2 ++
+ java-utils/mvn_compat_version.py | 2 ++
+ java-utils/mvn_config.py         | 2 ++
+ java-utils/mvn_file.py           | 2 ++
+ java-utils/mvn_package.py        | 2 ++
+ java-utils/pom_editor.py         | 2 ++
+ java-utils/request-artifact.py   | 2 ++
+ 16 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req
+index 4d182e2e..8528ee05 100755
+--- a/depgenerators/javadoc.req
++++ b/depgenerators/javadoc.req
+@@ -32,6 +32,9 @@
+ # Authors:  Michael Simacek <msimacek@redhat.com>
+ #           Michal Srb <msrb@redhat.com>
+ 
++import sys
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.common.config import get_config
+ 
+ config = get_config()
+diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
+index 1448cbf6..c794dbea 100755
+--- a/depgenerators/maven.prov
++++ b/depgenerators/maven.prov
+@@ -34,6 +34,8 @@
+ 
+ import sys
+ import traceback
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.cache.metadata import MetadataCache
+ from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
+ 
+diff --git a/depgenerators/maven.req b/depgenerators/maven.req
+index b3597f78..912d5f98 100755
+--- a/depgenerators/maven.req
++++ b/depgenerators/maven.req
+@@ -37,6 +37,8 @@ import re
+ import sys
+ import traceback
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.common.config import get_config
+ from javapackages.common.util import (kill_parent_process,
+                                       init_rpmgen,
+diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov
+index baef6e48..7ed423a2 100755
+--- a/depgenerators/osgi.prov
++++ b/depgenerators/osgi.prov
+@@ -34,6 +34,8 @@
+ import sys
+ import os
+ import traceback
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.cache.osgi import OSGiCache
+ from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
+ 
+diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
+index 3cb53302..79dcaaa8 100755
+--- a/depgenerators/osgi.req
++++ b/depgenerators/osgi.req
+@@ -34,6 +34,8 @@
+ import sys
+ import os
+ import traceback
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.cache.osgi import OSGiCache
+ from javapackages.common.util import kill_parent_process, init_rpmgen, get_logger
+ 
+diff --git a/java-utils/builddep.py b/java-utils/builddep.py
+index fda36d2d..48d0963d 100644
+--- a/java-utils/builddep.py
++++ b/java-utils/builddep.py
+@@ -33,6 +33,8 @@
+ import optparse
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
+                                          ArtifactValidationException)
+ from javapackages.common.util import args_to_unicode
+diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
+index 92e0ff4c..9f1472a6 100644
+--- a/java-utils/maven_depmap.py
++++ b/java-utils/maven_depmap.py
+@@ -46,6 +46,8 @@ import zipfile
+ from time import gmtime, strftime
+ from copy import deepcopy
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.pom import POM
+ from javapackages.metadata.artifact import MetadataArtifact
+ from javapackages.metadata.alias import MetadataAlias
+diff --git a/java-utils/mvn_alias.py b/java-utils/mvn_alias.py
+index 4979a17a..962a35f0 100644
+--- a/java-utils/mvn_alias.py
++++ b/java-utils/mvn_alias.py
+@@ -33,6 +33,8 @@
+ import optparse
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
+                                          ArtifactValidationException)
+ from javapackages.xmvn.xmvn_config import XMvnConfig
+diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
+index d135adf2..51339d4b 100644
+--- a/java-utils/mvn_artifact.py
++++ b/java-utils/mvn_artifact.py
+@@ -32,6 +32,9 @@
+ 
+ from __future__ import print_function
+ 
++import sys
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.metadata.metadata import Metadata
+ from javapackages.metadata.artifact import MetadataArtifact
+ from javapackages.metadata.dependency import MetadataDependency
+@@ -45,7 +48,6 @@ from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest,
+ from javapackages.common.util import args_to_unicode
+ from javapackages.common.exception import JavaPackagesToolsException
+ 
+-import sys
+ import os
+ import lxml.etree
+ from optparse import OptionParser
+diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
+index 98479962..4d5f54f7 100644
+--- a/java-utils/mvn_build.py
++++ b/java-utils/mvn_build.py
+@@ -37,6 +37,8 @@ import optparse
+ import subprocess
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import Artifact
+ from javapackages.xmvn.xmvn_config import XMvnConfig
+ from javapackages.common.util import args_to_unicode, command_exists
+diff --git a/java-utils/mvn_compat_version.py b/java-utils/mvn_compat_version.py
+index e4afdbd7..d63dcf99 100644
+--- a/java-utils/mvn_compat_version.py
++++ b/java-utils/mvn_compat_version.py
+@@ -33,6 +33,8 @@
+ import optparse
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
+                                          ArtifactValidationException)
+ from javapackages.xmvn.xmvn_config import XMvnConfig
+diff --git a/java-utils/mvn_config.py b/java-utils/mvn_config.py
+index 7597761e..f7930985 100644
+--- a/java-utils/mvn_config.py
++++ b/java-utils/mvn_config.py
+@@ -33,6 +33,8 @@
+ import sys
+ import optparse
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.xmvn.xmvn_config import XMvnConfig
+ from javapackages.common.util import args_to_unicode
+ from javapackages.common.exception import JavaPackagesToolsException
+diff --git a/java-utils/mvn_file.py b/java-utils/mvn_file.py
+index 39d1348f..40ae156e 100644
+--- a/java-utils/mvn_file.py
++++ b/java-utils/mvn_file.py
+@@ -33,6 +33,8 @@
+ import optparse
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
+                                          ArtifactValidationException)
+ from javapackages.xmvn.xmvn_config import XMvnConfig, XMvnConfigException
+diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
+index b74da128..2a2f4619 100644
+--- a/java-utils/mvn_package.py
++++ b/java-utils/mvn_package.py
+@@ -33,6 +33,8 @@
+ import optparse
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.maven.artifact import (Artifact, ArtifactFormatException,
+                                          ArtifactValidationException)
+ from javapackages.xmvn.xmvn_config import XMvnConfig
+diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
+index 82a555b8..6c09665c 100644
+--- a/java-utils/pom_editor.py
++++ b/java-utils/pom_editor.py
+@@ -11,6 +11,8 @@ import io
+ from lxml import etree
+ from os import path
+ from textwrap import dedent
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.common.exception import JavaPackagesToolsException
+ 
+ # all macro fuctions that can be called from external world
+diff --git a/java-utils/request-artifact.py b/java-utils/request-artifact.py
+index 68cb1119..55dfd985 100644
+--- a/java-utils/request-artifact.py
++++ b/java-utils/request-artifact.py
+@@ -35,6 +35,8 @@ from __future__ import print_function
+ 
+ import sys
+ 
++sys.path.insert(0, '/usr/share/java-utils/')
++sys.path.insert(0, '/opt/rh/rh-maven36/root/usr/share/java-utils/')
+ from javapackages.common.mock import (InstallationException, ConnectionException,
+                                       install_maven_artifact)
+ 
+-- 
+2.21.0
+

SOURCES/0002-Enable-namespaced-dependency-generation.patch

@@ -0,0 +1,48 @@
+From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 28 Jun 2019 14:53:26 +0200
+Subject: [PATCH 2/3] Enable namespaced dependency generation
+
+---
+ depgenerators/fileattrs/javadoc.attr | 2 +-
+ depgenerators/fileattrs/maven.attr   | 4 ++--
+ depgenerators/fileattrs/osgi.attr    | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr
+index bdaeffa5..109b8015 100644
+--- a/depgenerators/fileattrs/javadoc.attr
++++ b/depgenerators/fileattrs/javadoc.attr
+@@ -1,3 +1,3 @@
+ %__javadoc_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req
+-%__javadoc_requires_opts %{?scl:--scl %{?scl}}
++%__javadoc_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+ %__javadoc_path	^%{_javadocdir}/.[^/]*$
+diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr
+index 2f722eb1..44644ca5 100644
+--- a/depgenerators/fileattrs/maven.attr
++++ b/depgenerators/fileattrs/maven.attr
+@@ -1,5 +1,5 @@
+ %__maven_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov
+-%__maven_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
++%__maven_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+ %__maven_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req
+-%__maven_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
++%__maven_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+ %__maven_path	^%{_datadir}/maven-metadata/.*
+diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
+index 7c3ea03d..3ccc8b65 100644
+--- a/depgenerators/fileattrs/osgi.attr
++++ b/depgenerators/fileattrs/osgi.attr
+@@ -1,5 +1,5 @@
+ %__osgi_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov
+-%__osgi_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
+-%__osgi_requires	%{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true}
+-%__osgi_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}}
++%__osgi_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
++%__osgi_requires	%{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:true}
++%__osgi_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
+ %__osgi_path	^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
+-- 
+2.21.0
+

SOURCES/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch

@@ -0,0 +1,67 @@
+From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 2 Sep 2019 18:10:01 +0200
+Subject: [PATCH 3/3] Fix use of illegal characters in rpmfc generator names
+
+---
+ configure-base.sh                    |  2 +-
+ depgenerators/fileattrs/javadoc.attr |  6 +++---
+ depgenerators/fileattrs/maven.attr   | 10 +++++-----
+ depgenerators/fileattrs/osgi.attr    | 10 +++++-----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/configure-base.sh b/configure-base.sh
+index dbfc3e05..4b5a9172 100644
+--- a/configure-base.sh
++++ b/configure-base.sh
+@@ -64,5 +64,5 @@ test -z "${default_jdk}" && default_jdk="${jvmdir}/java"
+ test -z "${default_jre}" && default_jre="${jvmdir}/jre"
+ 
+ test -z "${scl_root_relative}" -a -n "${scl_root}" && scl_root_relative=$(sed "s:^/*::" <<<"${scl_root}")
+-scl_suffix="${scl:+.$scl}"
++scl_suffix="${scl:+_${scl//-/_}}"
+ return 0
+diff --git a/depgenerators/fileattrs/javadoc.attr b/depgenerators/fileattrs/javadoc.attr
+index 109b8015..1f3a8475 100644
+--- a/depgenerators/fileattrs/javadoc.attr
++++ b/depgenerators/fileattrs/javadoc.attr
+@@ -1,3 +1,3 @@
+-%__javadoc_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req
+-%__javadoc_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+-%__javadoc_path	^%{_javadocdir}/.[^/]*$
++%__javadoc@{scl_suffix}_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/javadoc@{scl_suffix}.req
++%__javadoc@{scl_suffix}_requires_opts %{?scl:--scl %{scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
++%__javadoc@{scl_suffix}_path	^%{_javadocdir}/.[^/]*$
+diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr
+index 44644ca5..26026658 100644
+--- a/depgenerators/fileattrs/maven.attr
++++ b/depgenerators/fileattrs/maven.attr
+@@ -1,5 +1,5 @@
+-%__maven_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov
+-%__maven_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+-%__maven_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req
+-%__maven_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+-%__maven_path	^%{_datadir}/maven-metadata/.*
++%__maven@{scl_suffix}_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.prov
++%__maven@{scl_suffix}_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
++%__maven@{scl_suffix}_requires	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/maven@{scl_suffix}.req
++%__maven@{scl_suffix}_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
++%__maven@{scl_suffix}_path	^%{_datadir}/maven-metadata/.*
+diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
+index 3ccc8b65..8b0f15f7 100644
+--- a/depgenerators/fileattrs/osgi.attr
++++ b/depgenerators/fileattrs/osgi.attr
+@@ -1,5 +1,5 @@
+-%__osgi_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov
+-%__osgi_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
+-%__osgi_requires	%{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:true}
+-%__osgi_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
+-%__osgi_path	^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
++%__osgi@{scl_suffix}_provides	%{?scl:@{javadir}-utils/scl-enable %{?scl_maven} %{scl} -- }%{_rpmconfigdir}/osgi@{scl_suffix}.prov
++%__osgi@{scl_suffix}_provides_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}}
++%__osgi@{scl_suffix}_requires	%{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:true}
++%__osgi@{scl_suffix}_requires_opts	--cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
++%__osgi@{scl_suffix}_path	^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
+-- 
+2.21.0
+

SOURCES/javapackages-config.json

@@ -1,19 +0,0 @@
-{
-    "maven.req": {
-        "always_generate": [
-            "javapackages-filesystem",
-            "(java-headless or java-17-headless or java-11-headless or java-1.8.0-headless)"
-        ],
-        "java_requires": {
-            "skip": true
-        },
-        "java_devel_requires": {
-            "skip": true
-        }
-    },
-    "javadoc.req": {
-        "always_generate": [
-            "javapackages-filesystem"
-        ]
-    }
-}

SOURCES/module-config.xml

@@ -0,0 +1,29 @@
+<configuration>
+  <resolverSettings>
+    <ignoreDuplicateMetadata>false</ignoreDuplicateMetadata>
+  </resolverSettings>
+  <artifactManagement>
+    <rule>
+      <artifactGlob>
+        <artifactId>{*}</artifactId>
+      </artifactGlob>
+      <files>
+        <file>@{mns}/@1</file>
+      </files>
+    </rule>
+  </artifactManagement>
+  <repositories>
+    <repository>
+      <id>install-@{mns}</id>
+      <type>compound</type>
+      <properties>
+        <namespace>@{mns}</namespace>
+      </properties>
+      <configuration>
+        <repositories>
+          <repository>base-install</repository>
+        </repositories>
+      </configuration>
+    </repository>
+  </repositories>
+</configuration>

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>

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>

SPECS/javapackages-tools.spec

@@ -1,51 +1,66 @@
-%if 0%{?fedora}
+# Don't generate requires on jpackage-utils and java-headless for
-%bcond_without ivy
+# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
-%else
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
-%bcond_with ivy
-%endif
 
+# Disable automatic bytecode compilation for files in java-utils
+# https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
+%global _python_bytecompile_extra 0
+
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global python_prefix python3
 %global python_interpreter %{?__python3}%{!?__python3:dummy}
+%global python_sitelib %{python3_sitelib}
+%else
+%global python_prefix python
+%global python_interpreter %{?__python2}%{!?__python2:dummy}
+%global python_sitelib %{_prefix}/lib/python2.7/site-packages
+%global rpmmacrodir /etc/rpm
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e /python-bytecompile/d)
+%endif
 
-%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
+%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk
-%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
+%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk
-
-%global maven_home %{_datadir}/xmvn
 
 Name:           javapackages-tools
-Version:        6.1.0
+Version:        5.3.1
-Release:        4%{?dist}.alma
+Release:        7%{?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
+Source1:        module-config.xml
+Source2:        toolchains-openjdk8.xml
 
-Source8:        toolchains-openjdk8.xml
+Patch1:         0001-Move-python-modules-under-java-utils-directory.patch
-Source11:       toolchains-openjdk11.xml
+Patch2:         0002-Enable-namespaced-dependency-generation.patch
-Source17:       toolchains-openjdk17.xml
+Patch3:         0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
 
 BuildRequires:  coreutils
 BuildRequires:  which
 BuildRequires:  make
-BuildRequires:  asciidoc
-BuildRequires:  xmlto
-BuildRequires:  lua
 BuildRequires:  %{python_prefix}-devel
 BuildRequires:  %{python_prefix}-lxml
 BuildRequires:  %{python_prefix}-setuptools
-BuildRequires:  %{python_prefix}-pytest
+BuildRequires:  %{python_prefix}-nose
+BuildRequires:  %{python_prefix}-six
 
 Requires:       javapackages-filesystem = %{version}-%{release}
 Requires:       coreutils
 Requires:       findutils
 Requires:       which
 # default JRE
-Requires:       java-17-openjdk-headless
+Requires:       java-11-openjdk-headless
 
 Provides:       jpackage-utils = %{version}-%{release}
+# These could be generated automatically, but then we would need to
+# depend on javapackages-local for dependency generator.
+Provides:       mvn(com.sun:tools) = SYSTEM
+Provides:       mvn(sun.jdk:jconsole) = SYSTEM
+# XXX temp provide
+Provides:       java-headless = 1:11
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -63,7 +78,8 @@ Summary:        Macros and scripts for Maven packaging support
 Requires:       %{name} = %{version}-%{release}
 Requires:       javapackages-local = %{version}-%{release}
 Requires:       xmvn-minimal
-Requires:       mvn(org.fedoraproject.xmvn:xmvn-mojo)
+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)
@@ -74,7 +90,7 @@ Requires:       mvn(org.apache.maven.plugins:maven-surefire-plugin)
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
-%if %{with ivy}
+
 %package -n ivy-local
 Summary:        Local mode for Apache Ivy
 Requires:       %{name} = %{version}-%{release}
@@ -85,83 +101,48 @@ 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
-
-%description -n %{python_prefix}-javapackages
-Module for handling, querying and manipulating of various files for Java
-packaging in Linux distributions
 
 %package -n javapackages-local
 Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-common = %{version}-%{release}
+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-17-openjdk-devel
+Requires:       java-11-openjdk-devel
-Requires:       xmvn-tools
+Requires:       %{python_interpreter}
+Requires:       %{python_prefix}-lxml
+Requires:       %{python_prefix}-six
+Obsoletes:      %{python_prefix}-javapackages < %{version}-%{release}
+Obsoletes:      python-javapackages < %{version}-%{release}
+# XXX temp provide
+Provides:       java-devel = 1:11
 
 %description -n javapackages-local
 This package provides non-essential macros and scripts to support Java packaging.
 
-%package -n javapackages-generators
+%package -n javapackages-config-maven-3.6
-Summary:        RPM dependency generators for Java packaging support
+Summary:        Configuration files for building maven-3.6 module
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{python_prefix}-javapackages = %{version}-%{release}
-Requires:       %{python_interpreter}
 
-%description -n javapackages-generators
+%description -n javapackages-config-maven-3.6
-RPM dependency generators to support Java packaging.
+This package provides configuration files for building maven-3.6 module.
-
-%package -n javapackages-common
-Summary:        Non-essential macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-
-%description -n javapackages-common
-This package provides non-essential, but commonly used macros and
-scripts to support Java packaging.
-
-%package -n javapackages-extra
-Summary:        Rarely-used macros and scripts for Java packaging support
-Requires:       javapackages-generators = %{version}-%{release}
-Requires:       lua
-
-%description -n javapackages-extra
-This package provides rarely-used and obsolete macros and scripts 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
-
 %prep
 %setup -q -n javapackages-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
-sed -i /javapackages-metadata.xml/d install
+sed -i '/^manpage /d' build
+sed -i '/${mandir}/d' install
 
 %build
 %configure --pyinterpreter=%{python_interpreter} \
@@ -172,22 +153,26 @@ sed -i /javapackages-metadata.xml/d install
 %install
 ./install
 
+rm -rf %{buildroot}%{python_sitelib}/javapackages-*.egg-info
+find %{buildroot}%{python_sitelib}/javapackages -name __pycache__ | xargs rm -rf
+mv %{buildroot}%{python_sitelib}/javapackages %{buildroot}%{_javadir}-utils/
+find %{buildroot}%{_javadir}-utils/ -name \*.pyc | xargs rm -f
+find %{buildroot}%{_javadir}-utils/ -name \*.pyo | xargs rm -f
+
+sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava')
 sed -e 's/.[17]$/&*/' -i files-*
 
+mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/
+%if 0%{?_module_build}
+sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml
+%endif
+
 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}%{maven_home}/conf/
+mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
-cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
+cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
-cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
-cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
-
-install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
 
 %check
 ./check
@@ -196,143 +181,21 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n javapackages-filesystem -f files-filesystem
 
-%files -n javapackages-generators -f files-generators
+%files -n javapackages-local -f files-local
-
+%{_javadir}-utils/javapackages/
-%files -n javapackages-common -f files-common
+%license LICENSE
-
-%files -n javapackages-extra -f files-extra
-
-%files -n javapackages-local
 
 %files -n maven-local
 
-%if %{with ivy}
 %files -n ivy-local -f files-ivy
-%endif
+
+%files -n javapackages-config-maven-3.6
+%{_datadir}/xmvn/config.d
 
 %files -n maven-local-openjdk8
-%dir %{maven_home}/conf
+%{_datadir}/xmvn/conf
-%{maven_home}/conf/toolchains.xml-openjdk8
-
-%files -n maven-local-openjdk11
-%dir %{maven_home}/conf
-%{maven_home}/conf/toolchains.xml-openjdk11
-
-%files -n maven-local-openjdk17
-%dir %{maven_home}/conf
-%{maven_home}/conf/toolchains.xml-openjdk17
-
-%files -n %{python_prefix}-javapackages -f files-python
-%license LICENSE
 
 %changelog
-* Mon Apr 10 2023 Eduard Abdullin <eabdullin@almalinux.org> - 6.1.0-4.alma
-- Add generated Requires on multiple versions of java-headless
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul 18 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-3
-- Drop ExclusiveArch
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 6.1.0-2
-- Rebuilt for Drop i686 JDKs
-
-* Thu Jun 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-1
-- Update to upstream version 6.1.0
-
-* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-10
-- Introduce javapackages-extra and javapackages-common subpackages
-- Drop metadata for com.sun:tools and sun.jdk:jconsole
-- Re-enable tests
-- Re-add manpages
-- Drop bootstrap mode
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.0.0-9
-- Rebuilt for Python 3.11
-
-* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-8
-- Install toolchains.xml in correct location in bootstrap mode
-
-* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-7
-- Switch to OpenJDK 17 as default JDK/JRE
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-5
-- Bootstrap build for Maven 3.8.4
-
-* Sun Nov 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-4
-- Uptate ivy-local classpath
-
-* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 6.0.0-3
-- Re-add ivy-local subpackage
-
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-2
-- Implement OpenJDK 11 and 17 toolchains
-
-* Mon Jul 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
-- Update to upstream version 6.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0~alpha-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 14 2021 Sérgio Basto <sergio@serjux.com> - 6.0.0~alpha-8
-- Drop apache-ivy is orphan now
-
-* 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
 
@@ -342,18 +205,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 * 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