Update to upstream version 6.0.0~alpha

This commit is contained in:
Mikolaj Izdebski 2020-07-29 11:50:25 +02:00
parent 721386b2da
commit 79d1aadf3a
8 changed files with 20 additions and 578 deletions

View File

@ -1,245 +0,0 @@
From 08f57d72cbc458bb39df76f660889eb6c9131579 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/7] 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.26.2

View File

@ -1,48 +0,0 @@
From f0b7a9c2bc2cc30047e8d41383debc2745371079 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/7] 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.26.2

View File

@ -1,67 +0,0 @@
From 5fccf686ca538e620231c424989d800df3534f09 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/7] 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.26.2

View File

@ -1,81 +0,0 @@
From d95ecd520fef469dd40d8fa54955928b82fd30ce Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 29 Jun 2019 12:09:25 +0200
Subject: [PATCH 4/7] Skip execution of various Maven plugins
Resolves: #70
---
configs/configuration.xml | 58 +++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/configs/configuration.xml b/configs/configuration.xml
index b6288fea..4431f25e 100644
--- a/configs/configuration.xml
+++ b/configs/configuration.xml
@@ -1,5 +1,63 @@
<?xml version="1.0" encoding="US-ASCII"?>
<configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/2.0.0">
+ <buildSettings>
+ <skippedPlugins>
+ <!-- Version of Java and bytecode level is always fixed in distro -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ <!-- Static analysis and code style is upstream's business -->
+ <plugin>
+ <groupId>org.codehaus.moj</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.github.spotbug</groupId>
+ <artifactId>spotbugs-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <!-- Code coverage is upstream's business -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.eluder.coveralls</groupId>
+ <artifactId>coveralls-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <!-- Release auditing is upstream's business -->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+ <!-- Cannot code sign in downstream builds -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
+ <!-- Cannot push artifacts to Nexus server -->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ </plugin>
+ </skippedPlugins>
+ </buildSettings>
<resolverSettings>
<metadataRepositories>
<repository>/usr/share/maven-metadata</repository>
--
2.26.2

View File

@ -1,29 +0,0 @@
From 0372ba445718580298dba5e2faaa0946b5313671 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 18 May 2020 09:11:31 +0200
Subject: [PATCH 5/7] 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.26.2

View File

@ -1,28 +0,0 @@
From b96e04f0a19c832e2a37e8d6ee3e85e26874b145 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 16 Jul 2020 16:27:04 +0200
Subject: [PATCH 6/7] [test] Don't use networking during tests
When %_buildhost is not set, RPM will try to call gethostname() and
gethostbyname() to determine it.
---
test/test_rpmbuild.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/test_rpmbuild.py b/test/test_rpmbuild.py
index 8b44fbe9..eebaece2 100644
--- a/test/test_rpmbuild.py
+++ b/test/test_rpmbuild.py
@@ -21,7 +21,8 @@ class Package(object):
"""
def __init__(self, name):
self.__name = name
- self.__macros = [u'%topdir {cwd}/rpmbuild'.format(cwd=os.getcwd())]
+ self.__macros = [u'%topdir {cwd}/rpmbuild'.format(cwd=os.getcwd()),
+ u'%_buildhost testhost']
self.__sources = []
self.__begin = ''
self.__prep = ''
--
2.26.2

View File

@ -1,37 +0,0 @@
From 584f36442e18627f8fd459842cca734fa727c911 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 17 Jul 2020 09:22:41 +0200
Subject: [PATCH 7/7] Add separate subpackage with RPM generators
---
install | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/install b/install
index 9a5f108e..5d233402 100755
--- a/install
+++ b/install
@@ -165,8 +165,6 @@ fi
exec >files-local
-dir "${rpmconfigdir}/fileattrs"
-
inst_exec target/abs2rel "${bindir}"
inst_exec target/xmvn-builddep "${bindir}"
@@ -222,6 +220,11 @@ inst_data target/pom_xpath_remove.7 "${mandir}/man7"
inst_data target/pom_xpath_replace.7 "${mandir}/man7"
inst_data target/pom_xpath_set.7 "${mandir}/man7"
+
+exec >files-generators
+
+dir "${rpmconfigdir}/fileattrs"
+
inst_exec target/maven.prov "${rpmconfigdir}" "maven${scl_suffix}.prov"
inst_exec target/maven.req "${rpmconfigdir}" "maven${scl_suffix}.req"
inst_exec target/osgi.prov "${rpmconfigdir}" "osgi${scl_suffix}.prov"
--
2.26.2

View File

@ -2,47 +2,28 @@
# 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: 9%{?dist}
Version: 6.0.0~alpha
Release: 1%{?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
# git archive --prefix javapackages-6.0.0~alpha/ HEAD | gzip -9nc >6.0.0~alpha.tar.gz
Source0: %{version}.tar.gz
#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-Skip-execution-of-various-Maven-plugins.patch
Patch5: 0005-test-Don-t-try-to-kill-PID-1-during-tests.patch
Patch6: 0006-test-Don-t-use-networking-during-tests.patch
Patch7: 0007-Add-separate-subpackage-with-RPM-generators.patch
BuildRequires: coreutils
BuildRequires: which
BuildRequires: make
@ -50,7 +31,6 @@ 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
@ -114,6 +94,14 @@ Requires: xmvn-connector-ivy
This package implements local mode for Apache Ivy, which allows
artifact resolution using XMvn resolver.
%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-generators = %{version}-%{release}
@ -129,9 +117,8 @@ 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: %{python_prefix}-javapackages = %{version}-%{release}
Requires: %{python_interpreter}
Requires: %{python_prefix}-lxml
Requires: %{python_prefix}-six
%description -n javapackages-generators
RPM dependency generators to support Java packaging.
@ -152,13 +139,6 @@ OpenJDK 8 toolchain for XMvn
%prep
%setup -q -n javapackages-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
sed -i '/^manpage /d' build
sed -i '/${mandir}/d' install
@ -172,13 +152,6 @@ sed -i '/${mandir}/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/
@ -197,8 +170,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%files -n javapackages-filesystem -f files-filesystem
%files -n javapackages-generators -f files-generators
%{_javadir}-utils/javapackages/
%license LICENSE
%files -n javapackages-local -f files-local
@ -214,7 +185,13 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
%files -n maven-local-openjdk8
%{_datadir}/xmvn/conf
%files -n %{python_prefix}-javapackages -f files-python
%license LICENSE
%changelog
* Wed Jul 29 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-1
- Update to upstream version 6.0.0~alpha
* Fri Jul 17 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-9
- Add separate subpackage with RPM generators