Update to upstream version 3.24.2
Enable module-info generation
This commit is contained in:
parent
0d5b95b6e0
commit
18a09fc5d3
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@
|
||||
/assertj-core-3.18.1.tar.gz
|
||||
/assertj-core-3.19.0.tar.gz
|
||||
/assertj-core-3.23.1.tar.gz
|
||||
/assertj-build-3.24.2.tar.gz
|
||||
|
@ -1,12 +1,12 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
Name: assertj-core
|
||||
Version: 3.23.1
|
||||
Release: 2%{?dist}
|
||||
Version: 3.24.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Library of assertions similar to fest-assert
|
||||
License: ASL 2.0
|
||||
URL: https://joel-costigliola.github.io/assertj/
|
||||
Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-core-%{version}.tar.gz
|
||||
Source0: https://github.com/joel-costigliola/assertj-core/archive/assertj-build-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
@ -26,34 +26,45 @@ BuildRequires: mvn(org.opentest4j:opentest4j)
|
||||
A rich and intuitive set of strongly-typed assertions to use for unit testing
|
||||
(either with JUnit or TestNG).
|
||||
|
||||
%if 0
|
||||
%package javadoc
|
||||
Summary: API documentation for %{name}
|
||||
|
||||
%description javadoc
|
||||
This package provides API documentation for %{name}.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n assertj-assertj-core-%{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 :yuicompressor-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_plugin :maven-invoker-plugin
|
||||
%pom_remove_plugin :maven-javadoc-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 :bnd-testing-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
|
||||
|
||||
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"]'
|
||||
%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
|
||||
@ -65,11 +76,16 @@ rm -r src/test/java/org/assertj/core/internal/{Paths*.java,paths}
|
||||
%doc README.md CONTRIBUTING.md
|
||||
%license LICENSE.txt
|
||||
|
||||
%if 0
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc CONTRIBUTING.md
|
||||
%license LICENSE.txt
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Feb 15 2023 Marian Koncek <mkoncek@redhat.com> - 3.24.2-1
|
||||
- Update to upstream version 3.24.2
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (assertj-core-3.23.1.tar.gz) = b110ea7e8366b308ccc1e3c1a74767191ff65e0462bf137f91a937a063caaa5cf3881c2b8a2c41aa6a8fa072dc385578f0eb4324f481fbea4938dd00a583eb9d
|
||||
SHA512 (assertj-build-3.24.2.tar.gz) = c9788c59c86dd1819d3a41b2235b0a912f52560b48cbdd087373595640f894846bc66f293f67a61d513fa2ecf5c98b60dde42cd37f2989cde7bb22092b309394
|
||||
|
Loading…
Reference in New Issue
Block a user