diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e478f58 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/5.3.1.tar.gz diff --git a/.javapackages-tools.metadata b/.javapackages-tools.metadata new file mode 100644 index 0000000..55d953f --- /dev/null +++ b/.javapackages-tools.metadata @@ -0,0 +1 @@ +4814361a6ea3fd5d427be7a3110c84cee621ed2f SOURCES/5.3.1.tar.gz diff --git a/SOURCES/0001-Move-python-modules-under-java-utils-directory.patch b/SOURCES/0001-Move-python-modules-under-java-utils-directory.patch new file mode 100644 index 0000000..b75eb8f --- /dev/null +++ b/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 +Date: Fri, 26 Apr 2019 00:50:00 +0200 +Subject: [PATCH 1/4] 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 + # Michal Srb + ++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 + diff --git a/SOURCES/0002-Enable-namespaced-dependency-generation.patch b/SOURCES/0002-Enable-namespaced-dependency-generation.patch new file mode 100644 index 0000000..3165208 --- /dev/null +++ b/SOURCES/0002-Enable-namespaced-dependency-generation.patch @@ -0,0 +1,48 @@ +From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 28 Jun 2019 14:53:26 +0200 +Subject: [PATCH 2/4] 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 + diff --git a/SOURCES/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/SOURCES/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch new file mode 100644 index 0000000..ac6e799 --- /dev/null +++ b/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 +Date: Mon, 2 Sep 2019 18:10:01 +0200 +Subject: [PATCH 3/4] 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 + diff --git a/SOURCES/0004-test-Don-t-try-to-kill-PID-1-during-tests.patch b/SOURCES/0004-test-Don-t-try-to-kill-PID-1-during-tests.patch new file mode 100644 index 0000000..0caaf30 --- /dev/null +++ b/SOURCES/0004-test-Don-t-try-to-kill-PID-1-during-tests.patch @@ -0,0 +1,29 @@ +From 16808487796822c5477d1ba0478bd2b0ca884818 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 18 May 2020 09:11:31 +0200 +Subject: [PATCH 4/4] [test] Don't try to kill PID 1 during tests + +Normally PID 1 should not be killable, but when running tests in +container this is actually possible. +--- + test/test_common.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/test_common.py b/test/test_common.py +index 9bdc4675..67370422 100644 +--- a/test/test_common.py ++++ b/test/test_common.py +@@ -163,8 +163,8 @@ def call_rpmgen(rpmgen_name, filelist_prefix, filelist, env=None, + except OSError: + pass + for line in stdin: +- # FIXME this PID is a temporary hack +- ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", "1"], ++ _, dummy_pid, _ = util.execute_command("echo $$") ++ ret = call_script(scriptpath, ["--cachedir", "/tmp", "--rpm-pid", dummy_pid], + stdin=line, extra_env=env) + try: + shutil.rmtree("/tmp/.javapackages_cache/") +-- +2.25.4 + diff --git a/SOURCES/javapackages-config.json b/SOURCES/javapackages-config.json new file mode 100644 index 0000000..28f6648 --- /dev/null +++ b/SOURCES/javapackages-config.json @@ -0,0 +1,19 @@ +{ + "maven.req": { + "always_generate": [ + "javapackages-filesystem", + "(java-headless or java-11-headless)" + ], + "java_requires": { + "skip": true + }, + "java_devel_requires": { + "skip": true + } + }, + "javadoc.req": { + "always_generate": [ + "javapackages-filesystem" + ] + } +} diff --git a/SOURCES/module-config.xml b/SOURCES/module-config.xml new file mode 100644 index 0000000..0ec7dfa --- /dev/null +++ b/SOURCES/module-config.xml @@ -0,0 +1,29 @@ + + + false + + + + + {*} + + + @{mns}/@1 + + + + + + install-@{mns} + compound + + @{mns} + + + + base-install + + + + + diff --git a/SOURCES/toolchains-openjdk8.xml b/SOURCES/toolchains-openjdk8.xml new file mode 100644 index 0000000..25d130f --- /dev/null +++ b/SOURCES/toolchains-openjdk8.xml @@ -0,0 +1,11 @@ + + + jdk + + xmvn + + + /usr/lib/jvm/java-1.8.0-openjdk + + + diff --git a/SPECS/javapackages-tools.spec b/SPECS/javapackages-tools.spec new file mode 100644 index 0000000..e54b23a --- /dev/null +++ b/SPECS/javapackages-tools.spec @@ -0,0 +1,870 @@ +# 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 + +%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 %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk +%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk + +Name: javapackages-tools +Version: 5.3.1 +Release: 11%{?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 +Source1: module-config.xml +Source2: toolchains-openjdk8.xml +Source3: javapackages-config.json + +Patch1: 0001-Move-python-modules-under-java-utils-directory.patch +Patch2: 0002-Enable-namespaced-dependency-generation.patch +Patch3: 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +Patch4: 0004-test-Don-t-try-to-kill-PID-1-during-tests.patch + +BuildRequires: coreutils +BuildRequires: which +BuildRequires: make +BuildRequires: %{python_prefix}-devel +BuildRequires: %{python_prefix}-lxml +BuildRequires: %{python_prefix}-setuptools +BuildRequires: %{python_prefix}-nose +BuildRequires: %{python_prefix}-six + +Requires: javapackages-filesystem = %{version}-%{release} +Requires: coreutils +Requires: findutils +Requires: which +# default JRE +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 + +%description +This package provides macros and scripts to support Java packaging. + +%package -n javapackages-filesystem +Summary: Java packages filesystem layout +Provides: eclipse-filesystem = %{version}-%{release} + +%description -n javapackages-filesystem +This package provides some basic directories into which Java packages +install their content. + +%package -n maven-local +Summary: Macros and scripts for Maven packaging support +Requires: %{name} = %{version}-%{release} +Requires: javapackages-local = %{version}-%{release} +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) +Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) +Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) + +%description -n maven-local +This package provides macros and scripts to support packaging Maven artifacts. + + +%package -n ivy-local +Summary: Local mode for Apache Ivy +Requires: %{name} = %{version}-%{release} +Requires: javapackages-local = %{version}-%{release} +Requires: apache-ivy >= 2.3.0-8 +Requires: xmvn-connector-ivy + +%description -n ivy-local +This package implements local mode for Apache Ivy, which allows +artifact resolution using XMvn resolver. + +%package -n javapackages-local +Summary: Non-essential macros and scripts 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-11-openjdk-devel +Requires: %{python_interpreter} +Requires: %{python_prefix}-lxml +Requires: %{python_prefix}-six +Obsoletes: %{python_prefix}-javapackages < %{version}-%{release} +Obsoletes: python-javapackages < %{version}-%{release} + +%description -n javapackages-local +This package provides non-essential macros and scripts to support Java packaging. + +%package -n javapackages-config-maven-3.6 +Summary: Configuration files for building maven-3.6 module + +%description -n javapackages-config-maven-3.6 +This package provides configuration files for building maven-3.6 module. + +%package -n maven-local-openjdk8 +Summary: OpenJDK 8 toolchain for XMvn +Requires: maven-local +Requires: java-1.8.0-openjdk-devel + +%description -n maven-local-openjdk8 +OpenJDK 8 toolchain for XMvn + +%prep +%setup -q -n javapackages-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +sed -i '/^manpage /d' build +sed -i '/${mandir}/d' install + +%build +%configure --pyinterpreter=%{python_interpreter} \ + --default_jdk=%{default_jdk} --default_jre=%{default_jre} \ + --rpmmacrodir=%{rpmmacrodir} +./build + +%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 + +mkdir -p %{buildroot}%{_datadir}/xmvn/conf/ +cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml + +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json + +%check +./check + +%files -f files-tools + +%files -n javapackages-filesystem -f files-filesystem + +%files -n javapackages-local -f files-local +%{_javadir}-utils/javapackages/ +%license LICENSE + +%files -n maven-local + +%files -n ivy-local -f files-ivy + +%files -n javapackages-config-maven-3.6 +%{_datadir}/xmvn/config.d + +%files -n maven-local-openjdk8 +%{_datadir}/xmvn/conf + +%changelog +* Thu Jul 02 2020 Marian Koncek - 5.3.1-11 +- Drop temporary Java 11 provides + +* Tue Jun 23 2020 Marian Koncek - 5.3.1-10 +- Undo drop temporary Java 11 provides + +* Thu May 28 2020 Marian Koncek - 5.3.1-9 +- Drop temporary Java 11 provides + +* Mon May 25 2020 Marian Koncek - 5.3.1-8 +- Make built packages require JDK 8 or 11 + +* Thu Jan 23 2020 Mikolaj Izdebski - 5.3.1-7 +- Add OpenJDK 8 toolchain configuration + +* Tue Nov 05 2019 Mikolaj Izdebski - 5.3.1-6 +- Mass rebuild for javapackages-tools 201902 + +* Fri Oct 25 2019 Mikolaj Izdebski - 5.3.1-5 +- Switch to OpenJDK 11 as default JDK + +* Fri Jun 28 2019 Mikolaj Izdebski - 5.3.1-4 +- Enable namespaced dependency generation + +* Fri Jun 28 2019 Mikolaj Izdebski - 5.3.1-3 +- Don't ignore duplicate metadata in namespaced modules + +* Fri Jun 28 2019 Mikolaj Izdebski - 5.3.1-2 +- Introduce javapackages-config-maven-3.6 + +* Fri Jun 14 2019 Mikolaj Izdebski - 5.3.1-1 +- Update to upstream version 5.3.1 + +* Mon Jun 10 2019 Mikolaj Izdebski - 5.3.0-7 +- Define maven-3.6 install repository + +* Fri May 24 2019 Mikolaj Izdebski - 5.3.0-6 +- Mass rebuild for javapackages-tools 201901 + +* Thu Apr 25 2019 Mikolaj Izdebski - 5.3.0-5 +- Move python modules under java-utils directory + +* Fri Feb 01 2019 Fedora Release Engineering - 5.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 20 2018 Mikolaj Izdebski - 5.3.0-3 +- Make it possible to build SRPM without python-devel installed + +* Thu Oct 4 2018 Mikolaj Izdebski - 5.3.0-2 +- Make javapackages-local require Python interpreter executable path + +* Mon Aug 06 2018 Michael Simacek - 5.3.0-1 +- Update to upstream version 5.3.0 + +* Thu Aug 2 2018 Mikolaj Izdebski - 5.2.0-6 +- Switch auto-requires generator to javapackages-filesystem + +* Fri Jul 13 2018 Fedora Release Engineering - 5.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 5.2.0-4 +- Rebuilt for Python 3.7 + +* Mon Jun 25 2018 Michael Simacek - 5.2.0-3 +- Disable bytecode compilation outside of site-packages + +* Wed Jun 20 2018 Mikolaj Izdebski - 5.2.0-2 +- Fix running tests on Python 3.7 + +* Tue Jun 19 2018 Miro Hrončok - 5.2.0-2 +- Rebuilt for Python 3.7 + +* Tue Jun 5 2018 Mikolaj Izdebski - 5.2.0-1 +- Update to upstream version 5.2.0 + +* Tue May 15 2018 Mikolaj Izdebski - 5.1.0-1 +- Update to upstream version 5.1.0 +- Introduce javapackages-filesystem package + +* Wed May 02 2018 Michael Simacek - 5.0.0-13 +- Backport abrt-java-connector changes + +* Fri Feb 09 2018 Igor Gnatenko - 5.0.0-12 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 5.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 09 2018 Merlin Mathesius - 5.0.0-10 +- Cleanup spec file conditionals + +* Sat Sep 23 2017 Mikolaj Izdebski - 5.0.0-9 +- Conditionally allow building without asciidoc + +* Thu Sep 7 2017 Mikolaj Izdebski - 5.0.0-8 +- Allow manpages to be either compressed or not + +* Thu Aug 17 2017 Michael Simacek - 5.0.0-7 +- Fix traceback on corrupt zipfile +- Resolves: rhbz#1481005 + +* Wed Jul 26 2017 Fedora Release Engineering - 5.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 10 2017 Mikolaj Izdebski - 5.0.0-5 +- Conditionalize use of XMvn Javadoc MOJO + +* Mon Jul 03 2017 Michael Simacek - 5.0.0-4 +- Fix default JRE path + +* Mon Jul 03 2017 Michael Simacek - 5.0.0-3 +- Don't use xmvn javadoc for now + +* Wed Jun 21 2017 Mikolaj Izdebski - 5.0.0-2 +- Re-add dist-tag + +* Wed Jun 21 2017 Michael Simacek - 5.0.0-2 +- Remove xmvn version requirement + +* Wed Jun 21 2017 Michael Simacek - 5.0.0-1 +- Update to upstream version 5.0.0 + +* Tue Mar 14 2017 Michael Simacek - 4.7.0-16 +- Force locale in test to fix failures + +* Fri Feb 10 2017 Fedora Release Engineering - 4.7.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 4.7.0-14 +- Fix build without gradle + +* Tue Jan 31 2017 Mikolaj Izdebski - 4.7.0-13 +- Allow to conditionally build without gradle + +* Tue Dec 20 2016 Mikolaj Izdebski - 4.7.0-12 +- Non-bootstrap build + +* Tue Dec 20 2016 Mikolaj Izdebski - 4.7.0-11 +- Port to Python 3.6 + +* Mon Dec 19 2016 Miro Hrončok - 4.7.0-10 +- Rebuild for Python 3.6 + +* Fri Nov 18 2016 Mikolaj Izdebski - 4.7.0-9 +- Add Requires on which +- Resolves: rhbz#1396395 + +* Mon Oct 3 2016 Mikolaj Izdebski - 4.7.0-8 +- Fix generation of versioned OSGi requires + +* Tue Sep 06 2016 Michael Simacek - 4.7.0-7 +- Remove docs, which were split into java-packaging-howto + +* Tue Jul 19 2016 Fedora Release Engineering - 4.7.0-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 29 2016 Mikolaj Izdebski - 4.7.0-5 +- Remove requires on maven-enforcer-plugin + +* Tue Jun 28 2016 Mikolaj Izdebski - 4.7.0-4 +- Require xmvn-minimal instead of full xmvn + +* Wed Jun 15 2016 Mikolaj Izdebski - 4.7.0-3 +- Drop requires on most of parent POMs + +* Thu Mar 31 2016 Michal Srb - 4.7.0-2 +- Add R: findutils (Resolves: rhbz#1321401, thanks Tatsuyuki Ishi) + +* Fri Mar 04 2016 Michal Srb - 4.7.0-1 +- Update to 4.7.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 4.6.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 4 2016 Mikolaj Izdebski - 4.6.0-12 +- Move mvn_build and builddep to javapackages-local +- Resolves: rhbz#1290399 + +* Wed Nov 11 2015 Kalev Lember - 4.6.0-11 +- Disable bootstrap + +* Wed Nov 11 2015 Kalev Lember - 4.6.0-10 +- Add bootstrap macro (#1280209) +- Enable bootstrap for Python 3.5 rebuilds + +* Tue Nov 10 2015 Fedora Release Engineering - 4.6.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Oct 28 2015 Mikolaj Izdebski - 4.6.0-8 +- Backport %%gradle_build macro from 4.7.0-SNAPSHOT + +* Mon Oct 19 2015 Mikolaj Izdebski - 4.6.0-7 +- Don't generate requires on java-headless +- Resolves: rhbz#1272145 + +* Tue Jul 14 2015 Mikolaj Izdebski - 4.6.0-6 +- Use %%license macro + +* Fri Jul 10 2015 Mikolaj Izdebski - 4.6.0-5 +- Add requires on java-devel to javapackages-local + +* Tue Jun 30 2015 Mikolaj Izdebski - 4.6.0-4 +- Remove jpackage-utils obsoletes + +* Mon Jun 22 2015 Michal Srb - 4.6.0-3 +- Rebuild to fix provides + +* Wed Jun 17 2015 Fedora Release Engineering - 4.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jun 15 2015 Michal Srb - 4.6.0-1 +- Update to upstream version 4.6.0 + +* Thu Apr 23 2015 Michal Srb - 4.5.0-3 +- Fix "UnboundLocalError: local variable 'pom_requires' referenced before assignment" + +* Tue Apr 21 2015 Michael Simacek - 4.5.0-2 +- Remove fedora-review-plugin-java subpackage + +* Thu Apr 09 2015 Michal Srb - 4.5.0-1 +- Update to upstream version 4.5.0 + +* Wed Apr 1 2015 Mikolaj Izdebski - 4.4.0-4 +- Remove requires on plexus-tools-pom + +* Tue Mar 24 2015 Michael Simacek - 4.4.0-3 +- Handle non-utf-8 poms in pom_editor + +* Mon Feb 16 2015 Michael Simacek - 4.4.0-2 +- Write temporary XML file as UTF-8 in pom_editor + +* Mon Feb 16 2015 Michal Srb - 4.4.0-1 +- Update to upstream version 4.4.0 + +* Fri Feb 13 2015 Michal Srb - 4.3.2-6 +- Fix TypeError in maven_depmap (see: rhbz#1191657) + +* Thu Feb 12 2015 Michael Simacek - 4.3.2-5 +- Workaround for XMvn version bump (rhbz#1191657) + +* Fri Jan 23 2015 Mikolaj Izdebski - 4.3.2-4 +- Add gradle-local subpackage +- Allow conditional builds with tests skipped + +* Mon Jan 19 2015 Mikolaj Izdebski - 4.3.2-3 +- Port to lua 5.3.0 + +* Thu Jan 15 2015 Mikolaj Izdebski - 4.3.2-2 +- Replace all dashes with dots in versioned provides and requires + +* Mon Jan 05 2015 Michal Srb - 4.3.2-1 +- Update to upstream version 4.3.2 +- Fix TypeError in mvn_artifact + +* Tue Dec 23 2014 Mikolaj Izdebski - 4.3.1-1 +- Update to upstream version 4.3.1 + +* Sun Dec 14 2014 Mikolaj Izdebski - 4.3.0-1 +- Update to upstream version 4.3.0 + +* Fri Nov 28 2014 Mikolaj Izdebski - 4.2.0-11 +- Remove dependency on libxslt + +* Fri Nov 28 2014 Mikolaj Izdebski - 4.2.0-10 +- Scan lib64/ in OSGi dep generators +- Related: rhbz#1166156 + +* Wed Nov 26 2014 Mikolaj Izdebski - 4.2.0-9 +- Revert adding namespace support in %%mvn_artifact + +* Mon Nov 24 2014 Michal Srb - 4.2.0-8 +- Add namespace support in %%mvn_artifact + +* Fri Nov 21 2014 Mikolaj Izdebski - 4.2.0-7 +- Fix OSGi provides/requires generation in Java libdir +- Resolves: rhbz#1166156 + +* Wed Nov 12 2014 Michal Srb - 4.2.0-6 +- Fix cache problem (Resolves: rhbz#1155185) + +* Thu Oct 30 2014 Mikolaj Izdebski - 4.2.0-5 +- Use wrapper script to inject ABRT agent JVM argument +- Fix path to ABRT agent DSO +- Resolves: rhbz#1153652 + +* Tue Oct 21 2014 Michael Simacek - 4.2.0-4 +- Fix pom_editor missing space between xmlns declarations + +* Wed Sep 24 2014 Michal Srb - 4.2.0-3 +- Do not generate OSGi R on eclipse-platform + +* Thu Sep 18 2014 Michal Srb - 4.2.0-2 +- Fix mvn_artifact: generate R, if it's not explicitly disabled + +* Thu Jul 24 2014 Michal Srb - 4.2.0-1 +- Update to upstream version 4.2.0 + +* Thu Jul 10 2014 Michal Srb - 4.1.0-2 +- Backport upstream patch for maven.req + +* Mon Jun 23 2014 Michal Srb - 4.1.0-1 +- Update to upstream version 4.1.0 + +* Thu Jun 12 2014 Michal Srb - 4.0.0-8 +- Install man page for pom_change_dep + +* Tue Jun 10 2014 Michal Srb - 4.0.0-7 +- Backport fix for maven.prov + +* Tue Jun 10 2014 Michal Srb - 4.0.0-6 +- Update docs + +* Sat Jun 07 2014 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 30 2014 Michal Srb - 4.0.0-4 +- Backport patch which adds support for "disableEffectivePom" property + +* Thu May 29 2014 Michal Srb - 4.0.0-3 +- Add BR: javapackages-tools + +* Thu May 29 2014 Michal Srb - 4.0.0-2 +- Backport patches for maven.req +- Remove com.sun:tools and sun.jdk:jconsole provides + +* Thu May 29 2014 Michal Srb - 4.0.0-1 +- Update to 4.0.0 + +* Wed May 28 2014 Michal Srb - 3.5.0-9 +- Apply the patch from my previous commit + +* Wed May 28 2014 Michal Srb - 3.5.0-8 +- Generate requires on POM artifacts with "pom" extension + +* Wed Apr 30 2014 Michal Srb - 3.5.0-7 +- Improve support for SCLs + +* Wed Apr 16 2014 Mikolaj Izdebski - 3.5.0-6 +- Add explicit maven-local requires on java-1.8.0-openjdk-devel + +* Thu Mar 27 2014 Michael Simacek - 3.5.0-6 +- Install documentation + +* Mon Feb 24 2014 Stanislav Ochotnicky - 3.5.0-5 +- Backport java-headless patches + +* Mon Feb 10 2014 Michal Srb - 3.5.0-4 +- Add support for installing Maven artifacts with .hpi extension + +* Fri Jan 17 2014 Michael Simacek - 3.5.0-3 +- Use upstream method of running tests (nosetests) + +* Thu Jan 16 2014 Mikolaj Izdebski - 3.5.0-2 +- Add version requirements on xmvn and ivy + +* Thu Jan 16 2014 Mikolaj Izdebski - 3.5.0-1 +- Update to upstream version 3.5.0 +- Add ivy-local subpackage + +* Tue Jan 7 2014 Mikolaj Izdebski - 3.4.2-3 +- Update patch for ZIP files + +* Tue Jan 7 2014 Mikolaj Izdebski - 3.4.2-2 +- Allow ZIP files in %%{_javadir} + +* Thu Dec 05 2013 Michal Srb - 3.4.2-1 +- Update to upstream bugfix release 3.4.2 + +* Wed Dec 4 2013 Mikolaj Izdebski - 3.4.1-3 +- Add Requires on objectweb-pom + +* Tue Nov 19 2013 Stanislav Ochotnicky - 3.4.1-2 +- Do not create parent dirs for pom.properties +- Resolves: rhbz#1031769 + +* Tue Nov 05 2013 Stanislav Ochotnicky - 3.4.1-1 +- Update to upstream bugfix release 3.4.1 + +* Mon Oct 21 2013 Mikolaj Izdebski - 3.4.0-3 +- Fix XMvn configuration for native JNI repos +- Resolves: rhbz#1021608 + +* Mon Oct 14 2013 Mikolaj Izdebski - 3.4.0-2 +- Require exact version of python-javapackages + +* Mon Oct 14 2013 Mikolaj Izdebski - 3.4.0-1 +- Update to upstream version 3.4.0 + +* Wed Oct 2 2013 Mikolaj Izdebski - 3.3.1-1 +- Update to upstream version 3.3.1 +- Remove workaround for sisu-guice no_aop + +* Tue Oct 01 2013 Stanislav Ochotnicky - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Wed Sep 25 2013 Stanislav Ochotnicky - 3.2.4-2 +- Fix installation of artifacts with classifier + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.4-1 +- Update to upstream version 3.2.4 + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.3-1 +- Update to upstream version 3.2.3 + +* Fri Sep 20 2013 Michal Srb - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.1-1 +- Update to upstream version 3.2.1 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.1.2-1 +- Update to upstream version 3.1.2 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Mon Sep 16 2013 Mikolaj Izdebski - 3.0.4-2 +- Add depmap for sun.jdk:jconsole + +* Fri Sep 13 2013 Stanislav Ochotnicky - 3.0.4-1 +- Update to upstream version 3.0.4 + +* Wed Sep 11 2013 Stanislav Ochotnicky - 3.0.3-1 +- Update to upstream version 3.0.3 + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-3 +- Fix a typo in temporary depmap + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-2 +- Make sure we do not provide google guice mapping + +* Tue Sep 10 2013 Stanislav Ochotnicky 3.0.2-1 +- Update to upstream version 3.0.2 +- Add separate python-javapackages subpackage +- Add separate fedora-review-plugin-java subpackage +- Enable part of unit tests + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.2 +- Fix javadoc directory override + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.1 +- Update to upstream pre-release version 3.0.0 + +* Fri Jul 26 2013 Mikolaj Izdebski - 2.0.1-1 +- Update to upstream version 2.0.1 +- Fix creation of artifact aliases, resolves: rhbz#988462 + +* Thu Jul 25 2013 Mikolaj Izdebski - 2.0.0-2 +- Require maven-resources-plugin by maven-local + +* Thu Jul 11 2013 Mikolaj Izdebski - 2.0.0-1 +- Update to upstream version 2.0.0 +- Merge functionality of jpackage-utils +- Provide and obsolete jpackage-utils +- %%add_maven_depmap macro now injects pom.properties to every JAR +- %%add_to_maven_depmap and %%update_maven_depmap macros were removed +- maven2jpp-mapdeps.xsl template has been removed +- Macros related to installation of icons and desktop files were removed +- 14 new manual pages were added +- Documentation specific to JPackage was removed +- Add BuildRequires: asciidoc, xmlto + +* Mon Jul 1 2013 Mikolaj Izdebski - 0.15.0-2 +- Add R: jvnet-parent + +* Wed Jun 5 2013 Mikolaj Izdebski - 0.15.0-1 +- Update to upstream version 0.15.0 +- Added depmap for tools.jar +- Added support for versioned autorequires +- New plugin metadata from Maven Central + +* Tue Jun 4 2013 Stanislav Ochotnicky - 0.14.1-2 +- Add several maven plugins to maven-local requires + +* Wed May 29 2013 Stanislav Ochotnicky - 0.14.1-1 +- Update to upstream version 0.14.1 with disabled debugging + +* Tue Apr 09 2013 Michal Srb - 0.14.0-1 +- Update to upstream version 0.14.0 + +* Mon Apr 8 2013 Mikolaj Izdebski - 0.13.7-2 +- Add R: maven-surefire-provider-junit4 to maven-local + +* Fri Mar 22 2013 Mikolaj Izdebski - 0.13.7-1 +- Update to upstream version 0.13.7 + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-4 +- Add geronimo-parent-poms to common POMs + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-3 +- Add weld-parent to common POMs + +* Wed Mar 20 2013 Stanislav Ochotnicky - 0.13.6-2 +- Fix conditional macro to evaluate properly when fedora is not defined + +* Mon Mar 18 2013 Mikolaj Izdebski - 0.13.6-1 +- Update to upstream version 0.13.6 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.5-1 +- Update to upstream version 0.13.5 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.4-1 +- Update to upstream version 0.13.4 + +* Tue Mar 12 2013 Mikolaj Izdebski - 0.13.3-1 +- Update to upstream version 0.13.3 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.2-1 +- Update to upstream version 0.13.2 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.1-1 +- Update to upstream version 0.13.1 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-1 +- Update to upstream version 0.13.0 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-0.1.git2f13366 +- Upate to upstream pre-release snapshot 2f13366 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0.12.6-1 +- Update to upstream version 0.12.6 +- Resolves: rhbz#917618 (remove jetty orbit provides) +- Resolves: rhbz#917647 (system.bundle into autogenerated deps) + +* Fri Mar 1 2013 Stanislav Ochotnicky - 0.12.5-1 +- Update to upstream version 0.12.5 +- Resolves problems with compat package provides and automatic requires + +* Wed Feb 27 2013 Mikolaj Izdebski - 0.12.4-2 +- Don't mark RPM macro files as configuration + +* Mon Feb 25 2013 Mikolaj Izdebski - 0.12.4-1 +- Update to upstream version 0.12.4 +- Resolves: rhbz#913630 (versioned requires between subpackages) + +* Fri Feb 22 2013 Mikolaj Izdebski - 0.12.3-1 +- Update to upstream version 0.12.3 +- Resolves: rhbz#913694 (No plugin found for prefix 'X') + +* Wed Feb 20 2013 Mikolaj Izdebski - 0.12.2-1 +- Update to upstream version 0.12.2 +- Resolves: rhbz#913120 (MAVEN_OPTS are not passed to Maven) + +* Mon Feb 18 2013 Mikolaj Izdebski - 0.12.1-1 +- Update to upstream version 0.12.1 +- Resolves: rhbz#912333 (M2_HOME is not exported) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.12.0-1 +- Update to upstream version 0.12.0 +- Implement new pom macros: xpath_replace and xpath_set +- Remove Support-local-depmaps.patch (accepted upstream) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.11.2-6 +- Support local depmaps + +* Thu Feb 14 2013 Mikolaj Izdebski - 0.11.2-5 +- Add some maven-local Requires for convenience + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-4 +- Add missing R: httpcomponents-project + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-3 +- Add missing R: jboss-patent + +* Wed Feb 6 2013 Mikolaj Izdebski - 0.11.2-2 +- Don't install mvn-local and mvn-rpmbuild on F18 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.2-1 +- Update to upstream version 0.11.2 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.1-1 +- Update to upstream version 0.11.1 + +* Wed Jan 23 2013 Mikolaj Izdebski - 0.11.0-1 +- Update to upstream version 0.11.0 +- Add mvn-local and mvn-rpmbuild scripts + +* Mon Jan 21 2013 Mikolaj Izdebski - 0.10.1-1 +- Update to upstream version 0.10.1 + +* Mon Jan 7 2013 Mikolaj Izdebski - 0.10.0-1 +- Update to upstream version 0.10.0 +- Implement %%xmvn_alias, %%xmvn_file and %%xmvn_package macros +- Fix regex in osgi.attr +- Add support for pre- and post-goals in mvn-build script + +* Mon Dec 10 2012 Mikolaj Izdebski - 0.9.1-1 +- Update to upstream version 0.9.1 +- Resolves: rhbz#885636 + +* Thu Dec 6 2012 Stanislav Ochotnicky - 0.9.0-1 +- Update to latest upstream version +- Enable maven requires generator for xmvn packages +- Enable requires generator for javadoc packages + +* Wed Dec 5 2012 Stanislav Ochotnicky - 0.8.3-1 +- Update to upstream version 0.8.3 +- Fix maven provides generator for new XML valid fragments + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.2-1 +- Update to upstream version 0.8.2 + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.1-1 +- Update to upstream version 0.8.1 + +* Wed Nov 28 2012 Mikolaj Izdebski - 0.8.0-1 +- Update to upstream version 0.8.0 +- Add xmvn macros + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-3 +- Add BR: jpackage-utils + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-2 +- Add maven-local subpackage + +* Thu Nov 08 2012 Stanislav Ochotnicky - 0.7.5-1 +- Fix versioned pom installation by quoting _jpath + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.4-1 +- Shorten maven filelist filenames + +* Wed Oct 31 2012 Mikolaj Izdebski - 0.7.3-1 +- Update to upstream version 0.7.3 + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.2-1 +- Make sure add_maven_depmap fails when python tracebacks + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.1-1 +- Fix problem with exception in default add_maven_depmap invocation + +* Tue Oct 30 2012 Stanislav Ochotnicky - 0.7.0-1 +- Update to latest upstream +- Full support for compat depmap generation +- Generate maven-files-%%{name} with a list of files to package +- Add support for maven repo generation (alpha version) + +* Mon Jul 30 2012 Stanislav Ochotnicky - 0.6.0-1 +- Update to upstream version 0.6.0 +- Make maven provides versioned +- Add additional pom_ macros to simplify additional pom editing + +* Wed Jul 25 2012 Stanislav Ochotnicky - 0.5.0-1 +- Update to upstream version 0.5.0 - add support for add_maven_depmap -v + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 9 2012 Mikolaj Izdebski - 0.4.1-1 +- Update to upstream version 0.4.1 +- Fixes #837203 + +* Wed Jun 27 2012 Mikolaj Izdebski - 0.4.0-1 +- Update to upstream version 0.4.0 + +* Tue Mar 6 2012 Stanislav Ochotnicky - 0.3.1-1 +- Create maven provides from fragments instead of poms + +* Thu Feb 16 2012 Stanislav Ochotnicky - 0.3.0-3 +- Fix maven_depmap installation + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-2 +- Add conflicts with older jpackage-utils + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-1 +- Initial version split from jpackage-utils