Update to latest version of assertj

Disable tests due to missing deps in Fedora
This commit is contained in:
Mat Booth 2017-07-28 13:34:08 +01:00
parent ddfc85cdc3
commit 504e5572c3
3 changed files with 15 additions and 12 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/assertj-core-2.2.0.tar.gz
/assertj-core-3.8.0.tar.gz

View File

@ -1,12 +1,12 @@
%bcond_without memoryfilesystem
Name: assertj-core
Version: 2.2.0
Release: 4%{?dist}
Version: 3.8.0
Release: 1%{?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/%{name}/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
BuildArch: noarch
BuildRequires: maven-local
@ -35,14 +35,9 @@ This package provides API documentation for %{name}.
%pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-shade-plugin
%pom_remove_plugin :maven-dependency-plugin
%pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_remove_plugin org.sonatype.plugins:jarjar-maven-plugin
%pom_xpath_inject "pom:project" "
<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>"
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
@ -52,8 +47,11 @@ rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.ja
rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%endif
# test lib not in Fedora
%pom_remove_dep com.tngtech.java:junit-dataprovider
%build
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
%install
%mvn_install
@ -67,6 +65,10 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
* Fri Jul 28 2017 Mat Booth <mat.booth@redhat.com> - 3.8.0-1
- Update to latest version of assertj
- Disable tests due to missing deps in Fedora
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

View File

@ -1 +1 @@
c3b6505cfc2c15e362f1c586a3703fac assertj-core-2.2.0.tar.gz
SHA512 (assertj-core-3.8.0.tar.gz) = ca01bb9323f67c663ca80fed08bcdccedfa28a238231ac141f075bfddef9cc09e18a21af3a12a11ede73111f48a73db9e5a7728bba39c16b5b46c935a3f6cd20