Compare commits

..

No commits in common. "c8-stream-201902" and "c8-stream-201801" have entirely different histories.

3 changed files with 16 additions and 25 deletions

View File

@ -1 +1 @@
0b73677480e9d8a9a0336a8b1ad4ed7ea8346ab5 SOURCES/assertj-core-3.13.2.tar.gz e44707bc81d3383449520da483aa3ef800e38579 SOURCES/assertj-core-3.8.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/assertj-core-3.13.2.tar.gz SOURCES/assertj-core-3.8.0.tar.gz

View File

@ -1,18 +1,21 @@
%bcond_without memoryfilesystem
Name: assertj-core Name: assertj-core
Version: 3.13.2 Version: 3.8.0
Release: 2%{?dist} Release: 2%{?dist}
Summary: Library of assertions similar to fest-assert Summary: Library of assertions similar to fest-assert
License: ASL 2.0 License: ASL 2.0
URL: http://joel-costigliola.github.io/assertj/ URL: http://joel-costigliola.github.io/assertj/
Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(cglib:cglib-nodep) BuildRequires: mvn(cglib:cglib-nodep)
%if %{with memoryfilesystem}
BuildRequires: mvn(com.github.marschall:memoryfilesystem)
%endif
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.mockito:mockito-core)
%description %description
@ -26,54 +29,42 @@ Summary: API documentation for %{name}
This package provides API documentation for %{name}. This package provides API documentation for %{name}.
%prep %prep
%setup -q -n assertj-core-assertj-core-%{version} %setup -q -n %{name}-%{name}-%{version}
%pom_remove_parent %pom_remove_parent
%pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>" %pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
%pom_xpath_remove "pom:release"
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-shade-plugin %pom_remove_plugin :maven-shade-plugin
%pom_remove_plugin :maven-dependency-plugin %pom_remove_plugin :maven-dependency-plugin
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_remove_plugin :jacoco-maven-plugin
# package org.mockito.internal.util.collections does not exist # package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
%if %{without memoryfilesystem}
%pom_remove_dep :memoryfilesystem %pom_remove_dep :memoryfilesystem
rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths} rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%endif
# test lib not in Fedora # test lib not in Fedora
%pom_remove_dep org.junit:junit-bom: %pom_remove_dep com.tngtech.java:junit-dataprovider
%build %build
%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+ %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%doc README.md CONTRIBUTING.md %doc README.md CONTRIBUTING.md
%license LICENSE %license LICENSE.txt
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc CONTRIBUTING.md %doc CONTRIBUTING.md
%license LICENSE %license LICENSE.txt
%changelog %changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13.2-2
- Mass rebuild for javapackages-tools 201902
* Tue Aug 06 2019 Marian Koncek <mkoncek@redhat.com> - 3.13.2-1
- Update to upstream version 3.13.2
* 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
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild