diff --git a/changelog.html b/changelog.html
index d956721b33..8fb2d1fa85 100644
--- a/changelog.html
+++ b/changelog.html
@@ -74,7 +74,10 @@ Upcoming changes
+
-
"Ping-pong" builds store excessively large
CauseAction.
@@ -97,7 +100,6 @@ Upcoming changes
Parameter values disappear if user is not logged in
(issue 7894)
-
-
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 2ab0847d9f..98d1a58a9f 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.479) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi Wed, 29 Aug 2012 09:45:34 -0700
+
jenkins (1.478) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
diff --git a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
index 230d0a3d0f..78fdb8d03b 100644
--- a/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
+++ b/test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
@@ -132,9 +132,11 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.hamcrest.Matchers;
+import org.junit.rules.MethodRule;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
+import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
import org.jvnet.hudson.test.recipes.Recipe;
import org.jvnet.hudson.test.rhino.JavaScriptDebugger;
@@ -220,7 +222,7 @@ import static org.junit.matchers.JUnitMatchers.containsString;
* @author Stephen Connolly
* @since 1.436
*/
-public class JenkinsRule implements TestRule, RootAction {
+public class JenkinsRule implements TestRule, MethodRule, RootAction {
private final TestEnvironment env = new TestEnvironment(null);
@@ -445,6 +447,13 @@ public class JenkinsRule implements TestRule, RootAction {
}
}
+ /**
+ * Backward compatibility with JUnit 4.8.
+ */
+ public Statement apply(Statement base, FrameworkMethod method, Object target) {
+ return apply(base,Description.createTestDescription(method.getMethod().getDeclaringClass(), method.getName(), method.getAnnotations()));
+ }
+
public Statement apply(final Statement base, final Description description) {
if (description.getAnnotation(WithoutJenkins.class) != null) {
// request has been made to not create the instance for this test method