Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions daffodil-cli/bin.LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ is subject to the terms and conditions of the following licenses.
copyright holders.

This product bundles 'ICU4J', including the following files:
- lib/com.ibm.icu.icu4j-67.1.jar
- lib/com.ibm.icu.icu4j-<VERSION>.jar
These files are available under the Unicode License. For details, see
https://github.com/unicode-org/icu/blob/release-67-1/icu4c/LICENSE
https://github.com/unicode-org/icu/blob/release-<VERSION>/icu4c/LICENSE

COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)

Expand Down Expand Up @@ -703,7 +703,7 @@ is subject to the terms and conditions of the following licenses.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

This product bundles 'JDOM2', including the following files:
- lib/org.jdom.jdom2-2.0.6.jar
- lib/org.jdom.jdom2-<VERSION>.jar
These files are available under an Apache style License:

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -756,7 +756,7 @@ is subject to the terms and conditions of the following licenses.
on the JDOM Project, please see <http://www.jdom.org/>.

This product bundles 'JLine', including the following files:
- lib/jline.jline-2.14.6.jar
- lib/jline.jline-<VERSION>.jar
These files are available under a BSD-3-Clause license. For details, see
https://github.com/jline/jline2/blob/master/LICENSE.txt

Expand Down Expand Up @@ -796,7 +796,7 @@ is subject to the terms and conditions of the following licenses.
OF THE POSSIBILITY OF SUCH DAMAGE.

This product bundles 'Scallop', including the following files:
- lib/org.rogach.scallop_2.12-3.5.1.jar
- lib/org.rogach.scallop_<VERSION>.jar
These files are available under under an MIT License. For details, see
https://github.com/scallop/scallop/blob/develop/license.txt

Expand All @@ -821,7 +821,7 @@ is subject to the terms and conditions of the following licenses.
SOFTWARE.

This product product bundles 'Stax 2 API', including the following files:
- lib/org.codehaus.woodstox.stax2-api-4.2.1.jar
- lib/org.codehaus.woodstox.stax2-api-<VERSION>.jar
These files are available under the BSD-2-Clause license:

Copyright 2010- FasterXML.com
Expand Down
32 changes: 16 additions & 16 deletions daffodil-cli/bin.NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Based on source code originally developed by

The following NOTICE information applies to binary components distributed with this project:

Apache Commons IO (lib/commons-io.commons-io-2.8.0.jar)
Apache Commons IO (lib/commons-io.commons-io-<VERSION>.jar)
Apache Commons IO
Copyright 2002-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

Apache Xerces Java (lib/xerces.xercesImpl-2.12.0.jar)
Apache Xerces Java (lib/xerces.xercesImpl-<VERSION>.jar)
Apache Xerces Java
Copyright 1999-2018 The Apache Software Foundation

Expand All @@ -32,7 +32,7 @@ Apache Xerces Java (lib/xerces.xercesImpl-2.12.0.jar)
Apache Software Foundation that were originally developed at iClick, Inc.,
software copyright (c) 1999.

Apache XML Commons Resolver (lib/xml-resolver.xml-resolver-1.2.jar)
Apache XML Commons Resolver (lib/xml-resolver.xml-resolver-<VERSION>.jar)
Apache XML Commons Resolver
Copyright 2006 The Apache Software Foundation.

Expand All @@ -43,7 +43,7 @@ Apache XML Commons Resolver (lib/xml-resolver.xml-resolver-1.2.jar)
public domain by Arbortext on 10 Apr 2000. See:
http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm

Apache XML Commons XML APIs (lib/xml-apis.xml-apis-1.4.01.jar)
Apache XML Commons XML APIs (lib/xml-apis.xml-apis-<VERSION>.jar)
Apache XML Commons XML APIs
Copyright 1999-2009 The Apache Software Foundation.

Expand All @@ -55,41 +55,41 @@ Apache XML Commons XML APIs (lib/xml-apis.xml-apis-1.4.01.jar)
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org

JDOM2 (lib/org.jdom.jdom2-2.0.6.jar)
JDOM2 (lib/org.jdom.jdom2-<VERSION>.jar)
Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.

All rights reserved.

This product includes software developed by the
JDOM Project (http://www.jdom.org/).

Jansi (lib/org.fusesource.jansi.jansi-1.17.1.jar)
Jansi (lib/org.fusesource.jansi.jansi-<VERSION>.jar)
Copyright (C) 2009, Progress Software Corporation and/or its
subsidiaries or affiliates. All rights reserved.

Jackson JSON processor (lib/com.fasterxml.jackson.core.jackson-core-2.11.3.jar)
Jackson JSON processor (lib/com.fasterxml.jackson.core.jackson-core-<VERSION>.jar)
Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
Copyright (c) 2008-2020 FasterXML. All rights reserved.

# Jackson JSON processor

Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
been in development since 2007.
It is currently developed by a community of developers, as well as supported
commercially by FasterXML.com.
It is currently developed by a community of developers.

## Licensing

Jackson core and extension components may licensed under different licenses.
Jackson 2.x core and extension components are licensed under Apache License 2.0
To find the details that apply to this artifact see the accompanying LICENSE file.
For more information, including possible other licensing options, contact
FasterXML.com (http://fasterxml.com).

## Credits

A list of contributors may be found from CREDITS file, which is included
A list of contributors may be found from CREDITS(-2.x) file, which is included
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.

Scala (lib/org.scala-lang.scala-library-2.12.11.jar)
Scala (lib/org.scala-lang.scala-library-<VERSION>.jar)
(org/apache/daffodil/util/UniquenessCache.class in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar)
Scala
Copyright (c) 2002-2020 EPFL
Expand All @@ -104,7 +104,7 @@ Scala (lib/org.scala-lang.scala-library-2.12.11.jar)
and can be found in:
daffodil-lib/src/main/scala/org/apache/daffodil/util/UniquenessCache.scala

Scala Parser Combinators (lib/org.scala-lang.modules.scala-parser-combinators_2.12-1.1.2.jar)
Scala Parser Combinators (lib/org.scala-lang.modules.scala-parser-combinators_<VERSION>.jar)
Scala parser combinators
Copyright (c) 2002-2020 EPFL
Copyright (c) 2011-2020 Lightbend, Inc.
Expand All @@ -113,7 +113,7 @@ Scala Parser Combinators (lib/org.scala-lang.modules.scala-parser-combinators_2.
LAMP/EPFL (https://lamp.epfl.ch/) and
Lightbend, Inc. (https://www.lightbend.com/).

Scala XML (lib/org.scala-lang.modules.scala-xml_2.12-1.3.0.jar)
Scala XML (lib/org.scala-lang.modules.scala-xml_<VERSION>.jar)
scala-xml
Copyright (c) 2002-2020 EPFL
Copyright (c) 2011-2020 Lightbend, Inc.
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object Dependencies {
lazy val infoset = Seq(
"org.jdom" % "jdom2" % "2.0.6",
"com.fasterxml.woodstox" % "woodstox-core" % "6.2.3",
"com.fasterxml.jackson.core" % "jackson-core" % "2.11.3"
"com.fasterxml.jackson.core" % "jackson-core" % "2.11.4"
)

lazy val cli = Seq(
Expand Down