Remove obsolete patches

This commit is contained in:
Mikolaj Izdebski 2022-05-10 13:07:24 +02:00
parent 743f19c67e
commit 6ad430f706

View File

@ -2,7 +2,7 @@
Name: maven-enforcer
Version: 3.0.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Maven Enforcer
License: ASL 2.0
URL: https://maven.apache.org/enforcer
@ -77,10 +77,6 @@ pom.xml, but you can enforce a set of rules.
%setup -q -n enforcer-%{version}
find -name '*.java' -exec sed -i 's/\r//' {} +
# Port to maven-artifact-transfer 0.11.0
sed -i 's/shared\.artifact\.resolve/shared.transfer.artifact.resolve/' enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
sed -i 's/shared\.artifact\.resolve/shared.transfer.artifact.resolve/' enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
find -name EvaluateBeanshell.java -delete
%pom_remove_dep :bsh enforcer-rules
@ -91,11 +87,6 @@ find -name EvaluateBeanshell.java -delete
<version>SYSTEM</version>
</plugin>"
# Replace plexus-maven-plugin with plexus-component-metadata
sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-component-metadata</artifactId>|" \
-e "s|<goal>descriptor</goal>|<goal>generate-metadata</goal>|" \
-i enforcer-{api,rules}/pom.xml
%build
%mvn_build -s -f
@ -118,6 +109,9 @@ sed -e "s|<artifactId>plexus-maven-plugin</artifactId>|<artifactId>plexus-compon
%doc LICENSE NOTICE
%changelog
* Tue May 10 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-3
- Remove obsolete patches
* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-2
- Add build-dependency on extra-enforcer-rules