You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/02/09 04:36:29 UTC
[shardingsphere] branch master updated: Upgrade groovy to 4.0.0 (#15303)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3777728 Upgrade groovy to 4.0.0 (#15303)
3777728 is described below
commit 37777288a2f8b7e3125901c292bbe71e95fa7e75
Author: Ling Hengqian <li...@outlook.com>
AuthorDate: Wed Feb 9 12:35:27 2022 +0800
Upgrade groovy to 4.0.0 (#15303)
---
pom.xml | 5 ++---
.../shardingsphere-proxy-distribution/src/main/release-docs/LICENSE | 2 +-
.../shardingsphere-sharding/shardingsphere-sharding-core/pom.xml | 3 +--
shardingsphere-infra/shardingsphere-infra-common/pom.xml | 3 +--
shardingsphere-test/shardingsphere-rewrite-test/pom.xml | 3 +--
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index f22fe9f..3d06b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<cosid.version>1.8.6</cosid.version>
<antlr4.version>4.9.2</antlr4.version>
- <groovy.version>2.5.15</groovy.version>
+ <groovy.version>4.0.0</groovy.version>
<snakeyaml.version>1.16</snakeyaml.version>
<netty.version>4.1.73.Final</netty.version>
@@ -197,10 +197,9 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
- <classifier>indy</classifier>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
index 93567f9..9c628cb 100644
--- a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++ b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -299,7 +299,7 @@ Apache 2.0 licenses
The following components are provided under the Apache License. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.
- groovy 2.4.19-indy: https://github.com/apache/groovy, Apache 2.0
+ groovy 4.0.0: https://github.com/apache/groovy, Apache 2.0
atomikos-util 5.0.8: https://www.atomikos.com, Apache 2.0
transactions 5.0.8: https://www.atomikos.com, Apache 2.0
transactions-api 5.0.8: https://www.atomikos.com, Apache 2.0
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
index badea55..4f4f715 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/pom.xml
@@ -116,9 +116,8 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <classifier>indy</classifier>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/shardingsphere-infra/shardingsphere-infra-common/pom.xml b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
index 1621a93..673a983 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-common/pom.xml
@@ -49,9 +49,8 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <classifier>indy</classifier>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
diff --git a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
index 45b5a0c..bb34c16 100644
--- a/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
+++ b/shardingsphere-test/shardingsphere-rewrite-test/pom.xml
@@ -84,9 +84,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <classifier>indy</classifier>
</dependency>
<dependency>
<groupId>org.yaml</groupId>