From 16e0eb34948b9422c829e52e8cd027c42cc1882a Mon Sep 17 00:00:00 2001 From: James Nord Date: Mon, 2 Mar 2015 10:38:27 +0000 Subject: [PATCH 1/2] TransientActionFactory should implement ExtensionPoint --- core/src/main/java/jenkins/model/TransientActionFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/jenkins/model/TransientActionFactory.java b/core/src/main/java/jenkins/model/TransientActionFactory.java index 5ae8a43095..f0871920ea 100644 --- a/core/src/main/java/jenkins/model/TransientActionFactory.java +++ b/core/src/main/java/jenkins/model/TransientActionFactory.java @@ -24,6 +24,7 @@ package jenkins.model; +import hudson.ExtensionPoint; import hudson.model.Action; import hudson.model.Actionable; import hudson.model.TopLevelItem; @@ -37,7 +38,7 @@ import javax.annotation.Nonnull; * @see Actionable#getAllActions * @since 1.548 */ -public abstract class TransientActionFactory { +public abstract class TransientActionFactory implements ExtensionPoint { /** * The type of object this factory cares about. From a87a5a1a5c6c7594fb322e10c815d94052164e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Mon, 2 Mar 2015 19:05:51 +0100 Subject: [PATCH 2/2] More robust unit test --- test/src/test/java/hudson/tasks/MavenTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java index 3d4d554ff0..c4506b3d1a 100644 --- a/test/src/test/java/hudson/tasks/MavenTest.java +++ b/test/src/test/java/hudson/tasks/MavenTest.java @@ -270,10 +270,10 @@ public class MavenTest { @Issue("JENKINS-26684") @Test public void specialCharsInBuildVariablesPassedAsProperties() throws Exception { - j.configureDefaultMaven(); + MavenInstallation maven = j.configureMaven3(); FreeStyleProject p = j.createFreeStyleProject(); - p.getBuildersList().add(new Maven("--help", null)); + p.getBuildersList().add(new Maven("--help", maven.getName())); p.addProperty(new ParametersDefinitionProperty( new StringParameterDefinition("tilde", "~"), new StringParameterDefinition("exclamation_mark", "!"),