You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2023/01/12 19:53:42 UTC

[jackrabbit-oak] branch OAK-10066 updated: OAK-10066: update groovy dependency to 2.5.x

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-10066
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-10066 by this push:
     new c7c9197bf0 OAK-10066: update groovy dependency to 2.5.x
c7c9197bf0 is described below

commit c7c9197bf02e2aecde0b0c34fb7ab9ef1d32d509
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jan 12 20:53:30 2023 +0100

    OAK-10066: update groovy dependency to 2.5.x
---
 oak-parent/pom.xml                                                     | 2 +-
 oak-run/pom.xml                                                        | 3 ++-
 .../org/apache/jackrabbit/oak/console/commands/ExportCommand.groovy    | 1 +
 .../oak/console/commands/ExportRelevantDocumentsCommand.groovy         | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index a29e87007c..e32681e601 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -68,7 +68,7 @@
     <jackson.version>2.13.4</jackson.version>
     <testcontainers.version>1.17.5</testcontainers.version>
     <pax-exam.version>4.13.1</pax-exam.version>
-    <groovy.version>2.4.21</groovy.version>
+    <groovy.version>2.5.20</groovy.version>
     <java.version>1.8</java.version>
     <java.version.signature>java18</java.version.signature>
     
diff --git a/oak-run/pom.xml b/oak-run/pom.xml
index ee1ec3ea10..e20fcad2da 100644
--- a/oak-run/pom.xml
+++ b/oak-run/pom.xml
@@ -34,6 +34,7 @@
     <jetty.version>9.4.46.v20220331</jetty.version>
     <!--
       Size History:
+      +  6 MB Groovy 2.5 (OAK-10066)
       + 56 MB MongoDB Java driver 3.12.7 (OAK-9357)
       + 55 MB Add support for segment persistent cache (OAK-7744)
       + 54 MB AWS support for segment-tar (OAK-8827)
@@ -46,7 +47,7 @@
       + 41 MB build failing on the release profile (OAK-6250)
       + 38 MB. Initial value. Current 35MB plus a 10%
     -->
-    <max.jar.size>58720256</max.jar.size>
+    <max.jar.size>59320256</max.jar.size>
   </properties>
 
   <build>
diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportCommand.groovy
index f1c693b00b..5a4772f9c2 100644
--- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportCommand.groovy
+++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportCommand.groovy
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.console.ConsoleSession
 import org.apache.jackrabbit.oak.exporter.NodeStateSerializer
 import org.codehaus.groovy.tools.shell.CommandSupport
 import org.codehaus.groovy.tools.shell.Groovysh
+import groovy.cli.picocli.CliBuilder
 
 class ExportCommand extends CommandSupport{
     public static final String COMMAND_NAME = 'export-nodes'
diff --git a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportRelevantDocumentsCommand.groovy b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportRelevantDocumentsCommand.groovy
index dbaae7ce20..b5eabf11d9 100644
--- a/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportRelevantDocumentsCommand.groovy
+++ b/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/ExportRelevantDocumentsCommand.groovy
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins.document.NodeDocument
 import org.apache.jackrabbit.oak.plugins.document.util.Utils
 import org.codehaus.groovy.tools.shell.CommandSupport
 import org.codehaus.groovy.tools.shell.Groovysh
+import groovy.cli.picocli.CliBuilder
 
 class ExportRelevantDocumentsCommand extends CommandSupport {
     public static final String COMMAND_NAME = 'export-docs'