You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/10/29 07:35:58 UTC
[6/6] mina-sshd git commit: Upgraded used Groovy version to 2.5.3
Upgraded used Groovy version to 2.5.3
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/32e1877d
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/32e1877d
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/32e1877d
Branch: refs/heads/master
Commit: 32e1877d090cb0f37172d44eabbd110ee9cb325a
Parents: 8f7b485
Author: Lyor Goldstein <lg...@apache.org>
Authored: Mon Oct 29 09:34:38 2018 +0200
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Mon Oct 29 09:35:47 2018 +0200
----------------------------------------------------------------------
pom.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 46 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/32e1877d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cb0235..d5c5180 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,8 +104,8 @@
<min.required.maven.version>3.5.0</min.required.maven.version>
<gmaven.plugin.version>2.1</gmaven.plugin.version>
<groovy.major.version>2</groovy.major.version>
- <groovy.minor.version>4</groovy.minor.version>
- <groovy.release.version>15</groovy.release.version>
+ <groovy.minor.version>5</groovy.minor.version>
+ <groovy.release.version>3</groovy.release.version>
<groovy.compliance.level>2.0</groovy.compliance.level>
<groovy.version>${groovy.major.version}.${groovy.minor.version}.${groovy.release.version}</groovy.version>
@@ -367,9 +367,21 @@
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE
Upgrading it beyond 2.0.19 causes problems for the sshd-ldap
@@ -716,12 +728,7 @@
<artifactId>groovy-maven-plugin</artifactId>
<version>${gmaven.plugin.version}</version>
<dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <!-- referenced indirectly by groovy-all -->
+ <!-- referenced indirectly by groovy-ant -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
@@ -738,10 +745,32 @@
<version>${ant.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-antlr</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</plugin>
<plugin>
@@ -813,9 +842,9 @@
<artifactId>ant</artifactId>
<version>${ant.version}</version>
</dependency>
- <dependency>
+ <dependency> <!-- replace ant-junit artifact -->
<groupId>org.apache.ant</groupId>
- <artifactId>ant-junit</artifactId>
+ <artifactId>ant-junit4</artifactId>
<version>${ant.version}</version>
</dependency>
<dependency>
@@ -853,6 +882,12 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-ant</artifactId>
<version>${groovy.version}</version>
+ <exclusions>
+ <exclusion> <!-- replaced by ant-junit4 -->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</plugin>