Upgrade groovy to 4.0.0 (apache#15303)

duandao1950 · Feb 9, 2022 · 3777728 · 3777728
1 parent 23f0d5f
commit 3777728
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>