From a7a3936d7600a893be51c8ab3c58c2af411aed68 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 9 Sep 2022 14:43:12 +0200
Subject: [PATCH] Update to upstream version 3.23.1

---
 .gitignore        |  1 +
 assertj-core.spec | 20 ++++++++++----------
 sources           |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12c3416..ad7c081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /assertj-core-3.17.2.tar.gz
 /assertj-core-3.18.1.tar.gz
 /assertj-core-3.19.0.tar.gz
+/assertj-core-3.23.1.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index ad3f6e7..83c1856 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           assertj-core
-Version:        3.19.0
-Release:        6%{?dist}
+Version:        3.23.1
+Release:        1%{?dist}
 Summary:        Library of assertions similar to fest-assert
 License:        ASL 2.0
 URL:            https://joel-costigliola.github.io/assertj/
@@ -33,33 +33,30 @@ Summary:        API documentation for %{name}
 This package provides API documentation for %{name}.
 
 %prep
-%setup -q -n assertj-core-assertj-core-%{version}
+%setup -q -n assertj-assertj-core-%{version}
 
 %pom_remove_parent
 %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
 %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
 %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
 
-%pom_remove_dep :memoryfilesystem
 rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 
+# Missing module dependencies
+%pom_xpath_remove 'pom:plugin/pom:executions/pom:execution[pom:id="jdk9"]'
+
 %build
-%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 -P \!java9+
+%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
@@ -73,6 +70,9 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 %license LICENSE.txt
 
 %changelog
+* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 3.23.1-1
+- Update to upstream version 3.23.1
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index c4f1c0f..320e14e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.19.0.tar.gz) = 9a9f803d120f5aff36876cc4128f0dc36d159ddfa0a61cb1838180b9b561e533731c67683a262e42796c5e18edd14a9bb0a9806e185d1ed274b64b5b5f68305a
+SHA512 (assertj-core-3.23.1.tar.gz) = b110ea7e8366b308ccc1e3c1a74767191ff65e0462bf137f91a937a063caaa5cf3881c2b8a2c41aa6a8fa072dc385578f0eb4324f481fbea4938dd00a583eb9d