Port to maven-jar-plugin 3.0.0

This commit is contained in:
Mikolaj Izdebski 2016-05-30 10:41:54 +02:00
parent d1de73df90
commit 3d407bc514
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,14 @@
--- pom.xml~ 2015-01-05 15:26:16.000000000 +0100
+++ pom.xml 2016-05-30 10:43:28.487416122 +0200
@@ -334,10 +334,10 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
<index>true</index>
<addMavenDescriptor>false</addMavenDescriptor>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>

View File

@ -1,6 +1,6 @@
Name: easymock Name: easymock
Version: 3.3.1 Version: 3.3.1
Release: 4%{?dist} Release: 5%{?dist}
Summary: Easy mock objects Summary: Easy mock objects
License: ASL 2.0 License: ASL 2.0
URL: http://www.easymock.org URL: http://www.easymock.org
@ -8,6 +8,7 @@ URL: http://www.easymock.org
Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz Source0: https://github.com/easymock/easymock/archive/easymock-%{version}.tar.gz
Patch5: %{name}-remove-android-support.patch Patch5: %{name}-remove-android-support.patch
Patch6: %{name}-port-to-maven-jar-plugin-3.patch
BuildArch: noarch BuildArch: noarch
@ -50,6 +51,7 @@ find . -name "*.zip" -delete
# remove android support # remove android support
rm -fr easymock/src/main/java/org/easymock/internal/Android*.java rm -fr easymock/src/main/java/org/easymock/internal/Android*.java
%patch5 -p1 -b .sav %patch5 -p1 -b .sav
%patch6
%pom_xpath_remove "pom:profile[pom:id[text()='android']]" %pom_xpath_remove "pom:profile[pom:id[text()='android']]"
%pom_remove_dep :dexmaker easymock %pom_remove_dep :dexmaker easymock
@ -87,6 +89,9 @@ rm -fr easymock/src/main/java/org/easymock/internal/Android*.java
%changelog %changelog
* Mon May 30 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-5
- Port to maven-jar-plugin 3.0.0
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild