You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/08 14:48:48 UTC
[maven-script-interpreter] branch MSHARED-917 created (now e0c8215)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-917
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git.
at e0c8215 [MSHARED-917] Remove dependency to plexus-component-annotations
This branch includes the following new commits:
new e0c8215 [MSHARED-917] Remove dependency to plexus-component-annotations
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-917] Remove dependency
to plexus-component-annotations
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-917
in repository https://gitbox.apache.org/repos/asf/maven-script-interpreter.git
commit e0c8215b4f4b444aeb88c09cf7485c7411d9a6e0
Author: Slawomir Jaranowski <sl...@payu.pl>
AuthorDate: Sun Jun 7 14:08:26 2020 +0200
[MSHARED-917] Remove dependency to plexus-component-annotations
---
pom.xml | 19 -------------------
.../scriptinterpreter/BeanShellScriptInterpreter.java | 5 +----
.../scriptinterpreter/GroovyScriptInterpreter.java | 4 +---
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3eb16b8..0568b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,10 +67,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>2.4.16</version>
@@ -126,19 +122,4 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
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 80c3eeb..703478e 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/BeanShellScriptInterpreter.java
@@ -30,15 +30,12 @@ import java.io.PrintStream;
import java.util.List;
import java.util.Map;
-import org.codehaus.plexus.component.annotations.Component;
-
/**
* Provides a facade to evaluate BeanShell scripts.
*
* @author Benjamin Bentmann
*/
-@Component( role = ScriptInterpreter.class, hint = "bsh" )
-public class BeanShellScriptInterpreter
+class BeanShellScriptInterpreter
implements ScriptInterpreter
{
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 4e8221e..c15e2cf 100644
--- a/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
+++ b/src/main/java/org/apache/maven/shared/scriptinterpreter/GroovyScriptInterpreter.java
@@ -23,7 +23,6 @@ import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import org.apache.tools.ant.AntClassLoader;
import org.codehaus.groovy.control.CompilerConfiguration;
-import org.codehaus.plexus.component.annotations.Component;
import java.io.File;
import java.io.PrintStream;
@@ -36,8 +35,7 @@ import java.util.Map;
*
* @author Benjamin Bentmann
*/
-@Component( role = ScriptInterpreter.class, hint = "groovy" )
-public class GroovyScriptInterpreter
+class GroovyScriptInterpreter
implements ScriptInterpreter
{