From adc564ae92d660f16451939e582168c859da640b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/52] Expand conditionals --- javapackages-tools.spec | 47 ----------------------------------------- 1 file changed, 47 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4a294a5..4fc80e8 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -6,19 +6,8 @@ # https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation %global _python_bytecompile_extra 0 -%bcond_without asciidoc -%bcond_without gradle -%bcond_without tests -%bcond_with xmvn_javadoc - -%if 0%{?fedora} || 0%{?rhel} > 7 %global python_prefix python3 %global python_interpreter %{?__python3}%{!?__python3:dummy} -%else -%global python_prefix python -%global python_interpreter %{?__python2}%{!?__python2:dummy} -%global rpmmacrodir /etc/rpm -%endif %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk %global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk @@ -38,18 +27,10 @@ BuildArch: noarch BuildRequires: coreutils BuildRequires: which BuildRequires: make -%if %{with asciidoc} -BuildRequires: asciidoc -BuildRequires: xmlto -%endif BuildRequires: %{python_prefix}-devel BuildRequires: %{python_prefix}-lxml BuildRequires: %{python_prefix}-setuptools -%if !0%{?_module_build} -# XXX python-nose is not part of any module yet, but it should get -# modularized one day, right? mizdebsk, Sep 2017 BuildRequires: %{python_prefix}-nose -%endif BuildRequires: %{python_prefix}-six Requires: javapackages-filesystem = %{version}-%{release} @@ -88,9 +69,6 @@ Requires: xmvn-connector-aether # sense to explicitly require them in every package built with Maven. Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin) Requires: mvn(org.apache.maven.plugins:maven-jar-plugin) -%if %{without xmvn_javadoc} -Requires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) -%endif Requires: mvn(org.apache.maven.plugins:maven-resources-plugin) Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin) # Tests based on JUnit are very common and JUnit itself is small. @@ -103,18 +81,6 @@ Requires: mvn(org.apache.maven.surefire:surefire-testng) %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. -%if %{with gradle} -%package -n gradle-local -Summary: Local mode for Gradle -Requires: %{name} = %{version}-%{release} -Requires: javapackages-local = %{version}-%{release} -Requires: gradle >= 2.2.1-2 -Requires: xmvn-connector-gradle - -%description -n gradle-local -This package implements local mode for Gradle, which allows artifact -resolution using XMvn resolver. -%endif %package -n ivy-local Summary: Local mode for Apache Ivy @@ -154,10 +120,8 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} -%if %{without asciidoc} sed -i '/^manpage /d' build sed -i '/${mandir}/d' install -%endif %build %configure --pyinterpreter=%{python_interpreter} \ @@ -168,23 +132,15 @@ sed -i '/${mandir}/d' install %install ./install -%if %{with xmvn_javadoc} sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava') -%endif sed -e 's/.[17]$/&*/' -i files-* -%if %{without gradle} rm -rf %{buildroot}%{_bindir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 -%endif -%if %{with tests} -%if !0%{?_module_build} %check ./check -%endif -%endif %files -f files-tools @@ -194,9 +150,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n maven-local -%if %{with gradle} -%files -n gradle-local -f files-gradle -%endif %files -n ivy-local -f files-ivy From e1a5e8dad3bf2f91eb42292e65f2e6eec7f3c1aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:55:39 +0000 Subject: [PATCH 02/52] Remove Obsoletes --- javapackages-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4fc80e8..37c6468 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -51,7 +51,6 @@ This package provides macros and scripts to support Java packaging. %package -n javapackages-filesystem Summary: Java packages filesystem layout -Obsoletes: eclipse-filesystem < 2 Provides: eclipse-filesystem = %{version}-%{release} %description -n javapackages-filesystem @@ -97,7 +96,6 @@ artifact resolution using XMvn resolver. Summary: Module for handling various files for Java packaging Requires: %{python_prefix}-lxml Requires: %{python_prefix}-six -Obsoletes: python-javapackages < %{version}-%{release} %description -n %{python_prefix}-javapackages Module for handling, querying and manipulating of various files for Java From 73b3480fed45189782d5a7257ab88292bdc92026 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Apr 2019 23:08:21 +0000 Subject: [PATCH 03/52] Move python modules under java-utils directory --- ...n-modules-under-java-utils-directory.patch | 229 ++++++++++++++++++ javapackages-tools.spec | 34 +-- 2 files changed, 249 insertions(+), 14 deletions(-) create mode 100644 0001-Move-python-modules-under-java-utils-directory.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch new file mode 100644 index 0000000..c82cd25 --- /dev/null +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -0,0 +1,229 @@ +From 2311bfd80763c32937901ee5c638bbdc68a6357a Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 26 Apr 2019 00:50:00 +0200 +Subject: [PATCH] Move python modules under java-utils directory + +--- + depgenerators/javadoc.req | 2 ++ + depgenerators/maven.prov | 1 + + depgenerators/maven.req | 1 + + depgenerators/osgi.prov | 1 + + depgenerators/osgi.req | 1 + + java-utils/builddep.py | 1 + + java-utils/maven_depmap.py | 1 + + java-utils/mvn_alias.py | 1 + + java-utils/mvn_artifact.py | 3 ++- + java-utils/mvn_build.py | 1 + + java-utils/mvn_compat_version.py | 1 + + java-utils/mvn_config.py | 1 + + java-utils/mvn_file.py | 1 + + java-utils/mvn_package.py | 1 + + java-utils/pom_editor.py | 1 + + java-utils/request-artifact.py | 1 + + 16 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req +index 4d182e2e..b300410c 100755 +--- a/depgenerators/javadoc.req ++++ b/depgenerators/javadoc.req +@@ -32,6 +32,8 @@ + # Authors: Michael Simacek + # Michal Srb + ++import sys ++sys.path.insert(0, '/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..da67d896 100755 +--- a/depgenerators/maven.prov ++++ b/depgenerators/maven.prov +@@ -34,6 +34,7 @@ + + import sys + import traceback ++sys.path.insert(0, '/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..00aede89 100755 +--- a/depgenerators/maven.req ++++ b/depgenerators/maven.req +@@ -37,6 +37,7 @@ import re + import sys + import traceback + ++sys.path.insert(0, '/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..20fc3ff2 100755 +--- a/depgenerators/osgi.prov ++++ b/depgenerators/osgi.prov +@@ -34,6 +34,7 @@ + import sys + import os + import traceback ++sys.path.insert(0, '/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..5278c6f9 100755 +--- a/depgenerators/osgi.req ++++ b/depgenerators/osgi.req +@@ -34,6 +34,7 @@ + import sys + import os + import traceback ++sys.path.insert(0, '/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..475e1bd2 100644 +--- a/java-utils/builddep.py ++++ b/java-utils/builddep.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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 70c1fcf2..3a8317fa 100644 +--- a/java-utils/maven_depmap.py ++++ b/java-utils/maven_depmap.py +@@ -46,6 +46,7 @@ import zipfile + from time import gmtime, strftime + from copy import deepcopy + ++sys.path.insert(0, '/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..542ac204 100644 +--- a/java-utils/mvn_alias.py ++++ b/java-utils/mvn_alias.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..386bda36 100644 +--- a/java-utils/mvn_artifact.py ++++ b/java-utils/mvn_artifact.py +@@ -32,6 +32,8 @@ + + from __future__ import print_function + ++import sys ++sys.path.insert(0, '/usr/share/java-utils/') + from javapackages.metadata.metadata import Metadata + from javapackages.metadata.artifact import MetadataArtifact + from javapackages.metadata.dependency import MetadataDependency +@@ -45,7 +47,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..1723e2d0 100644 +--- a/java-utils/mvn_build.py ++++ b/java-utils/mvn_build.py +@@ -37,6 +37,7 @@ import optparse + import subprocess + import sys + ++sys.path.insert(0, '/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..6ad96d9b 100644 +--- a/java-utils/mvn_compat_version.py ++++ b/java-utils/mvn_compat_version.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..2f88735a 100644 +--- a/java-utils/mvn_config.py ++++ b/java-utils/mvn_config.py +@@ -33,6 +33,7 @@ + import sys + import optparse + ++sys.path.insert(0, '/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..7526f95c 100644 +--- a/java-utils/mvn_file.py ++++ b/java-utils/mvn_file.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..01d9ddda 100644 +--- a/java-utils/mvn_package.py ++++ b/java-utils/mvn_package.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..bc144f43 100644 +--- a/java-utils/pom_editor.py ++++ b/java-utils/pom_editor.py +@@ -11,6 +11,7 @@ import io + from lxml import etree + from os import path + from textwrap import dedent ++sys.path.insert(0, '/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..542e538e 100644 +--- a/java-utils/request-artifact.py ++++ b/java-utils/request-artifact.py +@@ -35,6 +35,7 @@ from __future__ import print_function + + import sys + ++sys.path.insert(0, '/usr/share/java-utils/') + from javapackages.common.mock import (InstallationException, ConnectionException, + install_maven_artifact) + +-- +2.21.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 37c6468..8f4300d 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Macros and scripts for Java packaging support @@ -22,6 +22,8 @@ License: BSD URL: https://github.com/fedora-java/javapackages Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz +Patch0: 0001-Move-python-modules-under-java-utils-directory.patch + BuildArch: noarch BuildRequires: coreutils @@ -92,15 +94,6 @@ 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 -Requires: %{python_prefix}-six - -%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: %{name} = %{version}-%{release} @@ -109,14 +102,18 @@ Requires: xmvn-subst Requires: xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-1.8.0-openjdk-devel -Requires: %{python_prefix}-javapackages = %{version}-%{release} Requires: %{python_interpreter} +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. %prep %setup -q -n javapackages-%{version} +%patch0 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -130,6 +127,10 @@ sed -i '/${mandir}/d' install %install ./install +rm -rf %{buildroot}%{python3_sitelib}/javapackages-*.egg-info +find %{buildroot}%{python3_sitelib}/javapackages -name __pycache__ | xargs rm -rf +mv %{buildroot}%{python3_sitelib}/javapackages %{buildroot}%{_javadir}-utils/ + sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava') sed -e 's/.[17]$/&*/' -i files-* @@ -145,16 +146,21 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %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 %{python_prefix}-javapackages -f files-python -%license LICENSE - %changelog +* 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 From 67b04ef87053cc153d25a7c46cf9689200a5957a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:46 +0200 Subject: [PATCH 04/52] Mass rebuild for javapackages-tools 201901 --- javapackages-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 8f4300d..cd7f268 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Macros and scripts for Java packaging support @@ -155,6 +155,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n ivy-local -f files-ivy %changelog +* 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 From 27c82b2e8c559cce256c72ab5e91d88a5423438b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 10 Jun 2019 11:41:06 +0200 Subject: [PATCH 05/52] Define maven-3.6 install repository --- ...n-modules-under-java-utils-directory.patch | 2 +- ...-Define-maven-3.6-install-repository.patch | 34 +++++++++++++++++++ javapackages-tools.spec | 7 +++- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 0002-Define-maven-3.6-install-repository.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index c82cd25..604ffad 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,7 +1,7 @@ From 2311bfd80763c32937901ee5c638bbdc68a6357a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH] Move python modules under java-utils directory +Subject: [PATCH 1/2] Move python modules under java-utils directory --- depgenerators/javadoc.req | 2 ++ diff --git a/0002-Define-maven-3.6-install-repository.patch b/0002-Define-maven-3.6-install-repository.patch new file mode 100644 index 0000000..5e03834 --- /dev/null +++ b/0002-Define-maven-3.6-install-repository.patch @@ -0,0 +1,34 @@ +From ef93d0816c49e1e2c1239b82ec9c7a5f862e962e Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 10 Jun 2019 11:37:08 +0200 +Subject: [PATCH 2/2] Define maven-3.6 install repository + +--- + configs/configuration.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/configs/configuration.xml b/configs/configuration.xml +index b6288fea..e0b790ed 100644 +--- a/configs/configuration.xml ++++ b/configs/configuration.xml +@@ -135,5 +135,17 @@ + + + ++ ++ install-maven-3.6 ++ compound ++ ++ maven-3.6 ++ ++ ++ ++ base-install ++ ++ ++ + + +-- +2.21.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index cd7f268..23d1217 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Macros and scripts for Java packaging support @@ -23,6 +23,7 @@ URL: https://github.com/fedora-java/javapackages Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Patch0: 0001-Move-python-modules-under-java-utils-directory.patch +Patch1: 0002-Define-maven-3.6-install-repository.patch BuildArch: noarch @@ -114,6 +115,7 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -155,6 +157,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n ivy-local -f files-ivy %changelog +* 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 From df92678057d3e79afc7c081bae0193cd660454c1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Jun 2019 12:28:39 +0200 Subject: [PATCH 06/52] Update to upstream version 5.3.1 --- .gitignore | 1 + ...n-modules-under-java-utils-directory.patch | 229 ------------------ ...-Define-maven-3.6-install-repository.patch | 34 --- javapackages-tools.spec | 25 +- module-config.xml | 16 ++ sources | 2 +- 6 files changed, 32 insertions(+), 275 deletions(-) delete mode 100644 0001-Move-python-modules-under-java-utils-directory.patch delete mode 100644 0002-Define-maven-3.6-install-repository.patch create mode 100644 module-config.xml diff --git a/.gitignore b/.gitignore index cce35e8..3fc8563 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /5.1.0.tar.gz /5.2.0.tar.gz /5.3.0.tar.gz +/5.3.1.tar.gz diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch deleted file mode 100644 index 604ffad..0000000 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 2311bfd80763c32937901ee5c638bbdc68a6357a Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH 1/2] Move python modules under java-utils directory - ---- - depgenerators/javadoc.req | 2 ++ - depgenerators/maven.prov | 1 + - depgenerators/maven.req | 1 + - depgenerators/osgi.prov | 1 + - depgenerators/osgi.req | 1 + - java-utils/builddep.py | 1 + - java-utils/maven_depmap.py | 1 + - java-utils/mvn_alias.py | 1 + - java-utils/mvn_artifact.py | 3 ++- - java-utils/mvn_build.py | 1 + - java-utils/mvn_compat_version.py | 1 + - java-utils/mvn_config.py | 1 + - java-utils/mvn_file.py | 1 + - java-utils/mvn_package.py | 1 + - java-utils/pom_editor.py | 1 + - java-utils/request-artifact.py | 1 + - 16 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req -index 4d182e2e..b300410c 100755 ---- a/depgenerators/javadoc.req -+++ b/depgenerators/javadoc.req -@@ -32,6 +32,8 @@ - # Authors: Michael Simacek - # Michal Srb - -+import sys -+sys.path.insert(0, '/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..da67d896 100755 ---- a/depgenerators/maven.prov -+++ b/depgenerators/maven.prov -@@ -34,6 +34,7 @@ - - import sys - import traceback -+sys.path.insert(0, '/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..00aede89 100755 ---- a/depgenerators/maven.req -+++ b/depgenerators/maven.req -@@ -37,6 +37,7 @@ import re - import sys - import traceback - -+sys.path.insert(0, '/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..20fc3ff2 100755 ---- a/depgenerators/osgi.prov -+++ b/depgenerators/osgi.prov -@@ -34,6 +34,7 @@ - import sys - import os - import traceback -+sys.path.insert(0, '/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..5278c6f9 100755 ---- a/depgenerators/osgi.req -+++ b/depgenerators/osgi.req -@@ -34,6 +34,7 @@ - import sys - import os - import traceback -+sys.path.insert(0, '/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..475e1bd2 100644 ---- a/java-utils/builddep.py -+++ b/java-utils/builddep.py -@@ -33,6 +33,7 @@ - import optparse - import sys - -+sys.path.insert(0, '/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 70c1fcf2..3a8317fa 100644 ---- a/java-utils/maven_depmap.py -+++ b/java-utils/maven_depmap.py -@@ -46,6 +46,7 @@ import zipfile - from time import gmtime, strftime - from copy import deepcopy - -+sys.path.insert(0, '/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..542ac204 100644 ---- a/java-utils/mvn_alias.py -+++ b/java-utils/mvn_alias.py -@@ -33,6 +33,7 @@ - import optparse - import sys - -+sys.path.insert(0, '/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..386bda36 100644 ---- a/java-utils/mvn_artifact.py -+++ b/java-utils/mvn_artifact.py -@@ -32,6 +32,8 @@ - - from __future__ import print_function - -+import sys -+sys.path.insert(0, '/usr/share/java-utils/') - from javapackages.metadata.metadata import Metadata - from javapackages.metadata.artifact import MetadataArtifact - from javapackages.metadata.dependency import MetadataDependency -@@ -45,7 +47,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..1723e2d0 100644 ---- a/java-utils/mvn_build.py -+++ b/java-utils/mvn_build.py -@@ -37,6 +37,7 @@ import optparse - import subprocess - import sys - -+sys.path.insert(0, '/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..6ad96d9b 100644 ---- a/java-utils/mvn_compat_version.py -+++ b/java-utils/mvn_compat_version.py -@@ -33,6 +33,7 @@ - import optparse - import sys - -+sys.path.insert(0, '/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..2f88735a 100644 ---- a/java-utils/mvn_config.py -+++ b/java-utils/mvn_config.py -@@ -33,6 +33,7 @@ - import sys - import optparse - -+sys.path.insert(0, '/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..7526f95c 100644 ---- a/java-utils/mvn_file.py -+++ b/java-utils/mvn_file.py -@@ -33,6 +33,7 @@ - import optparse - import sys - -+sys.path.insert(0, '/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..01d9ddda 100644 ---- a/java-utils/mvn_package.py -+++ b/java-utils/mvn_package.py -@@ -33,6 +33,7 @@ - import optparse - import sys - -+sys.path.insert(0, '/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..bc144f43 100644 ---- a/java-utils/pom_editor.py -+++ b/java-utils/pom_editor.py -@@ -11,6 +11,7 @@ import io - from lxml import etree - from os import path - from textwrap import dedent -+sys.path.insert(0, '/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..542e538e 100644 ---- a/java-utils/request-artifact.py -+++ b/java-utils/request-artifact.py -@@ -35,6 +35,7 @@ from __future__ import print_function - - import sys - -+sys.path.insert(0, '/usr/share/java-utils/') - from javapackages.common.mock import (InstallationException, ConnectionException, - install_maven_artifact) - --- -2.21.0 - diff --git a/0002-Define-maven-3.6-install-repository.patch b/0002-Define-maven-3.6-install-repository.patch deleted file mode 100644 index 5e03834..0000000 --- a/0002-Define-maven-3.6-install-repository.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ef93d0816c49e1e2c1239b82ec9c7a5f862e962e Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 10 Jun 2019 11:37:08 +0200 -Subject: [PATCH 2/2] Define maven-3.6 install repository - ---- - configs/configuration.xml | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/configs/configuration.xml b/configs/configuration.xml -index b6288fea..e0b790ed 100644 ---- a/configs/configuration.xml -+++ b/configs/configuration.xml -@@ -135,5 +135,17 @@ - - - -+ -+ install-maven-3.6 -+ compound -+ -+ maven-3.6 -+ -+ -+ -+ base-install -+ -+ -+ - - --- -2.21.0 - diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 23d1217..8d0fb64 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -13,20 +13,16 @@ %global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk Name: javapackages-tools -Version: 5.3.0 -Release: 7%{?dist} - +Version: 5.3.1 +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support - License: BSD URL: https://github.com/fedora-java/javapackages -Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz - -Patch0: 0001-Move-python-modules-under-java-utils-directory.patch -Patch1: 0002-Define-maven-3.6-install-repository.patch - BuildArch: noarch +Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz +Source1: module-config.xml + BuildRequires: coreutils BuildRequires: which BuildRequires: make @@ -114,8 +110,6 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} -%patch0 -p1 -%patch1 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -136,6 +130,11 @@ mv %{buildroot}%{python3_sitelib}/javapackages %{buildroot}%{_javadir}-utils/ 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}/%{mns}/g' %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-config.xml +%endif + rm -rf %{buildroot}%{_bindir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 @@ -144,6 +143,7 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 ./check %files -f files-tools +%{_datadir}/xmvn/config.d %files -n javapackages-filesystem -f files-filesystem @@ -157,6 +157,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n ivy-local -f files-ivy %changelog +* 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 diff --git a/module-config.xml b/module-config.xml new file mode 100644 index 0000000..8319c2e --- /dev/null +++ b/module-config.xml @@ -0,0 +1,16 @@ + + + + install-@{mns} + compound + + @{mns} + + + + base-install + + + + + diff --git a/sources b/sources index cf59247..d1bd78c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.3.0.tar.gz) = 41b5398cd276cf10c1e3ce1a8283ab9ef19df8a2ad19db20553ff31e31d26af9f14bb566574a3ee534a9af2cf1f1626086bf551b4bc6ed12bc0082c46b6b7e98 +SHA512 (5.3.1.tar.gz) = 61558fded5a8c9ed464e2e9637ef0d286e08ebd2e1a68fb71625ff7cca117520672d50fc20ae2335d6ea523fc92459fc49fd9cb034a5427f8035e66ff874a3fb From 73d1642ccfa4e87b7c23b32d4f041ab06bd3ac33 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Jun 2019 14:07:25 +0200 Subject: [PATCH 07/52] Re-add mistakenely removed patch --- ...n-modules-under-java-utils-directory.patch | 229 ++++++++++++++++++ javapackages-tools.spec | 3 + 2 files changed, 232 insertions(+) create mode 100644 0001-Move-python-modules-under-java-utils-directory.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch new file mode 100644 index 0000000..761ab15 --- /dev/null +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -0,0 +1,229 @@ +From 563a9c81f2ee7f2631a40e89ec2897d0af268294 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 26 Apr 2019 00:50:00 +0200 +Subject: [PATCH] Move python modules under java-utils directory + +--- + depgenerators/javadoc.req | 2 ++ + depgenerators/maven.prov | 1 + + depgenerators/maven.req | 1 + + depgenerators/osgi.prov | 1 + + depgenerators/osgi.req | 1 + + java-utils/builddep.py | 1 + + java-utils/maven_depmap.py | 1 + + java-utils/mvn_alias.py | 1 + + java-utils/mvn_artifact.py | 3 ++- + java-utils/mvn_build.py | 1 + + java-utils/mvn_compat_version.py | 1 + + java-utils/mvn_config.py | 1 + + java-utils/mvn_file.py | 1 + + java-utils/mvn_package.py | 1 + + java-utils/pom_editor.py | 1 + + java-utils/request-artifact.py | 1 + + 16 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/depgenerators/javadoc.req b/depgenerators/javadoc.req +index 4d182e2e..b300410c 100755 +--- a/depgenerators/javadoc.req ++++ b/depgenerators/javadoc.req +@@ -32,6 +32,8 @@ + # Authors: Michael Simacek + # Michal Srb + ++import sys ++sys.path.insert(0, '/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..da67d896 100755 +--- a/depgenerators/maven.prov ++++ b/depgenerators/maven.prov +@@ -34,6 +34,7 @@ + + import sys + import traceback ++sys.path.insert(0, '/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..00aede89 100755 +--- a/depgenerators/maven.req ++++ b/depgenerators/maven.req +@@ -37,6 +37,7 @@ import re + import sys + import traceback + ++sys.path.insert(0, '/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..20fc3ff2 100755 +--- a/depgenerators/osgi.prov ++++ b/depgenerators/osgi.prov +@@ -34,6 +34,7 @@ + import sys + import os + import traceback ++sys.path.insert(0, '/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..5278c6f9 100755 +--- a/depgenerators/osgi.req ++++ b/depgenerators/osgi.req +@@ -34,6 +34,7 @@ + import sys + import os + import traceback ++sys.path.insert(0, '/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..475e1bd2 100644 +--- a/java-utils/builddep.py ++++ b/java-utils/builddep.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..65994a9e 100644 +--- a/java-utils/maven_depmap.py ++++ b/java-utils/maven_depmap.py +@@ -46,6 +46,7 @@ import zipfile + from time import gmtime, strftime + from copy import deepcopy + ++sys.path.insert(0, '/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..542ac204 100644 +--- a/java-utils/mvn_alias.py ++++ b/java-utils/mvn_alias.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..386bda36 100644 +--- a/java-utils/mvn_artifact.py ++++ b/java-utils/mvn_artifact.py +@@ -32,6 +32,8 @@ + + from __future__ import print_function + ++import sys ++sys.path.insert(0, '/usr/share/java-utils/') + from javapackages.metadata.metadata import Metadata + from javapackages.metadata.artifact import MetadataArtifact + from javapackages.metadata.dependency import MetadataDependency +@@ -45,7 +47,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..1723e2d0 100644 +--- a/java-utils/mvn_build.py ++++ b/java-utils/mvn_build.py +@@ -37,6 +37,7 @@ import optparse + import subprocess + import sys + ++sys.path.insert(0, '/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..6ad96d9b 100644 +--- a/java-utils/mvn_compat_version.py ++++ b/java-utils/mvn_compat_version.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..2f88735a 100644 +--- a/java-utils/mvn_config.py ++++ b/java-utils/mvn_config.py +@@ -33,6 +33,7 @@ + import sys + import optparse + ++sys.path.insert(0, '/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..7526f95c 100644 +--- a/java-utils/mvn_file.py ++++ b/java-utils/mvn_file.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..01d9ddda 100644 +--- a/java-utils/mvn_package.py ++++ b/java-utils/mvn_package.py +@@ -33,6 +33,7 @@ + import optparse + import sys + ++sys.path.insert(0, '/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..bc144f43 100644 +--- a/java-utils/pom_editor.py ++++ b/java-utils/pom_editor.py +@@ -11,6 +11,7 @@ import io + from lxml import etree + from os import path + from textwrap import dedent ++sys.path.insert(0, '/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..542e538e 100644 +--- a/java-utils/request-artifact.py ++++ b/java-utils/request-artifact.py +@@ -35,6 +35,7 @@ from __future__ import print_function + + import sys + ++sys.path.insert(0, '/usr/share/java-utils/') + from javapackages.common.mock import (InstallationException, ConnectionException, + install_maven_artifact) + +-- +2.21.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 8d0fb64..c19abdd 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -23,6 +23,8 @@ BuildArch: noarch Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source1: module-config.xml +Patch0: 0001-Move-python-modules-under-java-utils-directory.patch + BuildRequires: coreutils BuildRequires: which BuildRequires: make @@ -110,6 +112,7 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} +%patch0 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install From 9dde57299cf66fdad9ce59f3cb29d8fa518b96c4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Jun 2019 15:24:51 +0200 Subject: [PATCH 08/52] Install module artifacts with namespaced paths --- module-config.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module-config.xml b/module-config.xml index 8319c2e..4b56094 100644 --- a/module-config.xml +++ b/module-config.xml @@ -1,4 +1,14 @@ + + + + {*} + + + @{mns}/@1 + + + install-@{mns} From e62a8ccbd350cbd68425e94e678b89aa3453c388 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:20:15 +0200 Subject: [PATCH 09/52] Revert "Install module artifacts with namespaced paths" This reverts commit 9dde57299cf66fdad9ce59f3cb29d8fa518b96c4. --- module-config.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/module-config.xml b/module-config.xml index 4b56094..8319c2e 100644 --- a/module-config.xml +++ b/module-config.xml @@ -1,14 +1,4 @@ - - - - {*} - - - @{mns}/@1 - - - install-@{mns} From 928d2d2cb130addb601801835eec86b25a192d14 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 14 Jun 2019 15:24:51 +0200 Subject: [PATCH 10/52] Introduce javapackages-config-maven-3.6 --- javapackages-tools.spec | 20 ++++++++++++++------ module-config.xml | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c19abdd..69205ce 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -110,6 +110,12 @@ 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. + %prep %setup -q -n javapackages-%{version} %patch0 -p1 @@ -134,9 +140,7 @@ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fja sed -e 's/.[17]$/&*/' -i files-* mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/ -%if 0%{?_module_build} -sed 's/@{mns}/%{mns}/g' %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-config.xml -%endif +sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml rm -rf %{buildroot}%{_bindir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local @@ -146,7 +150,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 ./check %files -f files-tools -%{_datadir}/xmvn/config.d %files -n javapackages-filesystem -f files-filesystem @@ -156,10 +159,15 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n maven-local - %files -n ivy-local -f files-ivy +%files -n javapackages-config-maven-3.6 +%{_datadir}/xmvn/config.d + %changelog +* 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 diff --git a/module-config.xml b/module-config.xml index 8319c2e..4b56094 100644 --- a/module-config.xml +++ b/module-config.xml @@ -1,4 +1,14 @@ + + + + {*} + + + @{mns}/@1 + + + install-@{mns} From 1f9b21346a41a3cdc7bc4cbed6e97ec37e43e47c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 12:18:04 +0200 Subject: [PATCH 11/52] Don't ignore duplicate metadata in namespaced modules --- javapackages-tools.spec | 5 ++++- module-config.xml | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 69205ce..bdfa09e 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -165,6 +165,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* 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 diff --git a/module-config.xml b/module-config.xml index 4b56094..0ec7dfa 100644 --- a/module-config.xml +++ b/module-config.xml @@ -1,4 +1,7 @@ + + false + From 44e9cf79a8b2766003e3ac93507b5c474e67ef1c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:54:28 +0200 Subject: [PATCH 12/52] Enable namespaced dependency generation --- ...ble-namespaced-dependency-generation.patch | 47 +++++++++++++++++++ javapackages-tools.spec | 7 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0001-Enable-namespaced-dependency-generation.patch diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch new file mode 100644 index 0000000..36b7a0c --- /dev/null +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -0,0 +1,47 @@ +From 0ab5beafeae3b3e926a70331cb88e3ad14755a1d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 28 Jun 2019 14:53:26 +0200 +Subject: [PATCH] Enable namespaced dependency generation + +--- + depgenerators/fileattrs/javadoc.attr | 2 +- + depgenerators/fileattrs/maven.attr | 4 ++-- + depgenerators/fileattrs/osgi.attr | 4 ++-- + 3 files changed, 5 insertions(+), 5 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..a0d4e87f 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_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 %{!?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_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} + %__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ +-- +2.21.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index bdfa09e..4c3156d 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -14,7 +14,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -24,6 +24,7 @@ Source0: https://github.com/fedora-java/javapackages/archive/%{version}.t Source1: module-config.xml Patch0: 0001-Move-python-modules-under-java-utils-directory.patch +Patch1: 0001-Enable-namespaced-dependency-generation.patch BuildRequires: coreutils BuildRequires: which @@ -119,6 +120,7 @@ This package provides configuration files for building maven-3.6 module. %prep %setup -q -n javapackages-%{version} %patch0 -p1 +%patch1 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -165,6 +167,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* 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 From 77d01be3e33dc3dd2f38ecca6857dc0d872376e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 10:23:49 +0200 Subject: [PATCH 13/52] Disable OSGi requires generation for namespaced modules --- ...-Enable-namespaced-dependency-generation.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch index 36b7a0c..ae7ed59 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 0ab5beafeae3b3e926a70331cb88e3ad14755a1d Mon Sep 17 00:00:00 2001 +From 77ef9b496bcb84eebfd0f3586226c7645142cc9f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 Subject: [PATCH] Enable namespaced dependency generation @@ -6,8 +6,8 @@ Subject: [PATCH] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- depgenerators/fileattrs/maven.attr | 4 ++-- - depgenerators/fileattrs/osgi.attr | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) + 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 @@ -31,16 +31,17 @@ index 2f722eb1..44644ca5 100644 +%__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..a0d4e87f 100644 +index 7c3ea03d..787a9823 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_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 %{!?scl:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?scl:%{_root_bindir}/true} +-%__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_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))} %{?scl:--scl %{?scl}} %{?module_prefix:--scl %{_module_name}-%{_module_stream}} ++%__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:%{_root_bindir}/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 From f02272b20a67a083b91f29ee1f5e8ae654b96d9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 14:25:30 +0200 Subject: [PATCH 14/52] Don't use %{_root_bindir} when not building SCL --- 0001-Enable-namespaced-dependency-generation.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch index ae7ed59..f7f31ea 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 77ef9b496bcb84eebfd0f3586226c7645142cc9f Mon Sep 17 00:00:00 2001 +From 3a2ab8067f7f90e1226896dbffb62c5eac83a424 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 Subject: [PATCH] Enable namespaced dependency generation @@ -31,7 +31,7 @@ index 2f722eb1..44644ca5 100644 +%__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..787a9823 100644 +index 7c3ea03d..6925fdbf 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ @@ -40,7 +40,7 @@ index 7c3ea03d..787a9823 100644 -%__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:%{_root_bindir}/true} ++%__osgi_requires %{!?module_prefix:%{_rpmconfigdir}/osgi@{scl_suffix}.req}%{?module_prefix:/bin/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))$ -- From fcf9584ca4dc0a97127a10b88134a94bb272b815 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 14:46:52 +0200 Subject: [PATCH 15/52] Don't hardcode path to /bin/true, rely on PATH --- 0001-Enable-namespaced-dependency-generation.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0001-Enable-namespaced-dependency-generation.patch index f7f31ea..4e76ff3 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0001-Enable-namespaced-dependency-generation.patch @@ -1,4 +1,4 @@ -From 3a2ab8067f7f90e1226896dbffb62c5eac83a424 Mon Sep 17 00:00:00 2001 +From a1b5c681d01e2d600f5c502e2c2e3bba8aa9d447 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 Subject: [PATCH] Enable namespaced dependency generation @@ -31,7 +31,7 @@ index 2f722eb1..44644ca5 100644 +%__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..6925fdbf 100644 +index 7c3ea03d..3ccc8b65 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -1,5 +1,5 @@ @@ -40,7 +40,7 @@ index 7c3ea03d..6925fdbf 100644 -%__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:/bin/true} ++%__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))$ -- From 4dfb57602c56dd1f8d302826e0e10475c210ae6c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Aug 2019 13:40:09 +0200 Subject: [PATCH 16/52] Re-add Python 2 support --- javapackages-tools.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4c3156d..4e048e3 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -6,8 +6,14 @@ # 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} +%else +%global python_prefix python +%global python_interpreter %{?__python2}%{!?__python2:dummy} +%global rpmmacrodir /etc/rpm +%endif %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk %global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk From fd4edda8f6a2058ff19fafe5f24a4e11a4484ec0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Aug 2019 13:46:44 +0200 Subject: [PATCH 17/52] Define python_sitelib on RHEL 7 --- javapackages-tools.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4e048e3..756efc7 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -9,9 +9,11 @@ %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 /usr/lib/python2.7/site-packages %global rpmmacrodir /etc/rpm %endif @@ -140,9 +142,9 @@ sed -i '/${mandir}/d' install %install ./install -rm -rf %{buildroot}%{python3_sitelib}/javapackages-*.egg-info -find %{buildroot}%{python3_sitelib}/javapackages -name __pycache__ | xargs rm -rf -mv %{buildroot}%{python3_sitelib}/javapackages %{buildroot}%{_javadir}-utils/ +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/ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava') sed -e 's/.[17]$/&*/' -i files-* From 73bdbfb93164f79c3e6fa1cefb15441529a9b2fd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Aug 2019 14:17:04 +0200 Subject: [PATCH 18/52] Remove Python bytecode from java-utils --- javapackages-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 756efc7..fd67feb 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -155,6 +155,7 @@ sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/modul rm -rf %{buildroot}%{_bindir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 +rm -f %{buildroot}%{_javadir}-utils/*.py[co] %check ./check From 893a9f4add1720c71b857667e1fabc2c2dc2e312 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Aug 2019 14:36:14 +0200 Subject: [PATCH 19/52] Try a different way of disabling Python bytecode generation --- javapackages-tools.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index fd67feb..0c96904 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -15,6 +15,8 @@ %global python_interpreter %{?__python2}%{!?__python2:dummy} %global python_sitelib /usr/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 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %endif %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk @@ -155,7 +157,6 @@ sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/modul rm -rf %{buildroot}%{_bindir}/gradle-local rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 -rm -f %{buildroot}%{_javadir}-utils/*.py[co] %check ./check From 1715885c41e7a4c3c4e1379bcba0e3d6f7ecae4f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 14:22:04 +0200 Subject: [PATCH 20/52] Don't hardcode prefix --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0c96904..00f5bae 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -13,7 +13,7 @@ %else %global python_prefix python %global python_interpreter %{?__python2}%{!?__python2:dummy} -%global python_sitelib /usr/lib/python2.7/site-packages +%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 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') From 1a38a55a4753f9c4ffb4239a0960e98f4644f9f3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 14:34:29 +0200 Subject: [PATCH 21/52] Fix Python bytecode removal on RHEL 7 --- javapackages-tools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 00f5bae..7340738 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -146,6 +146,8 @@ sed -i '/${mandir}/d' install rm -rf %{buildroot}%{python_sitelib}/javapackages-*.egg-info find %{buildroot}%{python_sitelib}/javapackages -name __pycache__ | xargs rm -rf +find %{buildroot}%{python_sitelib}/javapackages -name \*.pyc | xargs rm -f +find %{buildroot}%{python_sitelib}/javapackages -name \*.pyo | xargs rm -f mv %{buildroot}%{python_sitelib}/javapackages %{buildroot}%{_javadir}-utils/ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava') From c51fbac79cda8a57298b6937c5b9954fdbd81922 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 14:43:45 +0200 Subject: [PATCH 22/52] Remove compiled Python code from java-utils too --- javapackages-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 7340738..4871dcc 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -146,9 +146,9 @@ sed -i '/${mandir}/d' install rm -rf %{buildroot}%{python_sitelib}/javapackages-*.egg-info find %{buildroot}%{python_sitelib}/javapackages -name __pycache__ | xargs rm -rf -find %{buildroot}%{python_sitelib}/javapackages -name \*.pyc | xargs rm -f -find %{buildroot}%{python_sitelib}/javapackages -name \*.pyo | xargs rm -f mv %{buildroot}%{python_sitelib}/javapackages %{buildroot}%{_javadir}-utils/ +find %{buildroot}%{buildroot}%{_javadir}-utils/ -name \*.pyc | xargs rm -f +find %{buildroot}%{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-* From 0e4675d636e04110eac06dd754c08709ca402972 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 14:50:33 +0200 Subject: [PATCH 23/52] Fix doubled buildroot variable expansion --- javapackages-tools.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4871dcc..6eb8a2e 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -147,8 +147,8 @@ sed -i '/${mandir}/d' 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}%{buildroot}%{_javadir}-utils/ -name \*.pyc | xargs rm -f -find %{buildroot}%{buildroot}%{_javadir}-utils/ -name \*.pyo | xargs rm -f +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-* From 7e2754eaa239085a08febd04dc4eb0e26c638604 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 15:24:31 +0200 Subject: [PATCH 24/52] Try to disable brp-scl-python-bytecompile too --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6eb8a2e..230d3bb 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -16,7 +16,7 @@ %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 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-\\(\\scl-|\\)python-bytecompile[[:space:]].*$!!g') %endif %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk From 4a9670935fbb31653905f153ae734b05fe67da17 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 15:33:49 +0200 Subject: [PATCH 25/52] Add missing quotation --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 230d3bb..014cb82 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -16,7 +16,7 @@ %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 's!/usr/lib[^[:space:]]*/brp-\\(\\scl-|\\)python-bytecompile[[:space:]].*$!!g') +%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-\\(\\scl-\\|\\)python-bytecompile[[:space:]].*$!!g') %endif %global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk From 6d7978ec6427c4a70cb89c97ed75b8c365c5da1a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 15:53:03 +0200 Subject: [PATCH 26/52] Try another way of disabling python-bytecompile scripts --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 014cb82..9de369f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -16,7 +16,7 @@ %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 's!/usr/lib[^[:space:]]*/brp-\\(\\scl-\\|\\)python-bytecompile[[:space:]].*$!!g') +%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-1.8.0-openjdk From 2ff661b6c10e5bfe99c3524037708a822df88504 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 15:53:30 +0200 Subject: [PATCH 27/52] Temporarly disable tests in %check --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9de369f..b6fa8da 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -161,7 +161,7 @@ rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %check -./check +: ./check %files -f files-tools From 8603967105f315e1323772b4a1cf6937f8d0967c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 17:47:07 +0200 Subject: [PATCH 28/52] Re-enable tests This reverts commit 2ff661b6c10e5bfe99c3524037708a822df88504. --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index b6fa8da..9de369f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -161,7 +161,7 @@ rm -rf %{buildroot}%{_datadir}/gradle-local rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %check -: ./check +./check %files -f files-tools From 08a8404a3e2229c4c97b473a7f63cbad0b11adfd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Sep 2019 18:38:20 +0200 Subject: [PATCH 29/52] Fix use of illegal characters in rpmfc generator names --- ...n-modules-under-java-utils-directory.patch | 120 ++++++++++-------- ...ble-namespaced-dependency-generation.patch | 4 +- ...al-characters-in-rpmfc-generator-nam.patch | 67 ++++++++++ javapackages-tools.spec | 8 +- 4 files changed, 142 insertions(+), 57 deletions(-) rename 0001-Enable-namespaced-dependency-generation.patch => 0002-Enable-namespaced-dependency-generation.patch (96%) create mode 100644 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index 761ab15..29982fb 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,138 +1,147 @@ -From 563a9c81f2ee7f2631a40e89ec2897d0af268294 Mon Sep 17 00:00:00 2001 +From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH] Move python modules under java-utils directory +Subject: [PATCH 1/3] Move python modules under java-utils directory --- - depgenerators/javadoc.req | 2 ++ - depgenerators/maven.prov | 1 + - depgenerators/maven.req | 1 + - depgenerators/osgi.prov | 1 + - depgenerators/osgi.req | 1 + - java-utils/builddep.py | 1 + - java-utils/maven_depmap.py | 1 + - java-utils/mvn_alias.py | 1 + - java-utils/mvn_artifact.py | 3 ++- - java-utils/mvn_build.py | 1 + - java-utils/mvn_compat_version.py | 1 + - java-utils/mvn_config.py | 1 + - java-utils/mvn_file.py | 1 + - java-utils/mvn_package.py | 1 + - java-utils/pom_editor.py | 1 + - java-utils/request-artifact.py | 1 + - 16 files changed, 18 insertions(+), 1 deletion(-) + 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..b300410c 100755 +index 4d182e2e..8528ee05 100755 --- a/depgenerators/javadoc.req +++ b/depgenerators/javadoc.req -@@ -32,6 +32,8 @@ +@@ -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..da67d896 100755 +index 1448cbf6..c794dbea 100755 --- a/depgenerators/maven.prov +++ b/depgenerators/maven.prov -@@ -34,6 +34,7 @@ +@@ -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..00aede89 100755 +index b3597f78..912d5f98 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req -@@ -37,6 +37,7 @@ import re +@@ -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..20fc3ff2 100755 +index baef6e48..7ed423a2 100755 --- a/depgenerators/osgi.prov +++ b/depgenerators/osgi.prov -@@ -34,6 +34,7 @@ +@@ -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..5278c6f9 100755 +index 3cb53302..79dcaaa8 100755 --- a/depgenerators/osgi.req +++ b/depgenerators/osgi.req -@@ -34,6 +34,7 @@ +@@ -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..475e1bd2 100644 +index fda36d2d..48d0963d 100644 --- a/java-utils/builddep.py +++ b/java-utils/builddep.py -@@ -33,6 +33,7 @@ +@@ -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..65994a9e 100644 +index 92e0ff4c..9f1472a6 100644 --- a/java-utils/maven_depmap.py +++ b/java-utils/maven_depmap.py -@@ -46,6 +46,7 @@ import zipfile +@@ -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..542ac204 100644 +index 4979a17a..962a35f0 100644 --- a/java-utils/mvn_alias.py +++ b/java-utils/mvn_alias.py -@@ -33,6 +33,7 @@ +@@ -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..386bda36 100644 +index d135adf2..51339d4b 100644 --- a/java-utils/mvn_artifact.py +++ b/java-utils/mvn_artifact.py -@@ -32,6 +32,8 @@ +@@ -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 +47,6 @@ from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest, +@@ -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 @@ -141,86 +150,93 @@ index d135adf2..386bda36 100644 import lxml.etree from optparse import OptionParser diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py -index 98479962..1723e2d0 100644 +index 98479962..4d5f54f7 100644 --- a/java-utils/mvn_build.py +++ b/java-utils/mvn_build.py -@@ -37,6 +37,7 @@ import optparse +@@ -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..6ad96d9b 100644 +index e4afdbd7..d63dcf99 100644 --- a/java-utils/mvn_compat_version.py +++ b/java-utils/mvn_compat_version.py -@@ -33,6 +33,7 @@ +@@ -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..2f88735a 100644 +index 7597761e..f7930985 100644 --- a/java-utils/mvn_config.py +++ b/java-utils/mvn_config.py -@@ -33,6 +33,7 @@ +@@ -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..7526f95c 100644 +index 39d1348f..40ae156e 100644 --- a/java-utils/mvn_file.py +++ b/java-utils/mvn_file.py -@@ -33,6 +33,7 @@ +@@ -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..01d9ddda 100644 +index b74da128..2a2f4619 100644 --- a/java-utils/mvn_package.py +++ b/java-utils/mvn_package.py -@@ -33,6 +33,7 @@ +@@ -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..bc144f43 100644 +index 82a555b8..6c09665c 100644 --- a/java-utils/pom_editor.py +++ b/java-utils/pom_editor.py -@@ -11,6 +11,7 @@ import io +@@ -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..542e538e 100644 +index 68cb1119..55dfd985 100644 --- a/java-utils/request-artifact.py +++ b/java-utils/request-artifact.py -@@ -35,6 +35,7 @@ from __future__ import print_function +@@ -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) diff --git a/0001-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch similarity index 96% rename from 0001-Enable-namespaced-dependency-generation.patch rename to 0002-Enable-namespaced-dependency-generation.patch index 4e76ff3..78ae8f9 100644 --- a/0001-Enable-namespaced-dependency-generation.patch +++ b/0002-Enable-namespaced-dependency-generation.patch @@ -1,7 +1,7 @@ -From a1b5c681d01e2d600f5c502e2c2e3bba8aa9d447 Mon Sep 17 00:00:00 2001 +From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 -Subject: [PATCH] Enable namespaced dependency generation +Subject: [PATCH 2/3] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch new file mode 100644 index 0000000..5453ab7 --- /dev/null +++ b/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/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 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9de369f..1e360ee 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -33,8 +33,9 @@ BuildArch: noarch Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source1: module-config.xml -Patch0: 0001-Move-python-modules-under-java-utils-directory.patch -Patch1: 0001-Enable-namespaced-dependency-generation.patch +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 BuildRequires: coreutils BuildRequires: which @@ -129,8 +130,9 @@ This package provides configuration files for building maven-3.6 module. %prep %setup -q -n javapackages-%{version} -%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install From aeea1b21814d480d8b1532c1f65c78dee405b41e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 3 Sep 2019 08:33:19 +0200 Subject: [PATCH 30/52] Don't install module config in non-modular builds --- javapackages-tools.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 1e360ee..1f1c7ba 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -156,7 +156,9 @@ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fja 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 From 17273cc50a5db754428208f71091af9914439449 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 17:09:01 +0200 Subject: [PATCH 31/52] Switch to OpenJDK 11 as default JDK --- javapackages-tools.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 1f1c7ba..6f69fbe 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -19,12 +19,12 @@ %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-1.8.0-openjdk -%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk +%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: 4%{?dist} +Release: 5%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -51,13 +51,15 @@ Requires: coreutils Requires: findutils Requires: which # default JRE -Requires: java-1.8.0-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. @@ -112,12 +114,14 @@ Requires: xmvn-install Requires: xmvn-subst Requires: xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there -Requires: java-1.8.0-openjdk-devel +Requires: 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} +# XXX temp provide +Provides: java-devel = 1:11 %description -n javapackages-local This package provides non-essential macros and scripts to support Java packaging. @@ -183,6 +187,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* 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 From 45aa5707438db879fd409bcea2c946d2a74bf930 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 11:42:11 +0100 Subject: [PATCH 32/52] Remove requires on surefire providers --- javapackages-tools.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6f69fbe..c119ca0 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -85,12 +85,6 @@ 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) -# Tests based on JUnit are very common and JUnit itself is small. -# Include JUnit and JUnit provider for Surefire just for convenience. -Requires: mvn(junit:junit) -Requires: mvn(org.apache.maven.surefire:surefire-junit4) -# testng is quite common as well -Requires: mvn(org.apache.maven.surefire:surefire-testng) %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. From 27c16c2c5940ef40f91a5e9ffd70447b4eafd220 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 33/52] Mass rebuild for javapackages-tools 201902 --- javapackages-tools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c119ca0..6ba6494 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -24,7 +24,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -181,6 +181,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* 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 From 697ad8d615aa6d7a7a9a024daa6cd72039018ba6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 22 Jan 2020 18:18:47 +0100 Subject: [PATCH 34/52] Switch back to OpenJDK 1.8.0 --- javapackages-tools.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6ba6494..3654262 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -19,12 +19,12 @@ %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 +%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk +%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk Name: javapackages-tools Version: 5.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -51,15 +51,13 @@ Requires: coreutils Requires: findutils Requires: which # default JRE -Requires: java-11-openjdk-headless +Requires: java-1.8.0-openjdk-headless Provides: jpackage-utils = %{version}-%{release} # These could be generated automatically, but then we would need to # 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. @@ -108,14 +106,12 @@ 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: java-1.8.0-openjdk-devel 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. @@ -181,6 +177,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog +* Wed Jan 22 2020 Mikolaj Izdebski - 5.3.1-7 +- Switch back to OpenJDK 1.8.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 5.3.1-6 - Mass rebuild for javapackages-tools 201902 From 0429311d9e0e5bfdc7dd92df7bd9dd23d438da61 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 23 Jan 2020 09:42:29 +0100 Subject: [PATCH 35/52] Revert "Switch back to OpenJDK 1.8.0" This reverts commit 697ad8d615aa6d7a7a9a024daa6cd72039018ba6. --- javapackages-tools.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3654262..6ba6494 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -19,12 +19,12 @@ %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-1.8.0-openjdk -%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk +%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: 7%{?dist} +Release: 6%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -51,13 +51,15 @@ Requires: coreutils Requires: findutils Requires: which # default JRE -Requires: java-1.8.0-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. @@ -106,12 +108,14 @@ Requires: xmvn-install Requires: xmvn-subst Requires: xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there -Requires: java-1.8.0-openjdk-devel +Requires: 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} +# XXX temp provide +Provides: java-devel = 1:11 %description -n javapackages-local This package provides non-essential macros and scripts to support Java packaging. @@ -177,9 +181,6 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %{_datadir}/xmvn/config.d %changelog -* Wed Jan 22 2020 Mikolaj Izdebski - 5.3.1-7 -- Switch back to OpenJDK 1.8.0 - * Tue Nov 05 2019 Mikolaj Izdebski - 5.3.1-6 - Mass rebuild for javapackages-tools 201902 From e13aca838fb88ede6ed6dbec27e8c472d67ce569 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 23 Jan 2020 13:26:15 +0100 Subject: [PATCH 36/52] Add OpenJDK 8 toolchain configuration --- javapackages-tools.spec | 20 +++++++++++++++++++- toolchains-openjdk8.xml | 11 +++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 toolchains-openjdk8.xml diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6ba6494..5fce799 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -24,7 +24,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -32,6 +32,7 @@ BuildArch: noarch Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Source1: module-config.xml +Source2: toolchains-openjdk8.xml Patch1: 0001-Move-python-modules-under-java-utils-directory.patch Patch2: 0002-Enable-namespaced-dependency-generation.patch @@ -126,6 +127,14 @@ 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 @@ -162,6 +171,9 @@ 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 + %check ./check @@ -180,7 +192,13 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %files -n javapackages-config-maven-3.6 %{_datadir}/xmvn/config.d +%files -n maven-local-openjdk8 +%{_datadir}/xmvn/conf + %changelog +* 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 diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml new file mode 100644 index 0000000..25d130f --- /dev/null +++ b/toolchains-openjdk8.xml @@ -0,0 +1,11 @@ + + + jdk + + xmvn + + + /usr/lib/jvm/java-1.8.0-openjdk + + + From 813ab6d57498168b1da0e5b6f232a4c896769f5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 08:56:16 +0200 Subject: [PATCH 37/52] Skip execution of various Maven plugins --- ...n-modules-under-java-utils-directory.patch | 4 +- ...ble-namespaced-dependency-generation.patch | 4 +- ...al-characters-in-rpmfc-generator-nam.patch | 4 +- ...p-execution-of-various-Maven-plugins.patch | 80 +++++++++++++++++++ javapackages-tools.spec | 2 + 5 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 0004-Skip-execution-of-various-Maven-plugins.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index 29982fb..606d146 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,7 +1,7 @@ From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH 1/3] Move python modules under java-utils directory +Subject: [PATCH 1/4] Move python modules under java-utils directory --- depgenerators/javadoc.req | 3 +++ @@ -241,5 +241,5 @@ index 68cb1119..55dfd985 100644 install_maven_artifact) -- -2.21.0 +2.25.4 diff --git a/0002-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch index 78ae8f9..917ba50 100644 --- a/0002-Enable-namespaced-dependency-generation.patch +++ b/0002-Enable-namespaced-dependency-generation.patch @@ -1,7 +1,7 @@ From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 -Subject: [PATCH 2/3] Enable namespaced dependency generation +Subject: [PATCH 2/4] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- @@ -44,5 +44,5 @@ index 7c3ea03d..3ccc8b65 100644 +%__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 +2.25.4 diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch index 5453ab7..b6d5f9c 100644 --- a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +++ b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch @@ -1,7 +1,7 @@ From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Sep 2019 18:10:01 +0200 -Subject: [PATCH 3/3] Fix use of illegal characters in rpmfc generator names +Subject: [PATCH 3/4] Fix use of illegal characters in rpmfc generator names --- configure-base.sh | 2 +- @@ -63,5 +63,5 @@ index 3ccc8b65..8b0f15f7 100644 +%__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 +2.25.4 diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch new file mode 100644 index 0000000..9dd37df --- /dev/null +++ b/0004-Skip-execution-of-various-Maven-plugins.patch @@ -0,0 +1,80 @@ +From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Sat, 29 Jun 2019 12:09:25 +0200 +Subject: [PATCH 4/4] Skip execution of various Maven plugins + +Resolves: #70 +--- + configs/configuration.xml | 56 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/configs/configuration.xml b/configs/configuration.xml +index b6288fea..2c1a941b 100644 +--- a/configs/configuration.xml ++++ b/configs/configuration.xml +@@ -4,6 +4,62 @@ + + /usr/share/maven-metadata + ++ ++ ++ ++ org.codehaus.mojo ++ animal-sniffer-maven-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ ++ ++ ++ org.codehaus.moj ++ findbugs-maven-plugin ++ ++ ++ com.github.spotbug ++ spotbugs-maven-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-checkstyle-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-pmd-plugin ++ ++ ++ ++ org.jacoco ++ jacoco-maven-plugin ++ ++ ++ org.eluder.coveralls ++ coveralls-maven-plugin ++ ++ ++ org.codehaus.mojo ++ cobertura-maven-plugin ++ ++ ++ ++ org.apache.rat ++ apache-rat-plugin ++ ++ ++ ++ org.apache.maven.plugins ++ maven-gpg-plugin ++ ++ ++ ++ org.sonatype.plugins ++ nexus-staging-maven-plugin ++ ++ + + + usr/share/maven-metadata +-- +2.25.4 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 5fce799..d8ecf55 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -37,6 +37,7 @@ Source2: toolchains-openjdk8.xml 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 BuildRequires: coreutils BuildRequires: which @@ -140,6 +141,7 @@ OpenJDK 8 toolchain for XMvn %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install From 61641e7bd66af3a49851cf36a875c795ce925d53 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 09:12:56 +0200 Subject: [PATCH 38/52] Don't try to kill PID 1 during tests --- ...n-modules-under-java-utils-directory.patch | 2 +- ...ble-namespaced-dependency-generation.patch | 2 +- ...al-characters-in-rpmfc-generator-nam.patch | 2 +- ...p-execution-of-various-Maven-plugins.patch | 2 +- ...Don-t-try-to-kill-PID-1-during-tests.patch | 29 +++++++++++++++++++ javapackages-tools.spec | 2 ++ 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 0005-test-Don-t-try-to-kill-PID-1-during-tests.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index 606d146..bc58a0f 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 1/5] Move python modules under java-utils directory --- depgenerators/javadoc.req | 3 +++ diff --git a/0002-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch index 917ba50..6060f4b 100644 --- a/0002-Enable-namespaced-dependency-generation.patch +++ b/0002-Enable-namespaced-dependency-generation.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 2/5] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch index b6d5f9c..a8e860b 100644 --- a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +++ b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 3/5] Fix use of illegal characters in rpmfc generator names --- configure-base.sh | 2 +- diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch index 9dd37df..db88d37 100644 --- a/0004-Skip-execution-of-various-Maven-plugins.patch +++ b/0004-Skip-execution-of-various-Maven-plugins.patch @@ -1,7 +1,7 @@ From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 12:09:25 +0200 -Subject: [PATCH 4/4] Skip execution of various Maven plugins +Subject: [PATCH 4/5] Skip execution of various Maven plugins Resolves: #70 --- diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch new file mode 100644 index 0000000..35c4e94 --- /dev/null +++ b/0005-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 5/5] [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/javapackages-tools.spec b/javapackages-tools.spec index d8ecf55..00c1680 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -38,6 +38,7 @@ 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 BuildRequires: coreutils BuildRequires: which @@ -142,6 +143,7 @@ OpenJDK 8 toolchain for XMvn %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install From 581a7671e5305426ec8a50dc09d28ea68c113fcf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 09:29:47 +0200 Subject: [PATCH 39/52] Fix malformed XMvn configuration --- ...p-execution-of-various-Maven-plugins.patch | 23 ++++++++++--------- ...Don-t-try-to-kill-PID-1-during-tests.patch | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch index db88d37..fb4cfae 100644 --- a/0004-Skip-execution-of-various-Maven-plugins.patch +++ b/0004-Skip-execution-of-various-Maven-plugins.patch @@ -1,21 +1,21 @@ -From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001 +From f13279da55e61045c8334b40c1fa39c466fdf24c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 12:09:25 +0200 Subject: [PATCH 4/5] Skip execution of various Maven plugins Resolves: #70 --- - configs/configuration.xml | 56 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 56 insertions(+) + configs/configuration.xml | 58 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) diff --git a/configs/configuration.xml b/configs/configuration.xml -index b6288fea..2c1a941b 100644 +index b6288fea..4431f25e 100644 --- a/configs/configuration.xml +++ b/configs/configuration.xml -@@ -4,6 +4,62 @@ - - /usr/share/maven-metadata - +@@ -1,5 +1,63 @@ + + ++ + + + @@ -72,9 +72,10 @@ index b6288fea..2c1a941b 100644 + nexus-staging-maven-plugin + + - - - usr/share/maven-metadata ++ + + + /usr/share/maven-metadata -- 2.25.4 diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch index 35c4e94..df4f59f 100644 --- a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch +++ b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch @@ -1,4 +1,4 @@ -From 16808487796822c5477d1ba0478bd2b0ca884818 Mon Sep 17 00:00:00 2001 +From e5d2b436ed9e01b357a069d1dd6b258fb0b651f3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 09:11:31 +0200 Subject: [PATCH 5/5] [test] Don't try to kill PID 1 during tests From 92628698e8959ea632ca9ac83d9a98ab9d7f9ef1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 22 May 2020 11:06:29 +0200 Subject: [PATCH 40/52] Make built packages require JDK 8 or 11 --- javapackages-config.json | 19 +++++++++++++++++++ javapackages-tools.spec | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 javapackages-config.json diff --git a/javapackages-config.json b/javapackages-config.json new file mode 100644 index 0000000..28f6648 --- /dev/null +++ b/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/javapackages-tools.spec b/javapackages-tools.spec index 00c1680..70ccc8c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -33,6 +33,7 @@ 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 @@ -178,6 +179,8 @@ 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}%{_javaconfdir}/javapackages-config.json + %check ./check From eda79127a41c348198cace37b439ddef155fccea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 22 May 2020 11:44:27 +0200 Subject: [PATCH 41/52] Do not use macro defined in javapackages-filesystem --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 70ccc8c..09d0abb 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -179,7 +179,7 @@ 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}%{_javaconfdir}/javapackages-config.json +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json %check ./check From 608677187bc1969dcefe836937a6b0ba83f077f9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 May 2020 13:26:58 +0200 Subject: [PATCH 42/52] Drop temporary Java 11 provides --- javapackages-tools.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 09d0abb..fa3ca7b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -62,8 +62,6 @@ Provides: jpackage-utils = %{version}-%{release} # 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. @@ -118,8 +116,6 @@ 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. From 4604adfdd9bfcef62a953cfcfc6f0a6a084410a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 Jul 2020 08:29:59 +0200 Subject: [PATCH 43/52] Try not to require packages by name --- javapackages-tools.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index fa3ca7b..9b58297 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -78,9 +78,8 @@ install their content. 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 +Requires: %{_bindir}/xmvn +Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) # 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) @@ -106,9 +105,9 @@ 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 +Requires: %{_bindir}/xmvn-install +Requires: %{_bindir}/xmvn-subst +Requires: %{_bindir}/xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-11-openjdk-devel Requires: %{python_interpreter} From cf5965e2dde319eb319e17ea9e14984986adfada Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Jul 2020 16:31:01 +0200 Subject: [PATCH 44/52] Don't use networking during tests --- ...n-modules-under-java-utils-directory.patch | 6 ++-- ...ble-namespaced-dependency-generation.patch | 6 ++-- ...al-characters-in-rpmfc-generator-nam.patch | 6 ++-- ...p-execution-of-various-Maven-plugins.patch | 6 ++-- ...Don-t-try-to-kill-PID-1-during-tests.patch | 6 ++-- ...st-Don-t-use-networking-during-tests.patch | 28 +++++++++++++++++++ javapackages-tools.spec | 7 ++++- 7 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 0006-test-Don-t-use-networking-during-tests.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index bc58a0f..306c944 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,7 +1,7 @@ -From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001 +From 08f57d72cbc458bb39df76f660889eb6c9131579 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH 1/5] Move python modules under java-utils directory +Subject: [PATCH 1/6] Move python modules under java-utils directory --- depgenerators/javadoc.req | 3 +++ @@ -241,5 +241,5 @@ index 68cb1119..55dfd985 100644 install_maven_artifact) -- -2.25.4 +2.26.2 diff --git a/0002-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch index 6060f4b..df66c19 100644 --- a/0002-Enable-namespaced-dependency-generation.patch +++ b/0002-Enable-namespaced-dependency-generation.patch @@ -1,7 +1,7 @@ -From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001 +From f0b7a9c2bc2cc30047e8d41383debc2745371079 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 -Subject: [PATCH 2/5] Enable namespaced dependency generation +Subject: [PATCH 2/6] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- @@ -44,5 +44,5 @@ index 7c3ea03d..3ccc8b65 100644 +%__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.25.4 +2.26.2 diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch index a8e860b..d55bbea 100644 --- a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +++ b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch @@ -1,7 +1,7 @@ -From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001 +From 5fccf686ca538e620231c424989d800df3534f09 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Sep 2019 18:10:01 +0200 -Subject: [PATCH 3/5] Fix use of illegal characters in rpmfc generator names +Subject: [PATCH 3/6] Fix use of illegal characters in rpmfc generator names --- configure-base.sh | 2 +- @@ -63,5 +63,5 @@ index 3ccc8b65..8b0f15f7 100644 +%__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.25.4 +2.26.2 diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch index fb4cfae..ac3b38d 100644 --- a/0004-Skip-execution-of-various-Maven-plugins.patch +++ b/0004-Skip-execution-of-various-Maven-plugins.patch @@ -1,7 +1,7 @@ -From f13279da55e61045c8334b40c1fa39c466fdf24c Mon Sep 17 00:00:00 2001 +From d95ecd520fef469dd40d8fa54955928b82fd30ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 12:09:25 +0200 -Subject: [PATCH 4/5] Skip execution of various Maven plugins +Subject: [PATCH 4/6] Skip execution of various Maven plugins Resolves: #70 --- @@ -77,5 +77,5 @@ index b6288fea..4431f25e 100644 /usr/share/maven-metadata -- -2.25.4 +2.26.2 diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch index df4f59f..6842fb6 100644 --- a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch +++ b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch @@ -1,7 +1,7 @@ -From e5d2b436ed9e01b357a069d1dd6b258fb0b651f3 Mon Sep 17 00:00:00 2001 +From 0372ba445718580298dba5e2faaa0946b5313671 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 09:11:31 +0200 -Subject: [PATCH 5/5] [test] Don't try to kill PID 1 during tests +Subject: [PATCH 5/6] 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. @@ -25,5 +25,5 @@ index 9bdc4675..67370422 100644 try: shutil.rmtree("/tmp/.javapackages_cache/") -- -2.25.4 +2.26.2 diff --git a/0006-test-Don-t-use-networking-during-tests.patch b/0006-test-Don-t-use-networking-during-tests.patch new file mode 100644 index 0000000..177923c --- /dev/null +++ b/0006-test-Don-t-use-networking-during-tests.patch @@ -0,0 +1,28 @@ +From b96e04f0a19c832e2a37e8d6ee3e85e26874b145 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 16 Jul 2020 16:27:04 +0200 +Subject: [PATCH 6/6] [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 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9b58297..731b55a 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -24,7 +24,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -40,6 +40,7 @@ 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 BuildRequires: coreutils BuildRequires: which @@ -140,6 +141,7 @@ OpenJDK 8 toolchain for XMvn %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -198,6 +200,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %{_datadir}/xmvn/conf %changelog +* Thu Jul 16 2020 Mikolaj Izdebski - 5.3.1-8 +- Don't use networking during tests + * Thu Jan 23 2020 Mikolaj Izdebski - 5.3.1-7 - Add OpenJDK 8 toolchain configuration From 5497892640ce122aea4dc4993c967a5b0a871cee Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Jul 2020 09:23:59 +0200 Subject: [PATCH 45/52] Add separate subpackage with RPM generators --- ...n-modules-under-java-utils-directory.patch | 2 +- ...ble-namespaced-dependency-generation.patch | 2 +- ...al-characters-in-rpmfc-generator-nam.patch | 2 +- ...p-execution-of-various-Maven-plugins.patch | 2 +- ...Don-t-try-to-kill-PID-1-during-tests.patch | 2 +- ...st-Don-t-use-networking-during-tests.patch | 2 +- ...arate-subpackage-with-RPM-generators.patch | 37 +++++++++++++++++++ javapackages-tools.spec | 28 ++++++++++---- 8 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 0007-Add-separate-subpackage-with-RPM-generators.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch index 306c944..50c5ddc 100644 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ b/0001-Move-python-modules-under-java-utils-directory.patch @@ -1,7 +1,7 @@ From 08f57d72cbc458bb39df76f660889eb6c9131579 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Apr 2019 00:50:00 +0200 -Subject: [PATCH 1/6] Move python modules under java-utils directory +Subject: [PATCH 1/7] Move python modules under java-utils directory --- depgenerators/javadoc.req | 3 +++ diff --git a/0002-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch index df66c19..5f02a34 100644 --- a/0002-Enable-namespaced-dependency-generation.patch +++ b/0002-Enable-namespaced-dependency-generation.patch @@ -1,7 +1,7 @@ From f0b7a9c2bc2cc30047e8d41383debc2745371079 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 14:53:26 +0200 -Subject: [PATCH 2/6] Enable namespaced dependency generation +Subject: [PATCH 2/7] Enable namespaced dependency generation --- depgenerators/fileattrs/javadoc.attr | 2 +- diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch index d55bbea..0ce10a0 100644 --- a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +++ b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch @@ -1,7 +1,7 @@ From 5fccf686ca538e620231c424989d800df3534f09 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Sep 2019 18:10:01 +0200 -Subject: [PATCH 3/6] Fix use of illegal characters in rpmfc generator names +Subject: [PATCH 3/7] Fix use of illegal characters in rpmfc generator names --- configure-base.sh | 2 +- diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch index ac3b38d..5f479c5 100644 --- a/0004-Skip-execution-of-various-Maven-plugins.patch +++ b/0004-Skip-execution-of-various-Maven-plugins.patch @@ -1,7 +1,7 @@ From d95ecd520fef469dd40d8fa54955928b82fd30ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 29 Jun 2019 12:09:25 +0200 -Subject: [PATCH 4/6] Skip execution of various Maven plugins +Subject: [PATCH 4/7] Skip execution of various Maven plugins Resolves: #70 --- diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch index 6842fb6..f10196a 100644 --- a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch +++ b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch @@ -1,7 +1,7 @@ From 0372ba445718580298dba5e2faaa0946b5313671 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 18 May 2020 09:11:31 +0200 -Subject: [PATCH 5/6] Don't try to kill PID 1 during tests +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. diff --git a/0006-test-Don-t-use-networking-during-tests.patch b/0006-test-Don-t-use-networking-during-tests.patch index 177923c..702a8d8 100644 --- a/0006-test-Don-t-use-networking-during-tests.patch +++ b/0006-test-Don-t-use-networking-during-tests.patch @@ -1,7 +1,7 @@ From b96e04f0a19c832e2a37e8d6ee3e85e26874b145 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 16 Jul 2020 16:27:04 +0200 -Subject: [PATCH 6/6] [test] Don't use networking during tests +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. diff --git a/0007-Add-separate-subpackage-with-RPM-generators.patch b/0007-Add-separate-subpackage-with-RPM-generators.patch new file mode 100644 index 0000000..751a696 --- /dev/null +++ b/0007-Add-separate-subpackage-with-RPM-generators.patch @@ -0,0 +1,37 @@ +From 584f36442e18627f8fd459842cca734fa727c911 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 731b55a..2ad3b4b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -24,7 +24,7 @@ Name: javapackages-tools Version: 5.3.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Macros and scripts for Java packaging support License: BSD URL: https://github.com/fedora-java/javapackages @@ -41,6 +41,7 @@ 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 @@ -105,21 +106,26 @@ artifact resolution using XMvn resolver. %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support -Requires: %{name} = %{version}-%{release} +Requires: javapackages-generators = %{version}-%{release} Requires: %{_bindir}/xmvn-install Requires: %{_bindir}/xmvn-subst Requires: %{_bindir}/xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there 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-generators +Summary: RPM dependency generators for Java packaging support +Requires: %{name} = %{version}-%{release} +Requires: %{python_interpreter} +Requires: %{python_prefix}-lxml +Requires: %{python_prefix}-six + +%description -n javapackages-generators +RPM dependency generators to support Java packaging. + %package -n javapackages-config-maven-3.6 Summary: Configuration files for building maven-3.6 module @@ -142,6 +148,7 @@ OpenJDK 8 toolchain for XMvn %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 sed -i '/^manpage /d' build sed -i '/${mandir}/d' install @@ -185,10 +192,12 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %files -n javapackages-filesystem -f files-filesystem -%files -n javapackages-local -f files-local +%files -n javapackages-generators -f files-generators %{_javadir}-utils/javapackages/ %license LICENSE +%files -n javapackages-local -f files-local + %files -n maven-local %files -n ivy-local -f files-ivy @@ -200,6 +209,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %{_datadir}/xmvn/conf %changelog +* Fri Jul 17 2020 Mikolaj Izdebski - 5.3.1-9 +- Add separate subpackage with RPM generators + * Thu Jul 16 2020 Mikolaj Izdebski - 5.3.1-8 - Don't use networking during tests From 01f06c92facd43fc010a70ed5fedd9c16c74adf9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 13:39:52 +0200 Subject: [PATCH 46/52] Re-add gradle-local --- javapackages-tools.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 2ad3b4b..aeae864 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -92,6 +92,16 @@ 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 gradle-local +Summary: Local mode for Gradle +Requires: %{name} = %{version}-%{release} +Requires: javapackages-local = %{version}-%{release} +Requires: gradle >= 2.2.1-2 +Requires: xmvn-connector-gradle + +%description -n gradle-local +This package implements local mode for Gradle, which allows artifact +resolution using XMvn resolver. %package -n ivy-local Summary: Local mode for Apache Ivy @@ -176,10 +186,6 @@ mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/ 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 @@ -200,6 +206,8 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %files -n maven-local +%files -n gradle-local -f files-gradle + %files -n ivy-local -f files-ivy %files -n javapackages-config-maven-3.6 From 721386b2dadcfcb56ac39caa49cf8e582fc69bfd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 19:44:39 +0200 Subject: [PATCH 47/52] Always generate module-maven-3.6.xml config --- javapackages-tools.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index aeae864..a2d9d29 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -182,9 +182,7 @@ sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fja 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 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml From 79d1aadf3ac38436b1688d0018734ec01566241a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 29 Jul 2020 11:50:25 +0200 Subject: [PATCH 48/52] Update to upstream version 6.0.0~alpha --- ...n-modules-under-java-utils-directory.patch | 245 ------------------ ...ble-namespaced-dependency-generation.patch | 48 ---- ...al-characters-in-rpmfc-generator-nam.patch | 67 ----- ...p-execution-of-various-Maven-plugins.patch | 81 ------ ...Don-t-try-to-kill-PID-1-during-tests.patch | 29 --- ...st-Don-t-use-networking-during-tests.patch | 28 -- ...arate-subpackage-with-RPM-generators.patch | 37 --- javapackages-tools.spec | 63 ++--- 8 files changed, 20 insertions(+), 578 deletions(-) delete mode 100644 0001-Move-python-modules-under-java-utils-directory.patch delete mode 100644 0002-Enable-namespaced-dependency-generation.patch delete mode 100644 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch delete mode 100644 0004-Skip-execution-of-various-Maven-plugins.patch delete mode 100644 0005-test-Don-t-try-to-kill-PID-1-during-tests.patch delete mode 100644 0006-test-Don-t-use-networking-during-tests.patch delete mode 100644 0007-Add-separate-subpackage-with-RPM-generators.patch diff --git a/0001-Move-python-modules-under-java-utils-directory.patch b/0001-Move-python-modules-under-java-utils-directory.patch deleted file mode 100644 index 50c5ddc..0000000 --- a/0001-Move-python-modules-under-java-utils-directory.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 08f57d72cbc458bb39df76f660889eb6c9131579 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - # 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.26.2 - diff --git a/0002-Enable-namespaced-dependency-generation.patch b/0002-Enable-namespaced-dependency-generation.patch deleted file mode 100644 index 5f02a34..0000000 --- a/0002-Enable-namespaced-dependency-generation.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f0b7a9c2bc2cc30047e8d41383debc2745371079 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch b/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch deleted file mode 100644 index 0ce10a0..0000000 --- a/0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5fccf686ca538e620231c424989d800df3534f09 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0004-Skip-execution-of-various-Maven-plugins.patch b/0004-Skip-execution-of-various-Maven-plugins.patch deleted file mode 100644 index 5f479c5..0000000 --- a/0004-Skip-execution-of-various-Maven-plugins.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d95ecd520fef469dd40d8fa54955928b82fd30ce Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 @@ - - -+ -+ -+ -+ -+ org.codehaus.mojo -+ animal-sniffer-maven-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-enforcer-plugin -+ -+ -+ -+ org.codehaus.moj -+ findbugs-maven-plugin -+ -+ -+ com.github.spotbug -+ spotbugs-maven-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-checkstyle-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-pmd-plugin -+ -+ -+ -+ org.jacoco -+ jacoco-maven-plugin -+ -+ -+ org.eluder.coveralls -+ coveralls-maven-plugin -+ -+ -+ org.codehaus.mojo -+ cobertura-maven-plugin -+ -+ -+ -+ org.apache.rat -+ apache-rat-plugin -+ -+ -+ -+ org.apache.maven.plugins -+ maven-gpg-plugin -+ -+ -+ -+ org.sonatype.plugins -+ nexus-staging-maven-plugin -+ -+ -+ - - - /usr/share/maven-metadata --- -2.26.2 - diff --git a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch b/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch deleted file mode 100644 index f10196a..0000000 --- a/0005-test-Don-t-try-to-kill-PID-1-during-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0372ba445718580298dba5e2faaa0946b5313671 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0006-test-Don-t-use-networking-during-tests.patch b/0006-test-Don-t-use-networking-during-tests.patch deleted file mode 100644 index 702a8d8..0000000 --- a/0006-test-Don-t-use-networking-during-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b96e04f0a19c832e2a37e8d6ee3e85e26874b145 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/0007-Add-separate-subpackage-with-RPM-generators.patch b/0007-Add-separate-subpackage-with-RPM-generators.patch deleted file mode 100644 index 751a696..0000000 --- a/0007-Add-separate-subpackage-with-RPM-generators.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 584f36442e18627f8fd459842cca734fa727c911 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -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 - diff --git a/javapackages-tools.spec b/javapackages-tools.spec index a2d9d29..3a1f9e5 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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 - 6.0.0~alpha-1 +- Update to upstream version 6.0.0~alpha + * Fri Jul 17 2020 Mikolaj Izdebski - 5.3.1-9 - Add separate subpackage with RPM generators From 23a86858318fe455c1e7e436e8ec45fb37c333b0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 29 Jul 2020 12:25:45 +0200 Subject: [PATCH 49/52] Upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3fc8563..0acaa3f 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /5.2.0.tar.gz /5.3.0.tar.gz /5.3.1.tar.gz +/6.0.0~alpha.tar.gz diff --git a/sources b/sources index d1bd78c..7bd0559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.3.1.tar.gz) = 61558fded5a8c9ed464e2e9637ef0d286e08ebd2e1a68fb71625ff7cca117520672d50fc20ae2335d6ea523fc92459fc49fd9cb034a5427f8035e66ff874a3fb +SHA512 (6.0.0~alpha.tar.gz) = 406e9999f05fbcd45601ad3ba229127f3d9fb8ad908a355975f8f37a342bdc030c579c8abccb4018862b5d5e186ac9eaf28f30ea7d8ec2465f1498b9053f1caf From fb35e9e68eca386af0b2a2455918490b2aab5ce6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 15 Dec 2020 16:40:30 +0100 Subject: [PATCH 50/52] Update to latest upstream snapshot --- javapackages-tools.spec | 3 ++- sources | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3a1f9e5..f62287c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -29,8 +29,9 @@ BuildRequires: which BuildRequires: make BuildRequires: %{python_prefix}-devel BuildRequires: %{python_prefix}-lxml +BuildRequires: %{python_prefix}-pytest +BuildRequires: %{python_prefix}-pytest-cov BuildRequires: %{python_prefix}-setuptools -BuildRequires: %{python_prefix}-nose Requires: javapackages-filesystem = %{version}-%{release} Requires: coreutils diff --git a/sources b/sources index 7bd0559..2029405 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.0~alpha.tar.gz) = 406e9999f05fbcd45601ad3ba229127f3d9fb8ad908a355975f8f37a342bdc030c579c8abccb4018862b5d5e186ac9eaf28f30ea7d8ec2465f1498b9053f1caf +SHA512 (6.0.0~alpha.tar.gz) = 2fd4bf2564c1875af76c78f150264238ebf735b5b71e509c804c575aecac87f63aa8f489ede8f06eb570d5d37d9a4c11a7b123b2ff0e543a360faa4080cd1a09 From b2af916baf34ff4a7d19b2cfd9167a79519418d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Feb 2021 16:18:20 +0100 Subject: [PATCH 51/52] Disable tests on RHEL --- javapackages-tools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index f62287c..248c1a8 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -29,9 +29,11 @@ BuildRequires: which BuildRequires: make BuildRequires: %{python_prefix}-devel BuildRequires: %{python_prefix}-lxml +BuildRequires: %{python_prefix}-setuptools +%if !0%{?rhel} BuildRequires: %{python_prefix}-pytest BuildRequires: %{python_prefix}-pytest-cov -BuildRequires: %{python_prefix}-setuptools +%endif Requires: javapackages-filesystem = %{version}-%{release} Requires: coreutils @@ -163,8 +165,10 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json +%if !0%{?rhel} %check ./check +%endif %files -f files-tools From 346e7ac38490d9f1ae63d5f6655704772becf3ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 10 Apr 2021 18:15:25 +0200 Subject: [PATCH 52/52] Bootstrap prototype --- javapackages-tools.spec | 33 ++++++++++----------------------- module-config.xml | 29 ----------------------------- sources | 2 +- 3 files changed, 11 insertions(+), 53 deletions(-) delete mode 100644 module-config.xml diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 248c1a8..31a4511 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -20,7 +20,6 @@ BuildArch: noarch # 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 @@ -63,14 +62,14 @@ install their content. Summary: Macros and scripts for Maven packaging support Requires: %{name} = %{version}-%{release} Requires: javapackages-local = %{version}-%{release} -Requires: %{_bindir}/xmvn -Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo) +Requires: (%{_bindir}/xmvn or javapackages-bootstrap) +Requires: (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap) # 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) +Requires: (mvn(org.apache.maven.plugins:maven-compiler-plugin) or javapackages-bootstrap) +Requires: (mvn(org.apache.maven.plugins:maven-jar-plugin) or javapackages-bootstrap) +Requires: (mvn(org.apache.maven.plugins:maven-resources-plugin) or javapackages-bootstrap) +Requires: (mvn(org.apache.maven.plugins:maven-surefire-plugin) or javapackages-bootstrap) %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. @@ -108,9 +107,9 @@ packaging in Linux distributions %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Requires: javapackages-generators = %{version}-%{release} -Requires: %{_bindir}/xmvn-install -Requires: %{_bindir}/xmvn-subst -Requires: %{_bindir}/xmvn-resolve +Requires: (%{_bindir}/xmvn-install or javapackages-bootstrap) +Requires: (%{_bindir}/xmvn-subst or javapackages-bootstrap) +Requires: (%{_bindir}/xmvn-resolve or javapackages-bootstrap) # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-11-openjdk-devel @@ -126,12 +125,6 @@ Requires: %{python_interpreter} %description -n javapackages-generators RPM dependency generators 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 @@ -157,9 +150,6 @@ sed -i '/${mandir}/d' install sed -e 's/.[17]$/&*/' -i files-* -mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/ -sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml - mkdir -p %{buildroot}%{_datadir}/xmvn/conf/ cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml @@ -167,7 +157,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %if !0%{?rhel} %check -./check +#./check %endif %files -f files-tools @@ -184,9 +174,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config %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 diff --git a/module-config.xml b/module-config.xml deleted file mode 100644 index 0ec7dfa..0000000 --- a/module-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - false - - - - - {*} - - - @{mns}/@1 - - - - - - install-@{mns} - compound - - @{mns} - - - - base-install - - - - - diff --git a/sources b/sources index 2029405..19a67e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.0~alpha.tar.gz) = 2fd4bf2564c1875af76c78f150264238ebf735b5b71e509c804c575aecac87f63aa8f489ede8f06eb570d5d37d9a4c11a7b123b2ff0e543a360faa4080cd1a09 +SHA512 (6.0.0~alpha.tar.gz) = 1af48a06d4c29e004fded8c11c817c840a321710b76f2393020ac9fd48ddbf688539623cb784ab64874d7a5cc1320d757b18b31aa4c6e383dc4260de2e6572e3