You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/05/21 19:53:19 UTC
[maven-invoker-plugin] branch MINVOKER-304 created (now 8c0ae6f)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MINVOKER-304
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
at 8c0ae6f [MINVOKER-304] Use only common groovy modules - xml, json
This branch includes the following new commits:
new 8c0ae6f [MINVOKER-304] Use only common groovy modules - xml, json
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-invoker-plugin] 01/01: [MINVOKER-304] Use only common groovy modules - xml, json
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MINVOKER-304
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 8c0ae6f55ab459f845d2a4932ddf3cde3be0685e
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat May 21 21:52:55 2022 +0200
[MINVOKER-304] Use only common groovy modules - xml, json
---
pom.xml | 40 ++++++++++++------------------
src/it/script-classpath-duplicates/pom.xml | 2 +-
2 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3d836b1..4efb0b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@ under the License.
<beanshell-artifactId>bsh</beanshell-artifactId>
<beanshell-version>2.0b6</beanshell-version>
<groovy-groupId>org.codehaus.groovy</groovy-groupId>
- <groovy-artifactId>groovy-all</groovy-artifactId>
+ <groovy-artifactId>groovy</groovy-artifactId>
<groovy-version>3.0.10</groovy-version>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2021-02-14T00:04:14Z</project.build.outputTimestamp>
@@ -137,7 +137,7 @@ under the License.
<artifactId>maven-script-interpreter</artifactId>
<version>1.3</version>
<exclusions>
- <!-- there's already a direct dependency to groovy-all -->
+ <!-- there's already a direct dependency to groovy -->
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
@@ -163,32 +163,24 @@ under the License.
<version>${beanshell-version}</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>${groovy-groupId}</groupId>
- <artifactId>${groovy-artifactId}</artifactId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${groovy-groupId}</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${groovy-groupId}</groupId>
+ <artifactId>groovy-xml</artifactId>
<version>${groovy-version}</version>
- <type>pom</type>
<scope>runtime</scope>
- <exclusions>
- <exclusion> <!-- pulls in jline with shaded org.fusesource.jansi.Ansi, causing invalid output for M3.5.0- -->
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-groovysh</artifactId>
- </exclusion>
- <!-- MINVOKER-285 - exclude additional tests frameworks -->
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-test-junit5</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-testng</artifactId>
- </exclusion>
- <!-- /MINVOKER-285 -->
- </exclusions>
</dependency>
<dependency>
diff --git a/src/it/script-classpath-duplicates/pom.xml b/src/it/script-classpath-duplicates/pom.xml
index 6841ab6..1ba8f1d 100644
--- a/src/it/script-classpath-duplicates/pom.xml
+++ b/src/it/script-classpath-duplicates/pom.xml
@@ -42,7 +42,7 @@ under the License.
</dependency>
<dependency>
<groupId>@groovy-groupId@</groupId>
- <artifactId>@groovy-artifactId@</artifactId>
+ <artifactId>groovy</artifactId>
<version>@groovy-version@</version>
<type>pom</type>
<scope>test</scope>