[incubator-daffodil] branch master updated: Bump version for 3.0.0 development

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git


The following commit(s) were added to refs/heads/master by this push:
     new 13f7f57  Bump version for 3.0.0 development
13f7f57 is described below

commit 13f7f5757ff4600a2931db435194cc32c280d8d1
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jul 16 08:07:37 2020 -0400

    Bump version for 3.0.0 development
    
    Also remove specific Daffodil version from bin.NOTICE and bin.LICENSE
    files. We don't want to have to update these files every time there is a
    Daffodil version bump. Instead, just use a "<VERSION>" placeholder, to
    make it clear what file the license refers to.
    
    DAFFODIL-2370
---
 build.sbt                |  2 +-
 daffodil-cli/bin.LICENSE | 12 ++++++------
 daffodil-cli/bin.NOTICE  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.sbt b/build.sbt
index 12090db..aa0ead7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -104,7 +104,7 @@ lazy val testStdLayout    = Project("daffodil-test-stdLayout", file("test-stdLay
 
 lazy val commonSettings = Seq(
   organization := "org.apache.daffodil",
-  version := "2.7.0",
+  version := "3.0.0-SNAPSHOT",
   scalaVersion := "2.12.11",
   crossScalaVersions := Seq("2.12.11", "2.11.12"),
   scalacOptions ++= Seq(
diff --git a/daffodil-cli/bin.LICENSE b/daffodil-cli/bin.LICENSE
index 15e24bc..3594910 100644
--- a/daffodil-cli/bin.LICENSE
+++ b/daffodil-cli/bin.LICENSE
@@ -210,7 +210,7 @@ subcomponents is subject to the terms and conditions of the following licenses.
 
   This product bundles compiled source from 'Passera', including the following
   files:
-    - passera/ directory in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
+    - passera/ directory in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
   These files are available under the BSD-2-Clause license:
 
     Copyright (c) 2011-2013, Nate Nystrom
@@ -239,11 +239,11 @@ subcomponents is subject to the terms and conditions of the following licenses.
 
   This product bundles material copied or derived from W3C, including the
   following files:
-    - org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
-    - org/apache/daffodil/xsd/XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd) in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
-    - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd) in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
-    - org/apache/daffodil/xsd/datatypes.dtd (https://www.w3.org/2001/datatypes.dtd) in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
-    - org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar
+    - org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+    - org/apache/daffodil/xsd/XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd) in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+    - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd) in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+    - org/apache/daffodil/xsd/datatypes.dtd (https://www.w3.org/2001/datatypes.dtd) in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
+    - org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar
   These files are available under the W3C Software and Document Licnese:
 
     By obtaining and/or copying this work, you (the licensee) agree that you have
diff --git a/daffodil-cli/bin.NOTICE b/daffodil-cli/bin.NOTICE
index 9be9fc1..66d9b5a 100644
--- a/daffodil-cli/bin.NOTICE
+++ b/daffodil-cli/bin.NOTICE
@@ -83,7 +83,7 @@ Jackson JSON processor (lib/com.fasterxml.jackson.core.jackson-core-2.10.2.jar)
   from the source code management (SCM) system project uses.
 
 Scala (lib/org.scala-lang.scala-library-2.12.11.jar)
-      (org/apache/daffodil/util/UniquenessCache.class in lib/org.apache.daffodil.daffodil-lib-2.7.0.jar)
+      (org/apache/daffodil/util/UniquenessCache.class in lib/org.apache.daffodil.daffodil-lib-<VERSION>.jar)
   Scala parser combinators
   Copyright (c) 2002-2020 EPFL
   Copyright (c) 2011-2020 Lightbend, Inc.