From 6c11e40349bbf1287d9680c9a0eb487a16448f10 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 23 Apr 2023 11:06:19 -0400 Subject: [PATCH 1/4] Upgrade GrallVM version --- schemacrawler-commandline/pom.xml | 2 +- schemacrawler-diagram/pom.xml | 2 +- .../src/examples/resources/_downloader/javascript_ivy.xml | 4 ++-- schemacrawler-scripting/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/schemacrawler-commandline/pom.xml b/schemacrawler-commandline/pom.xml index bc440ffc46..cf43c30496 100644 --- a/schemacrawler-commandline/pom.xml +++ b/schemacrawler-commandline/pom.xml @@ -99,7 +99,7 @@ org.graalvm.js js - 21.3.5 + 21.3.6 provided diff --git a/schemacrawler-diagram/pom.xml b/schemacrawler-diagram/pom.xml index ed87139002..b620c0d2b3 100644 --- a/schemacrawler-diagram/pom.xml +++ b/schemacrawler-diagram/pom.xml @@ -77,7 +77,7 @@ org.graalvm.js js - 21.3.5 + 21.3.6 provided diff --git a/schemacrawler-distrib/src/examples/resources/_downloader/javascript_ivy.xml b/schemacrawler-distrib/src/examples/resources/_downloader/javascript_ivy.xml index a61027c406..25a60df115 100644 --- a/schemacrawler-distrib/src/examples/resources/_downloader/javascript_ivy.xml +++ b/schemacrawler-distrib/src/examples/resources/_downloader/javascript_ivy.xml @@ -8,8 +8,8 @@ + rev="21.3.6" conf="binaries->default" /> + rev="21.3.6" conf="binaries->default" /> diff --git a/schemacrawler-scripting/pom.xml b/schemacrawler-scripting/pom.xml index aa4ff4e07a..1d159a677d 100644 --- a/schemacrawler-scripting/pom.xml +++ b/schemacrawler-scripting/pom.xml @@ -203,13 +203,13 @@ org.graalvm.js js - 21.3.5 + 21.3.6 provided org.graalvm.js js-scriptengine - 21.3.5 + 21.3.6 provided From c8bd53f41ddbc9927391eb3cacbbbee2b3eb2d2f Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 23 Apr 2023 11:07:14 -0400 Subject: [PATCH 2/4] Update Spring version --- schemacrawler-parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemacrawler-parent/pom.xml b/schemacrawler-parent/pom.xml index 7d68d02a80..763c9087df 100644 --- a/schemacrawler-parent/pom.xml +++ b/schemacrawler-parent/pom.xml @@ -208,13 +208,13 @@ org.springframework spring-context - 5.3.26 + 5.3.27 test org.springframework spring-jdbc - 5.3.26 + 5.3.27 test From 2becc9bea5c0d21f5651e0da280c14d9ab34b786 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 23 Apr 2023 11:26:26 -0400 Subject: [PATCH 3/4] Update Snowflake driver --- schemacrawler-jdbc-drivers/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemacrawler-jdbc-drivers/pom.xml b/schemacrawler-jdbc-drivers/pom.xml index c7779da72b..d208aba455 100644 --- a/schemacrawler-jdbc-drivers/pom.xml +++ b/schemacrawler-jdbc-drivers/pom.xml @@ -77,7 +77,7 @@ net.snowflake snowflake-jdbc - 3.13.29 + 3.13.30 com.amazon.redshift From 3348d8e62d8d1f1a9bffef914fb2ff0de9f72f67 Mon Sep 17 00:00:00 2001 From: Sualeh Fatehi Date: Sun, 23 Apr 2023 12:16:42 -0400 Subject: [PATCH 4/4] Fix capture of System streams --- .../test/utility/CaptureSystemStreamsExtension.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemacrawler-api/src/test/java/schemacrawler/test/utility/CaptureSystemStreamsExtension.java b/schemacrawler-api/src/test/java/schemacrawler/test/utility/CaptureSystemStreamsExtension.java index a146e5bbca..958c630828 100644 --- a/schemacrawler-api/src/test/java/schemacrawler/test/utility/CaptureSystemStreamsExtension.java +++ b/schemacrawler-api/src/test/java/schemacrawler/test/utility/CaptureSystemStreamsExtension.java @@ -29,13 +29,12 @@ package schemacrawler.test.utility; import static org.junit.jupiter.api.Assertions.fail; - import java.io.FileDescriptor; import java.io.FileOutputStream; import java.io.PrintStream; import java.lang.reflect.Parameter; import java.nio.charset.Charset; - +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.extension.AfterTestExecutionCallback; import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -47,6 +46,7 @@ final class CaptureSystemStreamsExtension implements ParameterResolver, BeforeTestExecutionCallback, AfterTestExecutionCallback { private static final String DEFAULT_CHARSET = Charset.defaultCharset().name(); + private static final String UTF_8_CHARSET = StandardCharsets.UTF_8.toString(); private TestOutputStream err; private TestOutputStream out; @@ -75,10 +75,10 @@ public void beforeTestExecution(final ExtensionContext context) throws Exception err = new TestOutputStream(); System.out.flush(); - System.setOut(new PrintStream(out, true, DEFAULT_CHARSET)); + System.setOut(new PrintStream(out, true, UTF_8_CHARSET)); System.err.flush(); - System.setErr(new PrintStream(err, true, DEFAULT_CHARSET)); + System.setErr(new PrintStream(err, true, UTF_8_CHARSET)); } @Override