org.codehaus.groovy:groovy-jsr223 -> org.apache.groovy:groovy-jsr223

allen-ball · Jun 9, 2024 · 2e92271 · 2e92271
1 parent 67992e0
commit 2e92271
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/ganymede-kernel/pom.xml b/ganymede-kernel/pom.xml
@@ -91,6 +91,10 @@
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy-jsr223</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-iostreams</artifactId>
@@ -139,10 +143,6 @@
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity-engine-scripting</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-jsr223</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.commonmark</groupId>
       <artifactId>commonmark</artifactId>
@@ -252,6 +252,12 @@
             <link><url>https://allen-ball.github.io/ganymede/</url></link>
             <link><url>https://docs.oracle.com/en/java/javase/${java.specification.version}/docs/api/</url></link>
           </links>
+          <offlinelinks>
+            <offlinelink>
+              <artifact>org.apache.groovy:*</artifact>
+              <url>https://javadoc.io/doc/{g}/groovy-all/{v}/</url>
+            </offlinelink>
+          </offlinelinks>
         </configuration>
       </plugin>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -133,6 +133,7 @@
     <log4j2.version>2.19.0</log4j2.version>
 
     <commonmark.version>0.22.0</commonmark.version>
+    <groovy4.version>4.0.21</groovy4.version>
     <jeromq.version>0.6.0</jeromq.version>
     <tablesaw.version>0.43.1</tablesaw.version>
   </properties>
@@ -198,6 +199,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.apache.groovy</groupId>
+        <artifactId>groovy-jsr223</artifactId>
+        <version>${groovy4.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-sql_${scala.binary.version}</artifactId>
@@ -467,16 +473,16 @@
           <configuration>
             <filters>
               <filter>
-                <artifact>org.apache.velocity:velocity-engine-core</artifact>
+                <artifact>*.groovy:groovy-*</artifact>
                 <excludes>
-                  <exclude>META-INF/maven/commons-io/**</exclude>
-                  <exclude>org/apache/velocity/shaded/**</exclude>
+                  <exclude>META-INF/groovy-release-info.properties</exclude>
                 </excludes>
               </filter>
               <filter>
-                <artifact>org.codehaus.groovy:groovy-*</artifact>
+                <artifact>org.apache.velocity:velocity-engine-core</artifact>
                 <excludes>
-                  <exclude>META-INF/groovy-release-info.properties</exclude>
+                  <exclude>META-INF/maven/commons-io/**</exclude>
+                  <exclude>org/apache/velocity/shaded/**</exclude>
                 </excludes>
               </filter>
               <filter>