[JENKINS-28150] Fix optional dependency loading

The extensions here that are using an optional dependency's class must be mark as optional. If not, we can see `ClassNotFoundException` when Jenkins load this plugin.
jenkinsci · Apr 29, 2015 · 905dccb · 905dccb
1 parent 3804c3b
commit 905dccb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...arc/jenkinsci/plugins/run_condition_extras/adapters/build_timeout/ConditionalTimeout.java b/...arc/jenkinsci/plugins/run_condition_extras/adapters/build_timeout/ConditionalTimeout.java
@@ -68,7 +68,7 @@ public Descriptor<ConditionalTimeout> getDescriptor() {
         return DESCRIPTOR;
     }
 
-    @Extension
+    @Extension(optional = true)
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     public static class DescriptorImpl extends Descriptor<ConditionalTimeout> {

diff --git a/...nsci/plugins/run_condition_extras/adapters/build_timeout/RunConditionTimeoutStrategy.java b/...nsci/plugins/run_condition_extras/adapters/build_timeout/RunConditionTimeoutStrategy.java
@@ -89,7 +89,7 @@ public Descriptor<BuildTimeOutStrategy> getDescriptor() {
         return DESCRIPTOR;
     }
 
-    @Extension
+    @Extension(optional = true)
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     public static class DescriptorImpl extends BuildTimeOutStrategyDescriptor {

diff --git a/...rc/jenkinsci/plugins/run_condition_extras/adapters/mail_ext/RunConditionEmailTrigger.java b/...rc/jenkinsci/plugins/run_condition_extras/adapters/mail_ext/RunConditionEmailTrigger.java
@@ -76,7 +76,7 @@ public RunCondition getCondition() {
         return condition;
     }
 
-    @Extension
+    @Extension(optional = true)
     public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();
 
     @Override