This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch dependency-updates
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/dependency-updates by this
push:
new d9e7dfc11 UNOMI-829: upgrade groovy version
d9e7dfc11 is described below
commit d9e7dfc111733f43b312e1702707501e363eb378
Author: jsinovassin <jsinovassinn...@jahia.com>
AuthorDate: Tue May 7 09:56:02 2024 +0300
UNOMI-829: upgrade groovy version
---
extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml | 6 +++---
extensions/groovy-actions/services/pom.xml | 4 ++--
pom.xml | 2 +-
samples/groovy-actions/pom.xml | 6 +++---
tools/shell-commands/pom.xml | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
index 649b74097..b3e0783cb 100644
--- a/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/groovy-actions/karaf-kar/src/main/feature/feature.xml
@@ -20,9 +20,9 @@
<details>${project.description}</details>
<feature>wrap</feature>
<feature>unomi-kar</feature>
- <bundle
start-level="85">mvn:org.codehaus.groovy/groovy/${groovy.version}</bundle>
- <bundle
start-level="85">mvn:org.codehaus.groovy/groovy-xml/${groovy.version}</bundle>
- <bundle
start-level="85">mvn:org.codehaus.groovy/groovy-json/${groovy.version}</bundle>
+ <bundle
start-level="85">mvn:org.apache.groovy/groovy/${groovy.version}</bundle>
+ <bundle
start-level="85">mvn:org.apache.groovy/groovy-xml/${groovy.version}</bundle>
+ <bundle
start-level="85">mvn:org.apache.groovy/groovy-json/${groovy.version}</bundle>
<bundle
start-level="85">wrap:mvn:io.github.http-builder-ng/http-builder-ng-core/1.0.4</bundle>
<bundle start-level="85">mvn:org.jsoup/jsoup/1.13.1</bundle>
<bundle
start-level="85">mvn:com.sun.activation/javax.activation/1.2.0</bundle>
diff --git a/extensions/groovy-actions/services/pom.xml
b/extensions/groovy-actions/services/pom.xml
index 71c14bedb..b8fd34379 100644
--- a/extensions/groovy-actions/services/pom.xml
+++ b/extensions/groovy-actions/services/pom.xml
@@ -79,13 +79,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
diff --git a/pom.xml b/pom.xml
index 921eed133..30c47e2a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<elasticsearch.version>7.4.2</elasticsearch.version>
<elasticsearch.test.version>7.11.0</elasticsearch.test.version>
<lucene.version>8.2.0</lucene.version>
- <groovy.version>3.0.3</groovy.version>
+ <groovy.version>4.0.21</groovy.version>
<networknt.version>1.4.0</networknt.version>
<bean.validation.version>1.1.0.Final</bean.validation.version>
<jakarta.jws.version>3.0.0</jakarta.jws.version>
diff --git a/samples/groovy-actions/pom.xml b/samples/groovy-actions/pom.xml
index 183afb02b..bf316c104 100644
--- a/samples/groovy-actions/pom.xml
+++ b/samples/groovy-actions/pom.xml
@@ -49,9 +49,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>3.0.0-rc-1</version>
+ <version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
@@ -73,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/tools/shell-commands/pom.xml b/tools/shell-commands/pom.xml
index 1c7388a69..b0dcb3caa 100644
--- a/tools/shell-commands/pom.xml
+++ b/tools/shell-commands/pom.xml
@@ -81,14 +81,14 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-json</artifactId>
<version>${groovy.version}</version>
<scope>provided</scope>
