diff --git a/.gitignore b/.gitignore index 3110db5..c74c667 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,9 @@ +/results_* +/*.src.rpm + /r1.0.0.tar.gz /opentest4j-1.0.0.pom /opentest4j-1.1.1.pom /r1.1.1.tar.gz +/r1.2.0.tar.gz +/opentest4j-1.2.0.pom diff --git a/opentest4j.spec b/opentest4j.spec index 54af55a..3056ae1 100644 --- a/opentest4j.spec +++ b/opentest4j.spec @@ -1,15 +1,15 @@ Name: opentest4j -Version: 1.1.1 -Release: 3%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Open Test Alliance for the JVM License: ASL 2.0 + URL: https://github.com/ota4j-team/opentest4j -BuildArch: noarch - -Source0: https://github.com/ota4j-team/opentest4j/archive/r%{version}.tar.gz - +Source0: %{url}/archive/r%{version}.tar.gz Source100: https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom +BuildArch: noarch + BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -34,7 +34,7 @@ API documentation for %{name}. find -name \*.jar -delete cp -p %{SOURCE100} pom.xml -%pom_add_dep junit:junit:4.12:test +%pom_add_dep junit:junit::test %pom_xpath_inject pom:project " @@ -65,10 +65,6 @@ cp -p %{SOURCE100} pom.xml " -# Fix unused reference to unused dependency -# This is fixed upstream: https://github.com/ota4j-team/opentest4j/commit/70d3d54f2cd076a962e81d9510e6716f3cbf8060 -sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/AssertionFailedErrorTests.java - %build %mvn_build @@ -83,6 +79,9 @@ sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/Assertio %license LICENSE %changelog +* Wed Mar 04 2020 Fabio Valentini - 1.2.0-1 +- Update to version 1.2.0. + * Wed Jan 29 2020 Fedora Release Engineering - 1.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e816243..1a0a464 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (opentest4j-1.1.1.pom) = 1aa0d4ed9afe200e0d4b084b5b446de8da98cf38ff25d4004d738dd6ef6706d47d17554599eba6faec2bf49e42211d1f16045c7b03d0b374cb2cdb6b5d5d5f2d -SHA512 (r1.1.1.tar.gz) = d1cbaeeed7fc9fa464ea19062ff2744323c8eb60b676e511c1b2a344e7c69e3e3630805bd06d084cb5b3cee58918a7f58d70ade7821e37ec093a93e1506b2ea6 +SHA512 (r1.2.0.tar.gz) = cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08 +SHA512 (opentest4j-1.2.0.pom) = 28ce0d0b5cceeac5adfcdd16ee6f5fbefd43eef8057b924993fb7a9f4b7a7085b980f3e808db5fb7750a53d0072b7fe7b118f5c0011e3ef0efe6c9a90a87b868