From 1b100b29d76d8d9cc90dac7f8175acb703796c596f9c7cb7f44b47c7739c65f8 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 24 Apr 2024 17:51:33 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/assertj-core?expand=0&rev=6

---
 assertj-build-3.25.3.tar.gz |  3 ++
 assertj-core-3.8.0.tar.gz   |  3 --
 assertj-core.spec           | 70 ++++++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 35 deletions(-)
 create mode 100644 assertj-build-3.25.3.tar.gz
 delete mode 100644 assertj-core-3.8.0.tar.gz

diff --git a/assertj-build-3.25.3.tar.gz b/assertj-build-3.25.3.tar.gz
new file mode 100644
index 0000000..9356948
--- /dev/null
+++ b/assertj-build-3.25.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a9b1e3bedf589ef5b2ba08bfa4696eeab3d8d5ac6d060ac51e772ad1b172dbb
+size 1831078
diff --git a/assertj-core-3.8.0.tar.gz b/assertj-core-3.8.0.tar.gz
deleted file mode 100644
index 579396c..0000000
--- a/assertj-core-3.8.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df4d6c550b435bec61ce243997b154a60b4e9230e84d3a3322c54ddd1d11c1cd
-size 976388
diff --git a/assertj-core.spec b/assertj-core.spec
index 00f2342..1e37037 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package assertj-core
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,28 +16,24 @@
 #
 
 
-%bcond_with  memoryfilesystem
 Name:           assertj-core
-Version:        3.8.0
+Version:        3.25.3
 Release:        0
 Summary:        Library of assertions similar to fest-assert
 License:        Apache-2.0
-Group:          Development/Libraries/Java
-URL:            http://joel-costigliola.github.io/assertj/
-Source0:        https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
+URL:            https://joel-costigliola.github.io/assertj/
+Source0:        https://github.com/joel-costigliola/assertj-core/archive/assertj-build-%{version}.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  maven-local
-BuildRequires:  mvn(cglib:cglib-nodep)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.mockito:mockito-core)
+BuildRequires:  mvn(net.bytebuddy:byte-buddy)
+BuildRequires:  mvn(org.hamcrest:hamcrest)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires:  mvn(org.opentest4j:opentest4j)
 BuildArch:      noarch
-%if %{with memoryfilesystem}
-BuildRequires:  mvn(com.github.marschall:memoryfilesystem)
-%endif
 
 %description
-A set of strongly-typed assertions to use for unit testing
+A rich and intuitive set of strongly-typed assertions to use for unit testing
 (either with JUnit or TestNG).
 
 %package javadoc
@@ -47,33 +43,43 @@ Summary:        API documentation for %{name}
 This package provides API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n assertj-assertj-build-%{version}
 
-%{pom_remove_parent}
-%pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
+%pom_remove_plugin -r :maven-javadoc-plugin
+%pom_remove_plugin -r :maven-enforcer-plugin
+%pom_remove_plugin -r :jacoco-maven-plugin
+%pom_remove_plugin -r :spotless-maven-plugin
+%pom_remove_plugin -r :bnd-maven-plugin
+%pom_remove_plugin -r :bnd-resolver-maven-plugin
+%pom_remove_plugin -r :bnd-testing-maven-plugin
+%pom_remove_plugin -r :nexus-staging-maven-plugin
+%pom_remove_plugin -r :license-maven-plugin
+%pom_remove_plugin -r :flatten-maven-plugin
+%pom_remove_dep -r :mockito-bom
+%pom_remove_dep -r :junit-bom
 
-%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_disable_module assertj-core-kotlin assertj-tests/assertj-integration-tests
+%pom_disable_module assertj-core-groovy assertj-tests/assertj-integration-tests
 
-# 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 openSUSE
-%pom_remove_dep com.tngtech.java:junit-dataprovider
+%pom_xpath_inject pom:plugins '
+<plugin>
+  <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>maven-jar-plugin</artifactId>
+  <version>any</version>
+  <configuration>
+    <archive>
+      <manifestEntries>
+        <Multi-Release>true</Multi-Release>
+      </manifestEntries>
+    </archive>
+  </configuration>
+</plugin>' assertj-core
 
 %build
-%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 -Dsource=8
+%{mvn_build} -f -- -Dmaven.compiler.release=8 -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
-%fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
 %doc README.md CONTRIBUTING.md