diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/jmock/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/jmock/files')
-rw-r--r-- | dev-java/jmock/files/1.1.0-build.xml.patch | 21 | ||||
-rw-r--r-- | dev-java/jmock/files/1.1.0-junit-3.8.2.patch | 12 | ||||
-rw-r--r-- | dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch | 30 |
3 files changed, 63 insertions, 0 deletions
diff --git a/dev-java/jmock/files/1.1.0-build.xml.patch b/dev-java/jmock/files/1.1.0-build.xml.patch new file mode 100644 index 000000000000..22b47eefa23a --- /dev/null +++ b/dev-java/jmock/files/1.1.0-build.xml.patch @@ -0,0 +1,21 @@ +diff -ur jmock-1.1.0.old/build.xml jmock-1.1.0/build.xml +--- jmock-1.1.0.old/build.xml 2006-12-23 00:06:19.000000000 +0200 ++++ jmock-1.1.0/build.xml 2006-12-23 00:06:49.000000000 +0200 +@@ -116,7 +116,7 @@ + </junit> + </target> + +- <target name="core.jar" depends="core.test.unit"> ++ <target name="core.jar" depends="core.compile"> + <mkdir dir="${build.dist.bin.dir}"/> + <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/> + </target> +@@ -181,7 +181,7 @@ + </junit> + </target> + +- <target name="cglib.jar" depends="cglib.test.unit"> ++ <target name="cglib.jar" depends="cglib.compile"> + <mkdir dir="${build.dist.bin.dir}"/> + <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/> + </target> diff --git a/dev-java/jmock/files/1.1.0-junit-3.8.2.patch b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch new file mode 100644 index 000000000000..411e2423a0a7 --- /dev/null +++ b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch @@ -0,0 +1,12 @@ +diff -ur jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java +--- jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java 2006-12-22 23:56:07.000000000 +0200 ++++ jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java 2006-12-22 23:56:17.000000000 +0200 +@@ -73,7 +73,7 @@ + assertTrue("Should not have verified", threwException); + } + +- static protected void failNotEquals( String message, ++ static public void failNotEquals( String message, + Object expected, + Object actual ) { + String formatted = ""; diff --git a/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch b/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch new file mode 100644 index 000000000000..7acfc8598f03 --- /dev/null +++ b/dev-java/jmock/files/2.5.1-invokeAll-invokeAny.patch @@ -0,0 +1,30 @@ +diff --git a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java +index 6dbc020..0dce41c 100644 +--- a/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java ++++ b/jmock-2.5.1/src/org/jmock/lib/concurrent/DeterministicScheduler.java +@@ -110,21 +110,21 @@ public class DeterministicScheduler implements ScheduledExecutorService { + throw blockingOperationsNotSupported(); + } + +- public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks) throws InterruptedException { ++ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException { + throw blockingOperationsNotSupported(); + } + +- public <T> List<Future<T>> invokeAll(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException { ++ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException { + throw blockingOperationsNotSupported(); + } + +- public <T> T invokeAny(Collection<Callable<T>> tasks) ++ public <T> T invokeAny(Collection<? extends Callable<T>> tasks) + throws InterruptedException, ExecutionException + { + throw blockingOperationsNotSupported(); + } + +- public <T> T invokeAny(Collection<Callable<T>> tasks, long timeout, TimeUnit unit) ++ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) + throws InterruptedException, ExecutionException, TimeoutException + { + throw blockingOperationsNotSupported(); |