Merge pull request #15 from daniel-beck/optional-scriptler

Make Scriptler dependency optional
jenkinsci · Oct 10, 2017 · b30d427 · b30d427
2 parents 978eac9 + 441b298
commit b30d427
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -64,6 +64,7 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>scriptler</artifactId>
             <version>2.9</version>
+            <optional>true</optional>
         </dependency>
         <!-- JQuery is included only once -->
         <dependency>

diff --git a/src/main/java/org/biouno/unochoice/model/ScriptlerScript.java b/src/main/java/org/biouno/unochoice/model/ScriptlerScript.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.biouno.unochoice.util.Utils;
+import org.jenkinsci.plugins.scriptler.ScriptlerManagement;
 import org.jenkinsci.plugins.scriptler.config.Script;
 import org.jenkinsci.plugins.scriptler.util.ScriptHelper;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript;
@@ -128,8 +129,12 @@ public GroovyScript toGroovyScript() {
 
     // --- descriptor
 
-    @Extension
+    @Extension(optional = true)
     public static class DescriptorImpl extends ScriptDescriptor {
+        static {
+            // make sure this class fails to load during extension discovery if scriptler isn't present
+            ScriptlerManagement.getScriptlerHomeDirectory();
+        }
         /*
          * (non-Javadoc)
          *