This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch 1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 131302dd4565dcc95b549a9ebb7c70517a7efe80 Author: Julian Reschke <resc...@apache.org> AuthorDate: Fri Jan 13 07:40:06 2023 +0100 OAK-10066: update groovy dependency to 2.5.20 --- oak-examples/webapp/pom.xml | 2 +- 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 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/oak-examples/webapp/pom.xml b/oak-examples/webapp/pom.xml index 759db930e4..78687df93e 100644 --- a/oak-examples/webapp/pom.xml +++ b/oak-examples/webapp/pom.xml @@ -150,7 +150,7 @@ <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> - <version>2.5.2</version> + <version>${groovy.version}</version> </dependency> <dependency> diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index dd33213a68..6fb1e89639 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -64,7 +64,7 @@ <guava.osgi.import>com.google.common.*;version="[15.0,21)"</guava.osgi.import> <derby.version>10.14.2.0</derby.version> <jackson.version>2.13.4</jackson.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 bc31a08a1b..4b2939d320 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) + 52 MB AWS java sdk update (OAK-8875) + 51 MB AWS java sdk update (OAK-7536) @@ -44,7 +45,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'