[easymock] Update to upstream version 3.3
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Nov 25 09:15:21 UTC 2014
commit 68838d8733591b0cb6a5786560e8941c11721d58
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Nov 25 10:15:11 2014 +0100
Update to upstream version 3.3
.gitignore | 1 +
easymock-remove-android-support.patch | 30 ++++++++++++++++++------------
easymock.spec | 9 +++++----
sources | 2 +-
4 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c06021..e85fc0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
easymock-1.2-src.tar.gz
/easymock-1.2_Java1.5.pom
/easymock-3.2.tar.gz
+/easymock-3.3.tar.gz
diff --git a/easymock-remove-android-support.patch b/easymock-remove-android-support.patch
index 53e101a..6173127 100644
--- a/easymock-remove-android-support.patch
+++ b/easymock-remove-android-support.patch
@@ -1,25 +1,25 @@
-From 210c8bae09fb9309519c8266b71635ef308872b3 Mon Sep 17 00:00:00 2001
+From badde85d06cd5ccec026b93cc753dc3e93fb4132 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 9 Aug 2013 12:44:48 +0200
Subject: [PATCH] Remove android support
---
.../internal/AndroidClassProxyFactory.java | 101 ---------------------
- .../java/org/easymock/internal/AndroidSupport.java | 37 --------
+ .../java/org/easymock/internal/AndroidSupport.java | 43 ---------
.../java/org/easymock/internal/MocksControl.java | 6 --
.../easymock/tests2/ClassExtensionHelperTest.java | 12 +--
- 4 files changed, 3 insertions(+), 153 deletions(-)
+ 4 files changed, 3 insertions(+), 159 deletions(-)
delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
delete mode 100644 easymock/src/main/java/org/easymock/internal/AndroidSupport.java
diff --git a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java b/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
deleted file mode 100644
-index da04042..0000000
+index 3e7f11c..0000000
--- a/easymock/src/main/java/org/easymock/internal/AndroidClassProxyFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
-- * Copyright 2001-2013 the original author or authors.
+- * Copyright 2001-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
@@ -122,12 +122,12 @@ index da04042..0000000
\ No newline at end of file
diff --git a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java b/easymock/src/main/java/org/easymock/internal/AndroidSupport.java
deleted file mode 100644
-index 43c683e..0000000
+index dd073cf..0000000
--- a/easymock/src/main/java/org/easymock/internal/AndroidSupport.java
+++ /dev/null
-@@ -1,37 +0,0 @@
+@@ -1,43 +0,0 @@
-/**
-- * Copyright 2001-2013 the original author or authors.
+- * Copyright 2001-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
@@ -152,6 +152,12 @@ index 43c683e..0000000
- static {
- try {
- Class.forName("dalvik.system.PathClassLoader");
+-
+- // Also verify that dexmaker is present, if not we might
+- // be running under something like robolectric, which
+- // means we should not use dexmaker
+- Class.forName("com.google.dexmaker.Code");
+-
- isAndroid = true;
- } catch (final ClassNotFoundException e) {
- isAndroid = false;
@@ -164,10 +170,10 @@ index 43c683e..0000000
- // ///CLOVER:ON
-}
diff --git a/easymock/src/main/java/org/easymock/internal/MocksControl.java b/easymock/src/main/java/org/easymock/internal/MocksControl.java
-index e709dc4..cd9d5a9 100644
+index 131d22c..0782825 100644
--- a/easymock/src/main/java/org/easymock/internal/MocksControl.java
+++ b/easymock/src/main/java/org/easymock/internal/MocksControl.java
-@@ -137,12 +137,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
+@@ -152,12 +152,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters<Object>,
return cached;
}
@@ -181,7 +187,7 @@ index e709dc4..cd9d5a9 100644
return classProxyFactory = new ClassProxyFactory();
} catch (final NoClassDefFoundError e) {
diff --git a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
-index b40466c..b0a7c69 100644
+index 04a413f..3f45555 100644
--- a/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
+++ b/easymock/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
@@ -15,7 +15,6 @@
@@ -218,5 +224,5 @@ index b40466c..b0a7c69 100644
getControl(o);
fail();
--
-1.8.1.4
+1.9.3
diff --git a/easymock.spec b/easymock.spec
index 65d79ef..af6d522 100644
--- a/easymock.spec
+++ b/easymock.spec
@@ -1,6 +1,6 @@
Name: easymock
-Version: 3.2
-Release: 3%{?dist}
+Version: 3.3
+Release: 1%{?dist}
Summary: Easy mock objects
License: ASL 2.0
URL: http://www.easymock.org
@@ -57,9 +57,7 @@ find . -name "*.zip" -delete
%pom_add_dep net.sf.cglib:cglib easymock
# remove some warning caused by unavailable plugin
-%pom_remove_plugin com.atlassian.maven.plugins:maven-clover2-plugin
%pom_remove_plugin org.codehaus.mojo:versions-maven-plugin
-%pom_xpath_remove pom:profiles easymock-classextension
%pom_disable_module easymock-integration
@@ -84,6 +82,9 @@ find . -name "*.zip" -delete
%changelog
+* Tue Nov 25 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.3-1
+- Update to upstream version 3.3
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index db0d7d3..10691b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2907bf4fbc5ed3cf0ef751e31c67a38e easymock-3.2.tar.gz
+3ce129f1477b920b34df245996d258d1 easymock-3.3.tar.gz
More information about the scm-commits
mailing list