feat: migrate to apache groovy

apache · Sep 2, 2022 · 36881ba · 36881ba
1 parent f34f3d1
commit 36881ba
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>