rpms/easymock
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.5

Browse Source
This commit is contained in:
Mikolaj Izdebski 2017-09-18 09:08:46 +02:00
parent 5c79af3c62
commit b58a89d51a
5 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0002-Disable-android-support.patch → 0001-Disable-android-support.patch
View File

@ -1,17 +1,17 @@
From 1422eddacbbe4ca5614794ebb7ba8779ce2718f2 Mon Sep 17 00:00:00 2001
From 57501046dc32012210433444543c513b20c5d517 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 30 May 2016 14:24:43 +0200
Subject: [PATCH 2/4] Disable android support
Subject: [PATCH 1/3] Disable android support
---
core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------
1 file changed, 6 deletions(-)
diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java
index 6ae65d1..d5937b0 100644
index fb2a5dc..356b1c4 100644
--- a/core/src/main/java/org/easymock/internal/MocksControl.java
+++ b/core/src/main/java/org/easymock/internal/MocksControl.java
@@ -141,12 +141,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
@@ -147,12 +147,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
return cached;
}
@ -25,5 +25,5 @@ index 6ae65d1..d5937b0 100644
}
--
2.5.5
2.13.5

27
0001-Port-to-maven-jar-plugin-3.0.0.patch
View File

@ -1,27 +0,0 @@
From c68c40a586dc187e5f004a0279f143b278b81cd6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 May 2016 10:45:16 +0200
Subject: [PATCH 1/4] Port to maven-jar-plugin 3.0.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index db33e5b..df2c483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,9 +339,9 @@
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
--
2.5.5

12
0003-Unshade-cglib-and-asm.patch → 0002-Unshade-cglib-and-asm.patch
View File

@ -1,18 +1,18 @@
From 1f0a742506d9d6270607158d91f9939089a1b731 Mon Sep 17 00:00:00 2001
From 2ad2e79989f64072d8437ada55b12eaa8c23834d Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 30 May 2016 15:14:40 +0200
Subject: [PATCH 3/4] Unshade cglib and asm
Subject: [PATCH 2/3] Unshade cglib and asm
---
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 00e1575..2fa5653 100644
index 1ca847a..5ed6adb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -87,8 +87,8 @@
<artifactId>maven-bundle-plugin</artifactId>
@@ -100,8 +100,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm</Export-Package>
@ -23,5 +23,5 @@ index 00e1575..2fa5653 100644
</configuration>
<executions>
--
2.5.5
2.13.5

12
0004-Fix-OSGi-manifest.patch → 0003-Fix-OSGi-manifest.patch
View File

@ -1,7 +1,7 @@
From a228c98f921520577d9563b0a330f7af4f19b66c Mon Sep 17 00:00:00 2001
From fa908a1748cb3090d677a63db4986ffc57acbf1e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 1 Jun 2016 09:31:44 +0200
Subject: [PATCH 4/4] Fix OSGi manifest
Subject: [PATCH 3/3] Fix OSGi manifest
Resolves: rhbz#1341052
---
@ -9,11 +9,11 @@ Resolves: rhbz#1341052
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 2fa5653..73c4d94 100644
index 5ed6adb..ea6d015 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -87,8 +87,9 @@
<artifactId>maven-bundle-plugin</artifactId>
@@ -100,8 +100,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser</Export-Package>
@ -24,5 +24,5 @@ index 2fa5653..73c4d94 100644
</configuration>
<executions>
--
2.5.5
2.13.5

18
easymock.spec
View File

@ -1,16 +1,15 @@
Name: easymock
Version: 3.4
Release: 6%{?dist}
Version: 3.5
Release: 1%{?dist}
Summary: Easy mock objects
License: ASL 2.0
URL: http://www.easymock.org
Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{version}.tar.gz
Patch1: 0001-Port-to-maven-jar-plugin-3.0.0.patch
Patch2: 0002-Disable-android-support.patch
Patch3: 0003-Unshade-cglib-and-asm.patch
Patch4: 0004-Fix-OSGi-manifest.patch
Patch1: 0001-Disable-android-support.patch
Patch2: 0002-Unshade-cglib-and-asm.patch
Patch3: 0003-Fix-OSGi-manifest.patch
BuildArch: noarch
@ -19,9 +18,12 @@ BuildRequires: mvn(cglib:cglib)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47)
BuildRequires: mvn(org.apache.maven.surefire:surefire-testng)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.objenesis:objenesis)
BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.testng:testng)
# xmvn-builddep misses this:
BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
@ -50,7 +52,6 @@ Javadoc for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%pom_remove_plugin :maven-license-plugin
@ -95,6 +96,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
%changelog
* Mon Sep 18 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-1
- Update to upstream version 3.5
* Fri Sep 15 2017 Mat Booth <mat.booth@redhat.com> - 3.4-6
- Regenerate OSGi metadata due to Objectweb ASM upgrade