Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482

.gitignore

@@ -3,7 +3,12 @@
 
 /assertj-core-2.2.0.tar.gz
 /assertj-core-3.8.0.tar.gz
+/assertj-core-3.12.2.tar.gz
+/assertj-core-3.13.2.tar.gz
+/assertj-core-3.14.0.tar.gz
 /assertj-core-3.15.0.tar.gz
 /assertj-core-3.16.1.tar.gz
 /assertj-core-3.17.0.tar.gz
 /assertj-core-3.17.2.tar.gz
+/assertj-core-3.18.1.tar.gz
+/assertj-core-3.19.0.tar.gz

assertj-core.spec

@@ -1,77 +1,72 @@
-%bcond_with memoryfilesystem
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 Name:           assertj-core
-Version:        3.17.2
+Version:        3.19.0
 Release:        3%{?dist}
 Summary:        Library of assertions similar to fest-assert
 License:        ASL 2.0
-
 URL:            https://joel-costigliola.github.io/assertj/
 Source0:        https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy)
 BuildRequires:  mvn(org.hamcrest:hamcrest)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
-BuildRequires:  mvn(org.junit.platform:junit-platform-commons)
 BuildRequires:  mvn(org.opentest4j:opentest4j)
-
-%if %{with memoryfilesystem}
-BuildRequires:  mvn(com.github.marschall:memoryfilesystem)
 %endif
 
 %description
 A rich and intuitive set of strongly-typed assertions to use for unit testing
 (either with JUnit or TestNG).
 
-
 %package javadoc
 Summary:        API documentation for %{name}
 
 %description javadoc
 This package provides API documentation for %{name}.
 
-
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n assertj-core-assertj-core-%{version}
 
-# remove dependency on parent POM and inject groupId instead
 %pom_remove_parent
 %pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
+%pom_xpath_remove "pom:release"
 
-# remove plugins that are unnecessary for RPM builds
+%pom_remove_plugin :maven-invoker-plugin
-%pom_remove_plugin :bnd-maven-plugin
-%pom_remove_plugin :bnd-testing-maven-plugin
-%pom_remove_plugin :bnd-resolver-maven-plugin
-%pom_remove_plugin :jacoco-maven-plugin
-%pom_remove_plugin :maven-antrun-plugin
-%pom_remove_plugin :maven-dependency-plugin
-%pom_remove_plugin :maven-enforcer-plugin
-%pom_remove_plugin :maven-jar-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :maven-shade-plugin
+%pom_remove_plugin :maven-dependency-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :jacoco-maven-plugin
 %pom_remove_plugin :yuicompressor-maven-plugin
-%pom_xpath_remove pom:project/pom:profiles
+%pom_remove_plugin :bnd-maven-plugin
+%pom_remove_plugin :bnd-resolver-maven-plugin
+%pom_remove_plugin :maven-antrun-plugin
+%pom_remove_plugin :maven-jar-plugin
+%pom_remove_plugin :bnd-testing-maven-plugin
+
+# package org.mockito.internal.util.collections does not exist
+rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
 
-%if %{without memoryfilesystem}
 %pom_remove_dep :memoryfilesystem
 rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
-%endif
-
 
 %build
-# dependencies for tests are not packaged for fedora:
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+
-# - nl.jqno.equalsverifier:equalsverifier
-%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
-
 
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %doc README.md CONTRIBUTING.md
 %license LICENSE.txt
@@ -80,20 +75,35 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 %doc CONTRIBUTING.md
 %license LICENSE.txt
 
-
 %changelog
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.17.2-3
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.19.0-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.19.0-2
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 3.19.0-1
+- Update to upstream version 3.19.0
+
+* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 3.18.1-1
+- Update to upstream version 3.18.1
+
 * Fri Oct 16 2020 Fabio Valentini <decathorpe@gmail.com> - 3.17.2-1
 - Update to version 3.17.2.
 
+* Mon Sep 21 2020 Marian Koncek <mkoncek@redhat.com> - 3.17.2-1
+- Update to upstream version 3.17.2
+
 * Sun Aug 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.17.0-1
 - Update to version 3.17.0.
 
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 3.16.1-1
+- Update to upstream version 3.16.1
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -112,12 +122,27 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.14.0-1
+- Update to upstream version 3.14.0
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13.2-2
+- Mass rebuild for javapackages-tools 201902
+
 * Fri Sep 13 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-6
 - Remove dependency on memoryfilesystem.
 
+* Tue Aug 06 2019 Marian Koncek <mkoncek@redhat.com> - 3.13.2-1
+- Update to upstream version 3.13.2
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 3.12.2-1
+- Update to upstream version 3.12.2
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.0-3
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -142,4 +167,3 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 
 * Wed Sep 02 2015 Roman Mohr <roman@fenkhuber.at> - 2.2.0-1
 - Initial packaging
-

sources

@@ -1 +1 @@
-SHA512 (assertj-core-3.17.2.tar.gz) = 339f64e56c3bd3d0495eab412e7c87904787ca024d77e4fdcc6f205b23932003d5a758ce82463c93a9fd6be7b68e35de972655a443e65208cbcd786022084277
+SHA512 (assertj-core-3.19.0.tar.gz) = 9a9f803d120f5aff36876cc4128f0dc36d159ddfa0a61cb1838180b9b561e533731c67683a262e42796c5e18edd14a9bb0a9806e185d1ed274b64b5b5f68305a