From 504e5572c3f5e6cbc4c727e722b02d0752a0a3f6 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jul 28 2017 12:34:08 +0000 Subject: Update to latest version of assertj Disable tests due to missing deps in Fedora --- diff --git a/.gitignore b/.gitignore index 7e2989d..1faca77 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /assertj-core-2.2.0.tar.gz +/assertj-core-3.8.0.tar.gz diff --git a/assertj-core.spec b/assertj-core.spec index d3ef652..44790b8 100644 --- a/assertj-core.spec +++ b/assertj-core.spec @@ -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" "org.assertj" %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" " - - 1.7 - 1.7 - " # 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 - 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 - 2.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 145d72b..b53ad1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3b6505cfc2c15e362f1c586a3703fac assertj-core-2.2.0.tar.gz +SHA512 (assertj-core-3.8.0.tar.gz) = ca01bb9323f67c663ca80fed08bcdccedfa28a238231ac141f075bfddef9cc09e18a21af3a12a11ede73111f48a73db9e5a7728bba39c16b5b46c935a3f6cd20