From 48bec0e0370f6c75f565c41b2afc01afc9038cf0 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 27 May 2025 12:30:31 -0700 Subject: [PATCH 1/2] Update JAR Dependencies - May 2025 --- gradle.properties | 6 +++--- src/org/labkey/test/TestFileUtils.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 834394698c..7781a1ddab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ apacheCommonsCsvVersion=1.14.0 -aspectjVersion=1.9.23 +aspectjVersion=1.9.24 assertjVersion=3.27.3 @@ -8,9 +8,9 @@ awaitilityVersion=4.3.0 lookfirstSardineVersion=5.13 -jettyVersion=12.0.18 +jettyVersion=12.0.21 -seleniumVersion=4.27.0 +seleniumVersion=4.33.0 mockserverNettyVersion=5.15.0 diff --git a/src/org/labkey/test/TestFileUtils.java b/src/org/labkey/test/TestFileUtils.java index fe93c8bfaa..f1114a03c9 100644 --- a/src/org/labkey/test/TestFileUtils.java +++ b/src/org/labkey/test/TestFileUtils.java @@ -37,7 +37,6 @@ import org.bouncycastle.openpgp.PGPPBEEncryptedData; import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; -import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; import org.bouncycastle.util.io.Streams; import org.jetbrains.annotations.NotNull; @@ -653,7 +652,7 @@ public static byte[] decrypt(byte[] encrypted, char[] passPhrase) throws IOExcep } PGPPBEEncryptedData pbe = (PGPPBEEncryptedData) enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build()) + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder() .setProvider(BouncyCastleProvider.PROVIDER_NAME).build(passPhrase)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear); From 374655e6b0f6e32eac582fc26e5b9d7cd85e9fb1 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 28 May 2025 16:32:46 -0700 Subject: [PATCH 2/2] Remove failed bouncycastle fix --- src/org/labkey/test/TestFileUtils.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/test/TestFileUtils.java b/src/org/labkey/test/TestFileUtils.java index f1114a03c9..fcbed755cd 100644 --- a/src/org/labkey/test/TestFileUtils.java +++ b/src/org/labkey/test/TestFileUtils.java @@ -37,6 +37,7 @@ import org.bouncycastle.openpgp.PGPPBEEncryptedData; import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder; import org.bouncycastle.util.io.Streams; import org.jetbrains.annotations.NotNull; @@ -47,6 +48,7 @@ import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -54,6 +56,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -469,7 +472,12 @@ public static File writeTempFile(String name, String contents) throws IOExceptio */ public static File writeFile(File file, String contents) throws IOException { - try (Writer writer = PrintWriters.getPrintWriter(file)) + return writeFile(file, contents, false); + } + + public static File writeFile(File file, String contents, boolean append) throws IOException + { + try (Writer writer = new OutputStreamWriter(new FileOutputStream(file, append), StandardCharsets.UTF_8)) { writer.write(contents); return file; @@ -577,10 +585,10 @@ private static List unTar(final File inputFile, final File outputDir) thro { final List untaredFiles = new ArrayList<>(); try (InputStream is = new FileInputStream(inputFile); - TarArchiveInputStream inputStream = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream("tar", is)) + TarArchiveInputStream inputStream = new ArchiveStreamFactory().createArchiveInputStream("tar", is)) { TarArchiveEntry entry; - while ((entry = (TarArchiveEntry) inputStream.getNextEntry()) != null) + while ((entry = inputStream.getNextEntry()) != null) { final File outputFile = new File(outputDir, entry.getName()); if (entry.isDirectory()) @@ -597,7 +605,7 @@ private static List unTar(final File inputFile, final File outputDir) thro { try (OutputStream outputFileStream = new FileOutputStream(outputFile)) { - org.apache.commons.compress.utils.IOUtils.copy(inputStream, outputFileStream); + IOUtils.copy(inputStream, outputFileStream); } } untaredFiles.add(outputFile); @@ -652,7 +660,7 @@ public static byte[] decrypt(byte[] encrypted, char[] passPhrase) throws IOExcep } PGPPBEEncryptedData pbe = (PGPPBEEncryptedData) enc.get(0); - InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder() + InputStream clear = pbe.getDataStream(new JcePBEDataDecryptorFactoryBuilder(new JcaPGPDigestCalculatorProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build()) .setProvider(BouncyCastleProvider.PROVIDER_NAME).build(passPhrase)); JcaPGPObjectFactory pgpFact = new JcaPGPObjectFactory(clear);