You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/09/02 08:49:01 UTC
[plc4x] branch develop updated: feat: migrate to apache groovy
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 36881ba51 feat: migrate to apache groovy
36881ba51 is described below
commit 36881ba512256ba95d4f62afc71948d540431221
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Sep 2 10:48:49 2022 +0200
feat: migrate to apache groovy
---
plc4c/pom.xml | 2 +-
plc4j/pom.xml | 6 +++---
plc4j/utils/test-generator/pom.xml | 4 ++--
pom.xml | 7 +++----
protocols/bacnetip/pom.xml | 2 +-
protocols/knxnetip/pom.xml | 2 +-
sandbox/code-gen/pom.xml | 2 +-
sandbox/test-java-df1-driver/pom.xml | 2 +-
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/plc4c/pom.xml b/plc4c/pom.xml
index 14d63dafb..7ac4bbd64 100644
--- a/plc4c/pom.xml
+++ b/plc4c/pom.xml
@@ -203,7 +203,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
index d3d1c2091..25b613d57 100644
--- a/plc4j/pom.xml
+++ b/plc4j/pom.xml
@@ -303,8 +303,8 @@
<ignoredDependency>org.mockito:mockito-junit-jupiter</ignoredDependency>
<ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
<ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
- <ignoredDependency>org.codehaus.groovy:groovy-test-junit5</ignoredDependency>
- <ignoredDependency>org.codehaus.groovy:groovy</ignoredDependency>
+ <ignoredDependency>org.apache.groovy:groovy-test-junit5</ignoredDependency>
+ <ignoredDependency>org.apache.groovy:groovy</ignoredDependency>
<ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
<ignoredDependency>org.apache.nifi:nifi-standard-nar</ignoredDependency>
</ignoredDependencies>
@@ -378,7 +378,7 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git a/plc4j/utils/test-generator/pom.xml b/plc4j/utils/test-generator/pom.xml
index 000242fee..1bbe78380 100644
--- a/plc4j/utils/test-generator/pom.xml
+++ b/plc4j/utils/test-generator/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-bom</artifactId>
- <version>2.2-M3-groovy-3.0</version>
+ <version>2.2-groovy-4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -95,7 +95,7 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index f0a2ada05..6bb814fb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<dom4j.version>2.1.3</dom4j.version>
<equalsverifier.version>3.10.1</equalsverifier.version>
<freemarker.version>2.3.31</freemarker.version>
- <groovy.version>3.0.12</groovy.version>
+ <groovy.version>4.0.4</groovy.version>
<gson.version>2.9.1</gson.version>
<guava.version>31.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
@@ -566,8 +566,7 @@
</dependency>
<dependency>
- <!-- TODO: probably should replace this with org.apache.groovy -->
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
<version>${groovy.version}</version>
<!-- Ensure we only use this in test -->
@@ -683,7 +682,7 @@
<version>${joda-time.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/protocols/bacnetip/pom.xml b/protocols/bacnetip/pom.xml
index 00f6e1dde..8abca34ba 100644
--- a/protocols/bacnetip/pom.xml
+++ b/protocols/bacnetip/pom.xml
@@ -105,7 +105,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/protocols/knxnetip/pom.xml b/protocols/knxnetip/pom.xml
index 106a2f477..791efcfcb 100644
--- a/protocols/knxnetip/pom.xml
+++ b/protocols/knxnetip/pom.xml
@@ -61,7 +61,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
diff --git a/sandbox/code-gen/pom.xml b/sandbox/code-gen/pom.xml
index 3946e765c..fb04101bd 100644
--- a/sandbox/code-gen/pom.xml
+++ b/sandbox/code-gen/pom.xml
@@ -46,7 +46,7 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
<scope>test</scope>
</dependency>
diff --git a/sandbox/test-java-df1-driver/pom.xml b/sandbox/test-java-df1-driver/pom.xml
index 61220def4..31bf35664 100644
--- a/sandbox/test-java-df1-driver/pom.xml
+++ b/sandbox/test-java-df1-driver/pom.xml
@@ -121,7 +121,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
+ <groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
<scope>test</scope>
</dependency>