This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch groovy4
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit dbfe35aa00666eed9588e65eb3548939480a4e2a
Author: Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Wed Nov 8 22:31:51 2023 +0800
Update Groovy 3 to 4.0.15.
---
dist-material/release-docs/LICENSE | 2 +-
docs/en/changes/changes.md | 1 +
graal/meter-analyzer-graal-native/pom.xml | 2 +-
oap-server-bom/pom.xml | 4 ++--
oap-server/analyzer/log-analyzer/pom.xml | 2 +-
oap-server/analyzer/meter-analyzer/pom.xml | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dist-material/release-docs/LICENSE
b/dist-material/release-docs/LICENSE
index c701cc9e5f..2f5dc1458c 100644
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -340,6 +340,7 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.curator/curator-framework/4.3.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.curator/curator-recipes/4.3.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.curator/curator-x-discovery/4.3.0
Apache-2.0
+ https://mvnrepository.com/artifact/org.apache.groovy/groovy/4.0.15
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient/4.1.3
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient/4.5.3
Apache-2.0
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore/4.4.13
Apache-2.0
@@ -351,7 +352,6 @@ The text of each license is the standard Apache 2.0 license.
https://mvnrepository.com/artifact/org.apache.yetus/audience-annotations/0.5.0
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper/3.5.7
Apache-2.0
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper-jute/3.5.7
Apache-2.0
- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy/3.0.8
Apache-2.0
https://mvnrepository.com/artifact/org.freemarker/freemarker/2.3.31
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-reflect/1.7.10
Apache-2.0
https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib/1.7.10
Apache-2.0
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index a18840d059..037c1a2d28 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -7,6 +7,7 @@
* Bump up netty to 4.1.100.
* Add eclipse-temurin:21-jre as a new image runtime. Now,
eclipse-temurin:11-jre as default. Both eclipse-temurin:17-jre
eclipse-temurin:21-jre are available for every commit and release.
+* Update Groovy 3 to 4.0.15.
#### OAP Server
diff --git a/graal/meter-analyzer-graal-native/pom.xml
b/graal/meter-analyzer-graal-native/pom.xml
index 533793616a..ac83dc1e1e 100644
--- a/graal/meter-analyzer-graal-native/pom.xml
+++ b/graal/meter-analyzer-graal-native/pom.xml
@@ -44,7 +44,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 4237dde5c1..7b2975be13 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -61,7 +61,7 @@
<freemarker.version>2.3.31</freemarker.version>
<javaassist.version>3.25.0-GA</javaassist.version>
<vavr.version>0.10.3</vavr.version>
- <groovy.version>3.0.8</groovy.version>
+ <groovy.version>4.0.15</groovy.version>
<mvel.version>2.4.8.Final</mvel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<flatbuffers-java.version>1.12.0</flatbuffers-java.version>
@@ -488,7 +488,7 @@
<version>${vavr.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/oap-server/analyzer/log-analyzer/pom.xml
b/oap-server/analyzer/log-analyzer/pom.xml
index abe621bbd0..cabd78e7e7 100644
--- a/oap-server/analyzer/log-analyzer/pom.xml
+++ b/oap-server/analyzer/log-analyzer/pom.xml
@@ -44,7 +44,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
diff --git a/oap-server/analyzer/meter-analyzer/pom.xml
b/oap-server/analyzer/meter-analyzer/pom.xml
index 3af6530b01..f29b8b9e9f 100644
--- a/oap-server/analyzer/meter-analyzer/pom.xml
+++ b/oap-server/analyzer/meter-analyzer/pom.xml
@@ -39,7 +39,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
