diff --git a/.assertj-core.metadata b/.assertj-core.metadata index ed43b49..f69c2ad 100644 --- a/.assertj-core.metadata +++ b/.assertj-core.metadata @@ -1 +1 @@ -0b73677480e9d8a9a0336a8b1ad4ed7ea8346ab5 SOURCES/assertj-core-3.13.2.tar.gz +6d01c4d0d405cf26dd5607cc41313a7f854450d7 SOURCES/assertj-build-3.26.3.tar.gz diff --git a/.gitignore b/.gitignore index 70b27d3..d3446b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/assertj-core-3.13.2.tar.gz +SOURCES/assertj-build-3.26.3.tar.gz diff --git a/SPECS/assertj-core.spec b/SPECS/assertj-core.spec index 507d2b7..d7476a3 100644 --- a/SPECS/assertj-core.spec +++ b/SPECS/assertj-core.spec @@ -1,19 +1,26 @@ +%bcond_with bootstrap + Name: assertj-core -Version: 3.13.2 -Release: 2%{?dist} +Version: 3.26.3 +Release: 5%{?dist} Summary: Library of assertions similar to fest-assert -License: ASL 2.0 -URL: http://joel-costigliola.github.io/assertj/ -Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz - +License: Apache-2.0 +URL: https://joel-costigliola.github.io/assertj/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch +Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-build-%{version}.tar.gz + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(cglib:cglib-nodep) 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.mockito:mockito-core) +BuildRequires: mvn(org.opentest4j:opentest4j) +%endif %description A rich and intuitive set of strongly-typed assertions to use for unit testing @@ -23,57 +30,176 @@ A rich and intuitive set of strongly-typed assertions to use for unit testing Summary: API documentation for %{name} %description javadoc -This package provides API documentation for %{name}. +API documentation for %{name}. %prep -%setup -q -n assertj-core-assertj-core-%{version} +%autosetup -p1 -n assertj-assertj-build-%{version} -%pom_remove_parent -%pom_xpath_inject "pom:project" "org.assertj" -%pom_xpath_remove "pom:release" +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :maven-enforcer-plugin +%pom_remove_plugin -r :jacoco-maven-plugin +%pom_remove_plugin -r :spotless-maven-plugin +%pom_remove_plugin -r :bnd-maven-plugin +%pom_remove_plugin -r :bnd-resolver-maven-plugin +%pom_remove_plugin -r :bnd-testing-maven-plugin +%pom_remove_plugin -r :nexus-staging-maven-plugin +%pom_remove_plugin -r :license-maven-plugin +%pom_remove_plugin -r :flatten-maven-plugin +%pom_remove_dep -r :mockito-bom +%pom_remove_dep -r :junit-bom -%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_disable_module assertj-core-kotlin assertj-tests/assertj-integration-tests +%pom_disable_module assertj-core-groovy assertj-tests/assertj-integration-tests -# package org.mockito.internal.util.collections does not exist -rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java - -%pom_remove_dep :memoryfilesystem -rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths} - -# test lib not in Fedora -%pom_remove_dep org.junit:junit-bom: +%pom_xpath_inject pom:plugins ' + + org.apache.maven.plugins + maven-jar-plugin + any + + + + true + + + +' assertj-core %build -%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+ +%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 %install %mvn_install %files -f .mfiles %doc README.md CONTRIBUTING.md -%license LICENSE +%license LICENSE.txt %files javadoc -f .mfiles-javadoc -%doc CONTRIBUTING.md -%license LICENSE +%license LICENSE.txt %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.26.3-2 +- Update javapackages test plan to f42 + +* Mon Sep 23 2024 Marian Koncek - 3.26.3-1 +- Update to upstream version 3.26.3 + +* Wed Jul 24 2024 Mikolaj Izdebski - 3.24.2-9 +- Don't install CONTRIBUTING.md in javadoc package + +* Wed Jul 17 2024 Fedora Release Engineering - 3.24.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.24.2-7 +- Rebuilt for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 3.24.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.24.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.24.2-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 3.24.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Feb 27 2023 Marian Koncek - 3.24.2-2 +- Remove dependency on junit5-bom + +* Wed Feb 15 2023 Marian Koncek - 3.24.2-1 +- Update to upstream version 3.24.2 + +* Wed Jan 18 2023 Fedora Release Engineering - 3.23.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Sep 07 2022 Marian Koncek - 3.23.1-1 +- Update to upstream version 3.23.1 + +* Wed Jul 20 2022 Fedora Release Engineering - 3.19.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.19.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 3.19.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 3.19.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.19.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 26 2021 Marian Koncek - 3.19.0-1 +- Update to upstream version 3.19.0 + +* Wed Jan 20 2021 Marian Koncek - 3.18.1-1 +- Update to upstream version 3.18.1 + +* Fri Oct 16 2020 Fabio Valentini - 3.17.2-1 +- Update to version 3.17.2. + +* Mon Sep 21 2020 Marian Koncek - 3.17.2-1 +- Update to upstream version 3.17.2 + +* Sun Aug 23 2020 Fabio Valentini - 3.17.0-1 +- Update to version 3.17.0. + +* Wed Jul 29 2020 Marian Koncek - 3.16.1-1 +- Update to upstream version 3.16.1 + +* Mon Jul 27 2020 Fedora Release Engineering - 3.16.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Markku Korkeala - 3.16.1-4 +- Remove profiles from pom.xml. + +* Fri Jul 10 2020 Jiri Vanek - 3.16.1-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed May 13 2020 Fabio Valentini - 3.16.1-2 +- Fix artifact generation by removing antrun plugin again. + +* Tue May 12 2020 Fabio Valentini - 3.16.1-1 +- Update to version 3.16.1. + +* Tue Jan 28 2020 Fedora Release Engineering - 3.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 20 2019 Marian Koncek - 3.14.0-1 +- Update to upstream version 3.14.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.13.2-2 - Mass rebuild for javapackages-tools 201902 +* Fri Sep 13 2019 Fabio Valentini - 3.8.0-6 +- Remove dependency on memoryfilesystem. + * Tue Aug 06 2019 Marian Koncek - 3.13.2-1 - Update to upstream version 3.13.2 +* Wed Jul 24 2019 Fedora Release Engineering - 3.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jun 06 2019 Marian Koncek - 3.12.2-1 - Update to upstream version 3.12.2 * Fri May 24 2019 Mikolaj Izdebski - 3.8.0-3 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 3.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 3.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 3.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild