From 7f31ff2b97670ea7fb42695e633c1934bfa7b615 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilov Date: Tue, 14 Jan 2025 13:27:11 +0400 Subject: [PATCH] Update dependencies cuba-platform/cuba#3307 --- build.gradle | 4 ++-- .../cuba/runtimediagnose/diagnose/ZipFileHelper.groovy | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a9eb343..39df0db 100644 --- a/build.gradle +++ b/build.gradle @@ -82,7 +82,7 @@ dependencies { appComponent("com.haulmont.cuba:cuba-global:$cubaVersion") } -def hsql = 'org.hsqldb:hsqldb:2.4.1' +def hsql = 'org.hsqldb:hsqldb:2.5.2' configure([globalModule, coreModule, guiModule, webModule]) { apply(plugin: 'java') @@ -113,7 +113,7 @@ configure([globalModule, coreModule, guiModule, webModule]) { compile('io.vavr:vavr:0.9.0') compile('jaxen:jaxen:1.1.6') compile('org.jetbrains:annotations:15.0') - compile('org.codehaus.groovy:groovy-all:2.5.4') + compile('org.codehaus.groovy:groovy-all:2.5.23') testCompile('junit:junit:4.12') testCompile('cglib:cglib-nodep:3.2.4') testCompile('org.spockframework:spock-core:1.1-groovy-2.4') diff --git a/modules/global/src/de/diedavids/cuba/runtimediagnose/diagnose/ZipFileHelper.groovy b/modules/global/src/de/diedavids/cuba/runtimediagnose/diagnose/ZipFileHelper.groovy index e6b0917..886f050 100644 --- a/modules/global/src/de/diedavids/cuba/runtimediagnose/diagnose/ZipFileHelper.groovy +++ b/modules/global/src/de/diedavids/cuba/runtimediagnose/diagnose/ZipFileHelper.groovy @@ -65,14 +65,14 @@ class ZipFileHelper { protected void addArchiveEntryToZipFile(ZipArchiveOutputStream zipOutputStream, String fileName, byte[] fileContent) { byte[] correctFileContent = fileContent ?: [] as byte[] - ArchiveEntry resultArchiveEntry = createArchiveEntry(fileName, correctFileContent) + ZipArchiveEntry resultArchiveEntry = createArchiveEntry(fileName, correctFileContent) zipOutputStream.putArchiveEntry(resultArchiveEntry) zipOutputStream.write(correctFileContent) zipOutputStream.closeArchiveEntry() } - protected ArchiveEntry createArchiveEntry(String name, byte[] data) { + protected ZipArchiveEntry createArchiveEntry(String name, byte[] data) { ZipArchiveEntry zipEntry = new ZipArchiveEntry(name) zipEntry.size = data.length zipEntry.compressedSize = zipEntry.size