Allow scripting in files

pom.xml

@@ -35,7 +35,8 @@ under the License.
 
   <name>Apache Maven Scripting Plugin</name>
   <description>
-    The Maven Scripting Plugin is a plugin that wrapped the Scripting API accoring to JSR223
+    The Maven Scripting Plugin is a plugin that wrapped the Scripting API according to JSR223.
+    Add the scripting engines as dependencies of this plugin on its use.
   </description>
   <inceptionYear>2016</inceptionYear>
 
@@ -92,13 +93,6 @@ under the License.
       <scope>provided</scope>
     </dependency>
 
-    <!-- ScriptEngines -->
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-jsr223</artifactId>
-      <version>2.4.7</version>
-    </dependency>
-
     <!-- Test -->
     <dependency>
       <groupId>junit</groupId>

src/it/groovy-script-file-name/pom.xml

@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.scripting.its</groupId>
+  <artifactId>groovy-script</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scripting-plugin</artifactId>
+        <version>@project.version@</version>
+        <configuration>
+          <engineName>groovy</engineName>
+          <scriptFile>test.groov</scriptFile>
+        </configuration>
+        <dependencies>
+          <!-- ScriptEngines -->
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+            <version>2.4.7</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

src/it/groovy-script-file-name/test.groov

@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+(1..10).sum() + ' ' + project.artifactId

src/it/groovy-script-file/pom.xml

@@ -0,0 +1,51 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.scripting.its</groupId>
+  <artifactId>groovy-script</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scripting-plugin</artifactId>
+        <version>@project.version@</version>
+        <configuration>
+          <!--engineName>groovy</engineName-->
+          <scriptFile>test.groovy</scriptFile>
+        </configuration>
+        <dependencies>
+          <!-- ScriptEngines -->
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+            <version>2.4.7</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>

src/it/groovy-script-file/test.groovy

@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+(1..10).sum() + ' ' + project.artifactId

src/it/groovy-script/pom.xml

@@ -41,6 +41,14 @@ under the License.
           ]]>
           </script>
         </configuration>
+        <dependencies>
+          <!-- ScriptEngines -->
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+            <version>2.4.7</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>

src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java

@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
+import java.io.File;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -33,77 +33,88 @@
 
 /**
  * Evaluate the specified script
- * 
+ *
  * @author Robert Scholte
  * @since 3.0.0
  */
 @Mojo( name = "eval" )
 public class EvalMojo
     extends AbstractMojo
 {
-    @Parameter( required = true )
-    private String engineName; // or map extension to engineName??
+    @Parameter
+    private String engineName;
 
     /**
      * When used, also specify the engineName
      */
     @Parameter
     private String script;
 
+    /**
+     * Provide the script as an external file as an alternative to <script>.
+     * When scriptFile provided the script is ignored.
+     * The file name extension identifies the script language to use, as of javax.script.ScriptEngineManager
+     * and {@linkplain "https://jcp.org/aboutJava/communityprocess/final/jsr223/index.html"}
+     */
+    @Parameter
+    private File scriptFile;
+
     // script variables
     @Parameter( defaultValue = "${project}", readonly = true )
     private MavenProject project;
-
-    private ScriptEngineManager manager = new ScriptEngineManager();
 
     @Override
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        ScriptEngine engine = null;
-
-        if ( script != null )
-        {
-            engine = getScriptEngine( engineName );
-
-            if ( engine == null )
-            {
-                throw new MojoFailureException( "Missing scriptEngine" );
-            }
-        }
-        else
-        {
-            // from file
-        }
-
-        try
-        {
-            ScriptContext context = engine.getContext();
-            context.setAttribute( "project", project, ScriptContext.GLOBAL_SCOPE );
-
-            Object result = engine.eval( script );
-
-            getLog().info( "Result:" );
-            if ( result != null )
-            {
-                getLog().info( result.toString() );
-            }
-        }
-        catch ( ScriptException e )
-        {
-            throw new MojoExecutionException( e.getMessage(), e );
-        }
+       Execute execute;
+       Object result;
+       Bindings bindings;
+
+       try
+       {
+         execute = constructExecute();
+
+         bindings = new SimpleBindings();
+         bindings.put( "project", project );
+         bindings.put( "log", getLog() );
+
+         result = execute.run( bindings );
+
+         getLog().info( "Result:" );
+         if ( result != null )
+         {
+           getLog().info( result.toString() );
+         }
+       }
+       catch ( IllegalArgumentException e ) // configuring the plugin failed
+       {
+         throw new MojoExecutionException( e.getMessage(), e );
+       }
+       catch ( Exception e ) // execution failure
+       {
+           throw new MojoFailureException( e.getMessage(), e );
+       }
     }
-    
-    private ScriptEngine getScriptEngine( String name )
+
+    private Execute constructExecute() throws IllegalArgumentException
     {
-        if ( name == null ) 
-        {
-            return null;
-        }
-        else
-        {
-            return manager.getEngineByName( engineName );
-        }
+      Execute execute;
+
+      if ( scriptFile != null )
+      {
+         execute = new ExecuteFile( engineName, scriptFile );
+
+      }
+      else if ( script != null )
+      {
+         execute = new ExecuteString( engineName, script );
+
+      }
+      else
+      {
+         throw new IllegalArgumentException( "Missing script or scriptFile provided" );
+      }
+      return execute;
     }
-}
+}