diff --git a/.gitignore b/.gitignore
index 1faca77..f58e1a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /assertj-core-2.2.0.tar.gz
 /assertj-core-3.8.0.tar.gz
+/assertj-core-3.15.0.tar.gz
+/assertj-core-3.16.1.tar.gz
diff --git a/assertj-core.spec b/assertj-core.spec
index 99befcd..52704cb 100644
--- a/assertj-core.spec
+++ b/assertj-core.spec
@@ -1,62 +1,75 @@
 %bcond_with memoryfilesystem
 
 Name:           assertj-core
-Version:        3.8.0
-Release:        7%{?dist}
+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(cglib:cglib-nodep)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(net.bytebuddy:byte-buddy)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.beanshell:bsh)
+BuildRequires:  mvn(org.hamcrest:hamcrest)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires:  mvn(org.opentest4j:opentest4j)
+
 %if %{with memoryfilesystem}
 BuildRequires:  mvn(com.github.marschall:memoryfilesystem)
 %endif
-BuildRequires:  mvn(org.mockito:mockito-core)
-BuildRequires:  mvn(org.ow2.asm:asm)
 
 %description
 A rich and intuitive set of strongly-typed assertions to use for unit testing
 (either with JUnit or TestNG).
 
+
 %package javadoc
 Summary:        API documentation for %{name}
 
 %description javadoc
 This package provides API documentation for %{name}.
 
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
+# remove dependency on parent POM and inject groupId instead
 %pom_remove_parent
 %pom_xpath_inject "pom:project" "<groupId>org.assertj</groupId>"
 
+# remove plugins that are unnecessary for RPM builds
+%pom_remove_plugin :bnd-maven-plugin
+%pom_remove_plugin :bnd-resolver-maven-plugin
+%pom_remove_plugin :jacoco-maven-plugin
+%pom_remove_plugin :maven-dependency-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :maven-jar-plugin
 %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
-
-# package org.mockito.internal.util.collections does not exist
-rm -rf ./src/test/java/org/assertj/core/error/ShouldContainString_create_Test.java
+%pom_remove_plugin :yuicompressor-maven-plugin
 
 %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
 
 %build
+# dependencies for tests are not packaged for fedora:
+# - nl.jqno.equalsverifier:equalsverifier
 %mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8
 
+
 %install
 %mvn_install
 
+
 %files -f .mfiles
 %doc README.md CONTRIBUTING.md
 %license LICENSE.txt
@@ -65,7 +78,11 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 %doc CONTRIBUTING.md
 %license LICENSE.txt
 
+
 %changelog
+* Tue May 12 2020 Fabio Valentini <decathorpe@gmail.com> - 3.16.1-1
+- Update to version 3.16.1.
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
@@ -99,3 +116,4 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
 
 * Wed Sep 02 2015 Roman Mohr <roman@fenkhuber.at> - 2.2.0-1
 - Initial packaging
+
diff --git a/sources b/sources
index b53ad1d..c80119b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (assertj-core-3.8.0.tar.gz) = ca01bb9323f67c663ca80fed08bcdccedfa28a238231ac141f075bfddef9cc09e18a21af3a12a11ede73111f48a73db9e5a7728bba39c16b5b46c935a3f6cd20
+SHA512 (assertj-core-3.16.1.tar.gz) = 64f5adf092122a7d20e6af77407b767654b483324b8d86cfe83951ffda5b405ccde47c317f75517903c97bba3986f659ec0546a698a297a66d1432229b56359b