From ec5fd8a78047d1e23dcbf801a5480fb6e26cd6ad Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 12:42:46 +0000
Subject: [PATCH 01/12] Expand conditionals
---
assertj-core.spec | 6 ------
1 file changed, 6 deletions(-)
diff --git a/assertj-core.spec b/assertj-core.spec
index 8d685b2..c7023c9 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,4 +1,3 @@
-%bcond_without memoryfilesystem
Name: assertj-core
Version: 3.8.0
@@ -12,9 +11,6 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(cglib:cglib-nodep)
-%if %{with memoryfilesystem}
-BuildRequires: mvn(com.github.marschall:memoryfilesystem)
-%endif
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.mockito:mockito-core)
@@ -42,10 +38,8 @@ This package provides API documentation for %{name}.
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
-%if %{without memoryfilesystem}
%pom_remove_dep :memoryfilesystem
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
From b1216a4c812e1fce720a14cc50be005cdfb67918 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 17:00:24 +0200
Subject: [PATCH 02/12] Mass rebuild for javapackages-tools 201901
---
assertj-core.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/assertj-core.spec b/assertj-core.spec
index c7023c9..b7518b9 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,7 +1,7 @@
Name: assertj-core
Version: 3.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
URL: http://joel-costigliola.github.io/assertj/
@@ -59,6 +59,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
+* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
From e6e247eaee246e091af8d60ce2a1b0b18b38a488 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 6 Jun 2019 10:31:57 +0200
Subject: [PATCH 03/12] Update to upstream version 3.12.2
---
.gitignore | 1 +
assertj-core.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1faca77..4db8e7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/assertj-core-2.2.0.tar.gz
/assertj-core-3.8.0.tar.gz
+/assertj-core-3.12.2.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index b7518b9..0bf5b3d 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,7 +1,6 @@
-
Name: assertj-core
-Version: 3.8.0
-Release: 3%{?dist}
+Version: 3.12.2
+Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
URL: http://joel-costigliola.github.io/assertj/
@@ -12,6 +11,7 @@ BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(cglib:cglib-nodep)
BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
BuildRequires: mvn(org.mockito:mockito-core)
%description
@@ -42,7 +42,7 @@ 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}
# test lib not in Fedora
-%pom_remove_dep com.tngtech.java:junit-dataprovider
+%pom_remove_dep org.junit:junit-bom:
%build
%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
@@ -52,13 +52,16 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%files -f .mfiles
%doc README.md CONTRIBUTING.md
-%license LICENSE.txt
+%license LICENSE.md
%files javadoc -f .mfiles-javadoc
%doc CONTRIBUTING.md
-%license LICENSE.txt
+%license LICENSE.md
%changelog
+* 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
diff --git a/sources b/sources
index b53ad1d..4921293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.8.0.tar.gz) = ca01bb9323f67c663ca80fed08bcdccedfa28a238231ac141f075bfddef9cc09e18a21af3a12a11ede73111f48a73db9e5a7728bba39c16b5b46c935a3f6cd20
+SHA512 (assertj-core-3.12.2.tar.gz) = 166673827f4f46f4b29ace0341e758da6c49023e84e0bd128f94a8bdf27e538a9d79830e649fe87e3b8fd01c075ce7096d490a8c2ec36e8fc4d0f72c26ca624d
From 08128b6336ef46d3d5705c4d79b4e6666b3e31bc Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 19 Aug 2019 12:07:30 +0200
Subject: [PATCH 04/12] Update to upstream version 3.13.2
---
.gitignore | 1 +
assertj-core.spec | 16 +++++++++++-----
sources | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4db8e7d..8c40a96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/assertj-core-2.2.0.tar.gz
/assertj-core-3.8.0.tar.gz
/assertj-core-3.12.2.tar.gz
+/assertj-core-3.13.2.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 0bf5b3d..a0ec380 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,10 +1,11 @@
Name: assertj-core
-Version: 3.12.2
+Version: 3.13.2
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/assertj-core/archive/assertj-core-%{version}.tar.gz
+
BuildArch: noarch
BuildRequires: maven-local
@@ -25,15 +26,17 @@ Summary: API documentation for %{name}
This package provides API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n assertj-core-assertj-core-%{version}
%pom_remove_parent
%pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
+%pom_xpath_remove "pom:release"
%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 :maven-enforcer-plugin
+%pom_remove_plugin :jacoco-maven-plugin
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
@@ -52,13 +55,16 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%files -f .mfiles
%doc README.md CONTRIBUTING.md
-%license LICENSE.md
+%license LICENSE
%files javadoc -f .mfiles-javadoc
%doc CONTRIBUTING.md
-%license LICENSE.md
+%license LICENSE
%changelog
+* 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
diff --git a/sources b/sources
index 4921293..569ad31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.12.2.tar.gz) = 166673827f4f46f4b29ace0341e758da6c49023e84e0bd128f94a8bdf27e538a9d79830e649fe87e3b8fd01c075ce7096d490a8c2ec36e8fc4d0f72c26ca624d
+SHA512 (assertj-core-3.13.2.tar.gz) = 930672939aca0fcb2134d04cf582368943e971133e8ff1a9ea42d55affb5183cdd9faafc1d4530d424ec09e23dae137557ccd38350755e80f4667483ab499b30
From a16a09dd04274ee5bcf2805f124cacada9281038 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 28 Oct 2019 13:42:29 +0100
Subject: [PATCH 05/12] Deactivate java9+ profile
---
assertj-core.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assertj-core.spec b/assertj-core.spec
index a0ec380..534fbce 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -48,7 +48,7 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%pom_remove_dep org.junit:junit-bom:
%build
-%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+
%install
%mvn_install
From 118fbc0035a2303236aef4b7036e7c536cfe07af Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 17:29:27 +0100
Subject: [PATCH 06/12] Mass rebuild for javapackages-tools 201902
---
assertj-core.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/assertj-core.spec b/assertj-core.spec
index 534fbce..507d2b7 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,6 +1,6 @@
Name: assertj-core
Version: 3.13.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
URL: http://joel-costigliola.github.io/assertj/
@@ -62,6 +62,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE
%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
From 26691001baa20be5376418ba7c05039808ccd879 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 20 Nov 2019 15:58:45 +0100
Subject: [PATCH 07/12] Update to upstream version 3.14.0
---
.gitignore | 1 +
assertj-core.spec | 15 ++++++++-------
sources | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8c40a96..29038ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/assertj-core-3.8.0.tar.gz
/assertj-core-3.12.2.tar.gz
/assertj-core-3.13.2.tar.gz
+/assertj-core-3.14.0.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 507d2b7..4f1b766 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,6 +1,6 @@
Name: assertj-core
-Version: 3.13.2
-Release: 2%{?dist}
+Version: 3.14.0
+Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
URL: http://joel-costigliola.github.io/assertj/
@@ -37,6 +37,7 @@ This package provides API documentation for %{name}.
%pom_remove_plugin :maven-dependency-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :jacoco-maven-plugin
+%pom_remove_plugin :yuicompressor-maven-plugin
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
@@ -44,9 +45,6 @@ rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.ja
%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:
-
%build
%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+
@@ -55,13 +53,16 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%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
+* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.14.0-1
+- Update to upstream version 3.14.0
+
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.13.2-2
- Mass rebuild for javapackages-tools 201902
diff --git a/sources b/sources
index 569ad31..31b15bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.13.2.tar.gz) = 930672939aca0fcb2134d04cf582368943e971133e8ff1a9ea42d55affb5183cdd9faafc1d4530d424ec09e23dae137557ccd38350755e80f4667483ab499b30
+SHA512 (assertj-core-3.14.0.tar.gz) = 04352ee72a0bb8e04713e9a7a0242518b911b0eabf293f690086f764dec56d2fcee91252b7aca96d69bfd40405b2f3ccc38f5f20693bbe3f7e0ddcaf1f46932b
From a92ca4720960c97d6d146cb7890f0a4dab53930c Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jul 2020 09:38:47 +0200
Subject: [PATCH 08/12] Update to upstream version 3.16.1
---
.gitignore | 1 +
assertj-core.spec | 17 ++++++++++++-----
sources | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 29038ae..c10f82c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/assertj-core-3.12.2.tar.gz
/assertj-core-3.13.2.tar.gz
/assertj-core-3.14.0.tar.gz
+/assertj-core-3.16.1.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 4f1b766..93b13e9 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,19 +1,19 @@
Name: assertj-core
-Version: 3.14.0
+Version: 3.16.1
Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
-URL: http://joel-costigliola.github.io/assertj/
+URL: https://joel-costigliola.github.io/assertj/
Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
BuildArch: noarch
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)
%description
A rich and intuitive set of strongly-typed assertions to use for unit testing
@@ -38,6 +38,10 @@ This package provides API documentation for %{name}.
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :jacoco-maven-plugin
%pom_remove_plugin :yuicompressor-maven-plugin
+%pom_remove_plugin :bnd-maven-plugin
+%pom_remove_plugin :bnd-resolver-maven-plugin
+%pom_remove_plugin :maven-antrun-plugin
+%pom_remove_plugin :maven-jar-plugin
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
@@ -60,6 +64,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 3.16.1-1
+- Update to upstream version 3.16.1
+
* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.14.0-1
- Update to upstream version 3.14.0
diff --git a/sources b/sources
index 31b15bb..c80119b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.14.0.tar.gz) = 04352ee72a0bb8e04713e9a7a0242518b911b0eabf293f690086f764dec56d2fcee91252b7aca96d69bfd40405b2f3ccc38f5f20693bbe3f7e0ddcaf1f46932b
+SHA512 (assertj-core-3.16.1.tar.gz) = 64f5adf092122a7d20e6af77407b767654b483324b8d86cfe83951ffda5b405ccde47c317f75517903c97bba3986f659ec0546a698a297a66d1432229b56359b
From 8f9b31ac835d759d499a96e9dea8eb29d038d8bf Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 21 Sep 2020 14:53:42 +0200
Subject: [PATCH 09/12] Update to upstream version 3.17.2
---
.gitignore | 1 +
assertj-core.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index c10f82c..f9e80a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/assertj-core-3.13.2.tar.gz
/assertj-core-3.14.0.tar.gz
/assertj-core-3.16.1.tar.gz
+/assertj-core-3.17.2.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 93b13e9..4750f03 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,5 +1,5 @@
Name: assertj-core
-Version: 3.16.1
+Version: 3.17.2
Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
@@ -42,6 +42,7 @@ This package provides API documentation for %{name}.
%pom_remove_plugin :bnd-resolver-maven-plugin
%pom_remove_plugin :maven-antrun-plugin
%pom_remove_plugin :maven-jar-plugin
+%pom_remove_plugin :bnd-testing-maven-plugin
# package org.mockito.internal.util.collections does not exist
rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
@@ -64,6 +65,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
+* Mon Sep 21 2020 Marian Koncek <mkoncek@redhat.com> - 3.17.2-1
+- Update to upstream version 3.17.2
+
* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 3.16.1-1
- Update to upstream version 3.16.1
diff --git a/sources b/sources
index c80119b..9959321 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.16.1.tar.gz) = 64f5adf092122a7d20e6af77407b767654b483324b8d86cfe83951ffda5b405ccde47c317f75517903c97bba3986f659ec0546a698a297a66d1432229b56359b
+SHA512 (assertj-core-3.17.2.tar.gz) = 339f64e56c3bd3d0495eab412e7c87904787ca024d77e4fdcc6f205b23932003d5a758ce82463c93a9fd6be7b68e35de972655a443e65208cbcd786022084277
From 8f743f76b53cf834975352a79a7149117f4bb423 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 20 Jan 2021 15:46:50 +0100
Subject: [PATCH 10/12] Update to upstream version 3.18.1
---
.gitignore | 1 +
assertj-core.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index f9e80a3..016d076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/assertj-core-3.14.0.tar.gz
/assertj-core-3.16.1.tar.gz
/assertj-core-3.17.2.tar.gz
+/assertj-core-3.18.1.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 4750f03..e6337f3 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,5 +1,5 @@
Name: assertj-core
-Version: 3.17.2
+Version: 3.18.1
Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
@@ -32,6 +32,7 @@ This package provides API documentation for %{name}.
%pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
%pom_xpath_remove "pom:release"
+%pom_remove_plugin :maven-invoker-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-shade-plugin
%pom_remove_plugin :maven-dependency-plugin
@@ -65,6 +66,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
+* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 3.18.1-1
+- Update to upstream version 3.18.1
+
* Mon Sep 21 2020 Marian Koncek <mkoncek@redhat.com> - 3.17.2-1
- Update to upstream version 3.17.2
diff --git a/sources b/sources
index 9959321..c2e9470 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.17.2.tar.gz) = 339f64e56c3bd3d0495eab412e7c87904787ca024d77e4fdcc6f205b23932003d5a758ce82463c93a9fd6be7b68e35de972655a443e65208cbcd786022084277
+SHA512 (assertj-core-3.18.1.tar.gz) = 16972e03307400ec5404b63a2a1d5fcdf0cc9af6969b304350d7addd7163efd50a8becdfaf5810246f1dd94ab18b7ef2d2e022b1fb2402552f0f6ef87eb6f20c
From a6c7a06c84aae9a8260c4460ec63097fa4588ca8 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 8 Feb 2021 17:05:53 +0100
Subject: [PATCH 11/12] Update to upstream version 3.19.0
---
.gitignore | 1 +
assertj-core.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 016d076..9759b44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/assertj-core-3.16.1.tar.gz
/assertj-core-3.17.2.tar.gz
/assertj-core-3.18.1.tar.gz
+/assertj-core-3.19.0.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index e6337f3..8a6e296 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,5 +1,5 @@
Name: assertj-core
-Version: 3.18.1
+Version: 3.19.0
Release: 1%{?dist}
Summary: Library of assertions similar to fest-assert
License: ASL 2.0
@@ -66,6 +66,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
%license LICENSE.txt
%changelog
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 3.19.0-1
+- Update to upstream version 3.19.0
+
* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 3.18.1-1
- Update to upstream version 3.18.1
diff --git a/sources b/sources
index c2e9470..c4f1c0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.18.1.tar.gz) = 16972e03307400ec5404b63a2a1d5fcdf0cc9af6969b304350d7addd7163efd50a8becdfaf5810246f1dd94ab18b7ef2d2e022b1fb2402552f0f6ef87eb6f20c
+SHA512 (assertj-core-3.19.0.tar.gz) = 9a9f803d120f5aff36876cc4128f0dc36d159ddfa0a61cb1838180b9b561e533731c67683a262e42796c5e18edd14a9bb0a9806e185d1ed274b64b5b5f68305a
From 7b6e90554e91c2603a6b721149bf326320d3336f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 16 Apr 2021 15:33:12 +0200
Subject: [PATCH 12/12] Conditionalize buildrequires in bootstrap mode
---
assertj-core.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/assertj-core.spec b/assertj-core.spec
index 8a6e296..902521c 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
Name: assertj-core
Version: 3.19.0
Release: 1%{?dist}
@@ -9,11 +11,15 @@ Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj
BuildArch: noarch
BuildRequires: maven-local
+%if %{with bootstrap}
+BuildRequires: javapackages-bootstrap
+%else
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.opentest4j:opentest4j)
+%endif
%description
A rich and intuitive set of strongly-typed assertions to use for unit testing