You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/06/07 11:26:11 UTC
[maven-script-interpreter] branch MSHARED-828 created (now f5f5730)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch MSHARED-828
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git.
at f5f5730 [MSHARED-828] Require Java 7
This branch includes the following new commits:
new f5f5730 [MSHARED-828] Require Java 7
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-script-interpreter] 01/01: [MSHARED-828] Require Java 7
Posted by rf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHARED-828
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit f5f5730b8ee79b942fbc0fdafcabb2e2e9dcff9d
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri Jun 7 13:26:01 2019 +0200
[MSHARED-828] Require Java 7
---
pom.xml | 6 +++++-
.../maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java | 2 +-
.../java/org/apache/maven/shared/scriptinterpreter/FileLogger.java | 5 ++++-
.../maven/shared/scriptinterpreter/GroovyScriptInterpreter.java | 2 +-
.../apache/maven/shared/scriptinterpreter/RunErrorException.java | 1 -
.../apache/maven/shared/scriptinterpreter/RunFailureException.java | 1 -
.../maven/shared/scriptinterpreter/ScriptEvaluationException.java | 1 -
.../apache/maven/shared/scriptinterpreter/ScriptInterpreter.java | 1 -
.../org/apache/maven/shared/scriptinterpreter/ScriptRunner.java | 1 -
.../shared/scriptinterpreter/BeanShellScriptInterpreterTest.java | 1 -
.../maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java | 1 -
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 966b026..c9ad7fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
<version>33</version>
- <relativePath>../../pom/maven/maven-shared-components/pom.xml</relativePath>
+ <relativePath></relativePath>
</parent>
<artifactId>maven-script-interpreter</artifactId>
@@ -52,6 +52,10 @@
<url>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</url>
</site>
</distributionManagement>
+
+ <properties>
+ <javaVersion>7</javaVersion>
+ </properties>
<dependencies>
<dependency>
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
index 956d8ea..80c3eeb 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
@@ -36,7 +36,6 @@ import org.codehaus.plexus.component.annotations.Component;
* Provides a facade to evaluate BeanShell scripts.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
@Component( role = ScriptInterpreter.class, hint = "bsh" )
public class BeanShellScriptInterpreter
@@ -46,6 +45,7 @@ public class BeanShellScriptInterpreter
/**
* {@inheritDoc}
*/
+ @Override
public Object evaluateScript( String script, List<String> classPath, Map<String, ? extends Object> globalVariables,
PrintStream scriptOutput )
throws ScriptEvaluationException
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
index ff11607..236a2bb 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/FileLogger.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.PrintStream;
/**
- * @version $Id$
*/
public class FileLogger
implements ExecutionLogger
@@ -84,6 +83,7 @@ public class FileLogger
Runnable finalizer = new Runnable()
{
+ @Override
public void run()
{
try
@@ -115,6 +115,7 @@ public class FileLogger
*
* @return The underlying stream used to write message to the log file, never <code>null</code>.
*/
+ @Override
public PrintStream getPrintStream()
{
return stream;
@@ -125,6 +126,7 @@ public class FileLogger
*
* @param line The message to log.
*/
+ @Override
public void consumeLine( String line )
{
stream.println( line );
@@ -152,6 +154,7 @@ public class FileLogger
/**
* Closes the underlying file stream.
*/
+ @Override
protected void finalize()
{
if ( shouldFinalize )
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
index 6c4220a..4e8221e 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
@@ -35,7 +35,6 @@ import java.util.Map;
* Provides a facade to evaluate Groovy scripts.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
@Component( role = ScriptInterpreter.class, hint = "groovy" )
public class GroovyScriptInterpreter
@@ -45,6 +44,7 @@ public class GroovyScriptInterpreter
/**
* {@inheritDoc}
*/
+ @Override
public Object evaluateScript( String script, List<String> classPath, Map<String, ? extends Object> globalVariables,
PrintStream scriptOutput )
throws ScriptEvaluationException
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/RunErrorException.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/RunErrorException.java
index 9097803..9e09a45 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/RunErrorException.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/RunErrorException.java
@@ -24,7 +24,6 @@ package org.apache.maven.shared.scriptinterpreter;
* script throwing an exception or an error in forking the Maven build itself.
*
* @author Stephen Connolly
- * @version $Id$
*/
public class RunErrorException
extends RunFailureException
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/RunFailureException.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/RunFailureException.java
index d7e7e72..19361b4 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/RunFailureException.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/RunFailureException.java
@@ -24,7 +24,6 @@ package org.apache.maven.shared.scriptinterpreter;
* script or a failure of the forked Maven build itself.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class RunFailureException
extends Exception
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptEvaluationException.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptEvaluationException.java
index caea6bc..1d65a67 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptEvaluationException.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptEvaluationException.java
@@ -24,7 +24,6 @@ package org.apache.maven.shared.scriptinterpreter;
* exception triggered by the methods it invoked.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class ScriptEvaluationException
extends Exception
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
index 5d5f67f..16b3177 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptInterpreter.java
@@ -28,7 +28,6 @@ import java.util.Map;
* interpreter implementation should be stateless and support reuse.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public interface ScriptInterpreter
{
diff --git a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
index be6afd7..039273f 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
@@ -37,7 +37,6 @@ import java.util.Map;
* Runs pre-/post-build hook scripts.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class ScriptRunner
{
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
index a7c9c1c..f0f689d 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreterTest.java
@@ -30,7 +30,6 @@ import java.util.Map;
* Tests the BeanShell interpreter facade.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class BeanShellScriptInterpreterTest
extends TestCase
diff --git a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
index 1c3c66e..ce2da68 100644
--- a/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
+++ b/src/test/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreterTest.java
@@ -30,7 +30,6 @@ import java.util.Map;
* Tests the Groovy interpreter facade.
*
* @author Benjamin Bentmann
- * @version $Id$
*/
public class GroovyScriptInterpreterTest
extends TestCase