You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by ji...@apache.org on 2023/05/31 18:16:23 UTC
[daffodil] branch main updated: Update commons-io to 2.12.0
This is an automated email from the ASF dual-hosted git repository.
jinterrante pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new cad16dbd4 Update commons-io to 2.12.0
cad16dbd4 is described below
commit cad16dbd4b637ac288b6a065d79e9fb198a66c42
Author: Scala Steward <sc...@virtuslab.com>
AuthorDate: Wed May 31 09:06:28 2023 -0400
Update commons-io to 2.12.0
---
daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala | 4 ++--
.../src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala | 2 +-
.../test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala | 2 +-
.../src/test/scala/org/apache/daffodil/core/util/TestUtils.scala | 2 +-
.../main/scala/org/apache/daffodil/lib/api/DaffodilSchemaSource.scala | 2 +-
project/Dependencies.scala | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
index 68dbf5542..1aa8e345c 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
@@ -1309,8 +1309,8 @@ class Main(
}
}
- val nullChannelForUnparse = Channels.newChannel(NullOutputStream.NULL_OUTPUT_STREAM)
- val nullOutputStreamForParse = NullOutputStream.NULL_OUTPUT_STREAM
+ val nullChannelForUnparse = Channels.newChannel(NullOutputStream.INSTANCE)
+ val nullOutputStreamForParse = NullOutputStream.INSTANCE
val NSConvert = 1000000000.0
val (totalTime, results) = Timer.getTimeResult({
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
index 56b36e0c0..a8db59766 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
@@ -59,7 +59,7 @@ object TestInfoset {
// what maintains the schema dynamic runtime context.
//
val inputter = new ScalaXMLInfosetInputter(xmlElem)
- val dummyOutStream = NullOutputStream.NULL_OUTPUT_STREAM
+ val dummyOutStream = NullOutputStream.INSTANCE
val unparseResult = dp.unparse(inputter, dummyOutStream)
if (unparseResult.isError) {
val exc = unparseResult.getDiagnostics.filter(_.isError).head
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
index 08ea0eddd..976104ef0 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
@@ -75,7 +75,7 @@ object TestInfosetFree {
}
val unparseInputter = new ScalaXMLInfosetInputter(parseOutputter.getResult)
- val unparseOutput = Channels.newChannel(NullOutputStream.NULL_OUTPUT_STREAM)
+ val unparseOutput = Channels.newChannel(NullOutputStream.INSTANCE)
val unparseResult = dp.unparse(unparseInputter, unparseOutput)
if (unparseResult.isError) {
val msgs = unparseResult.getDiagnostics.map { _.getMessage() }.mkString("\n")
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
index 6b7f0f266..2bd873072 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
@@ -310,7 +310,7 @@ object TestUtils {
}
def testCompileTime(resourcePathString: String): Unit = {
- val nos = NullOutputStream.NULL_OUTPUT_STREAM
+ val nos = NullOutputStream.INSTANCE
val nullChannel = java.nio.channels.Channels.newChannel(nos)
val compiler = Compiler()
val uri = Misc.getRequiredResource(resourcePathString)
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/DaffodilSchemaSource.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/DaffodilSchemaSource.scala
index 6c98a02de..b4ca3caa8 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/DaffodilSchemaSource.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/api/DaffodilSchemaSource.scala
@@ -142,7 +142,7 @@ class InputStreamSchemaSource(
XMLUtils.convertInputStreamToTempFile(is, tmpDir.getOrElse(null), blameName, extension)
lazy val tempURI = tempSchemaFile.toURI
lazy val csName = {
- val xmlStream = new XmlStreamReader(tempSchemaFile)
+ val xmlStream = XmlStreamReader.builder().setFile(tempSchemaFile).get()
val csName = xmlStream.getEncoding()
xmlStream.close()
csName
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9f6a41426..906345df7 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -28,7 +28,7 @@ object Dependencies {
"com.ibm.icu" % "icu4j" % "73.1",
"xerces" % "xercesImpl" % "2.12.2",
"xml-resolver" % "xml-resolver" % "1.2",
- "commons-io" % "commons-io" % "2.11.0",
+ "commons-io" % "commons-io" % "2.12.0",
"com.typesafe" % "config" % "1.4.2",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.5",
)