This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch java8 in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit 2382855f65b5c6a658e50fe783af0029a6c817fb Author: rfscholte <[email protected]> AuthorDate: Fri Feb 5 15:59:01 2021 +0100 Require Java 8 --- pom.xml | 4 ++-- .../java/org/apache/maven/plugins/scripting/EvalMojo.java | 10 +++------- .../java/org/apache/maven/plugins/scripting/Execute.java | 10 +++------- .../org/apache/maven/plugins/scripting/ExecuteFile.java | 13 ++++--------- .../org/apache/maven/plugins/scripting/ExecuteString.java | 3 +-- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index dfb30dc..a8c8fee 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ under the License. <properties> <mavenVersion>3.0</mavenVersion> - <maven.compiler.source>1.7</maven.compiler.source> - <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> <project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp> </properties> diff --git a/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java b/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java index 6dfc038..ce04b2d 100644 --- a/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java +++ b/src/main/java/org/apache/maven/plugins/scripting/EvalMojo.java @@ -67,19 +67,15 @@ public class EvalMojo public void execute() throws MojoExecutionException, MojoFailureException { - Execute execute; - Object result; - Bindings bindings; - try { - execute = constructExecute(); + Execute execute = constructExecute(); - bindings = new SimpleBindings(); + Bindings bindings = new SimpleBindings(); bindings.put( "project", project ); bindings.put( "log", getLog() ); - result = execute.run( bindings ); + Object result = execute.run( bindings ); getLog().info( "Result:" ); if ( result != null ) diff --git a/src/main/java/org/apache/maven/plugins/scripting/Execute.java b/src/main/java/org/apache/maven/plugins/scripting/Execute.java index 5563bc5..74752d0 100644 --- a/src/main/java/org/apache/maven/plugins/scripting/Execute.java +++ b/src/main/java/org/apache/maven/plugins/scripting/Execute.java @@ -40,13 +40,9 @@ abstract class Execute */ public final Object run( Bindings bindings ) throws IllegalArgumentException, ScriptException { - ScriptEngine engine; - ScriptEngineManager manager; - ScriptContext context; - - manager = new ScriptEngineManager(); - engine = constructEngine( manager ); - context = engine.getContext(); + ScriptEngineManager manager = new ScriptEngineManager(); + ScriptEngine engine = constructEngine( manager ); + ScriptContext context = engine.getContext(); context.setBindings( bindings, ScriptContext.GLOBAL_SCOPE ); diff --git a/src/main/java/org/apache/maven/plugins/scripting/ExecuteFile.java b/src/main/java/org/apache/maven/plugins/scripting/ExecuteFile.java index 0c9ce9c..198b418 100644 --- a/src/main/java/org/apache/maven/plugins/scripting/ExecuteFile.java +++ b/src/main/java/org/apache/maven/plugins/scripting/ExecuteFile.java @@ -74,17 +74,14 @@ public class ExecuteFile extends Execute */ protected Object execute( ScriptEngine engine, ScriptContext context ) throws ScriptException { - FileReader reader; - - try + try ( FileReader reader = new FileReader( scriptFile ) ) { - reader = new FileReader( scriptFile ); + return engine.eval( reader, context ); } catch ( IOException ex ) { throw new IllegalArgumentException( scriptFile + " caused:", ex ); } - return engine.eval( reader, context ); } /** @@ -93,8 +90,6 @@ public class ExecuteFile extends Execute protected ScriptEngine constructEngine( ScriptEngineManager manager ) throws IllegalArgumentException { ScriptEngine result; - String extension; - int position; if ( engineName != null && !engineName.trim().isEmpty() ) { @@ -107,8 +102,8 @@ public class ExecuteFile extends Execute } else { - extension = scriptFile.getName(); - position = extension.indexOf( "." ); + String extension = scriptFile.getName(); + int position = extension.indexOf( "." ); if ( position >= 0 ) { diff --git a/src/main/java/org/apache/maven/plugins/scripting/ExecuteString.java b/src/main/java/org/apache/maven/plugins/scripting/ExecuteString.java index b3171e5..38340f0 100644 --- a/src/main/java/org/apache/maven/plugins/scripting/ExecuteString.java +++ b/src/main/java/org/apache/maven/plugins/scripting/ExecuteString.java @@ -67,9 +67,8 @@ public class ExecuteString extends Execute */ protected ScriptEngine constructEngine( ScriptEngineManager manager ) throws IllegalArgumentException { - ScriptEngine result; + ScriptEngine result = manager.getEngineByName( engineName ); - result = manager.getEngineByName( engineName ); if ( result == null ) { throw new IllegalArgumentException( "Unknown engine specified with name \"" + engineName + "\"" );
