Fix JENKINS-21326

Made the config file provider classes optional Extensions.
jenkinsci · Jan 26, 2014 · a497a3d · a497a3d
1 parent fd28fc7
commit a497a3d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -180,7 +180,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>clirr-maven-plugin</artifactId>
-		<version>2.6</version>
+		<version>2.6.1</version>
 		<executions>
 	            <execution>
 		        <goals>

diff --git a/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/GroovyTemplateConfig.java
@@ -14,7 +14,7 @@ public GroovyTemplateConfig(String id, String name, String comment, String conte
         super(id, name, comment, content);
     }
 
-    @Extension
+    @Extension(optional=true)
     public static final class GroovyTemplateConfigProvider extends AbstractConfigProviderImpl {
 
         public GroovyTemplateConfigProvider() {

diff --git a/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java b/src/main/java/hudson/plugins/emailext/JellyTemplateConfig.java
@@ -6,15 +6,14 @@
 import org.jenkinsci.lib.configprovider.model.ContentType;
 import org.kohsuke.stapler.DataBoundConstructor;
 
-
 public class JellyTemplateConfig extends Config {
 
     @DataBoundConstructor
     public JellyTemplateConfig(String id, String name, String comment, String content) {
         super(id, name, comment, content);
     }
 
-    @Extension
+    @Extension(optional=true)
     public static final class JellyTemplateConfigProvider extends AbstractConfigProviderImpl {
 
         public JellyTemplateConfigProvider() {

diff --git a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
@@ -1,7 +1,5 @@
 package hudson.plugins.emailext;
 
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
 import hudson.model.BuildListener;