[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-85

[se...@apache.org]

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

sergeykamov pushed a commit to branch NLPCRAFT-85
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit ab49b4f404a52ae3e9dfedbf239e2b48d88651b9
Merge: 1ce8418 ade3fb9
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Mon Jul 6 12:16:46 2020 +0300

    Merge branch 'master' into NLPCRAFT-85

 .../scala/org/apache/nlpcraft/common/util/NCUtils.scala   | 15 +++++++++++++++
 .../org/apache/nlpcraft/examples/sql/db/SqlServer.scala   |  3 +--
 .../scala/org/apache/nlpcraft/examples/sql/sql_model.yaml |  2 +-
 .../org/apache/nlpcraft/examples/sql/sql_model_init.yaml  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index a4ee079,e40376e..74e88cd
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@@ -719,8 -718,23 +719,23 @@@ object NCUtils extends LazyLogging 
                          lines.map(_.toString).toSeq.sorted
                      else
                          lines
 -                
 +
                  ps.println(s"#")
+                 ps.println(s"# Licensed to the Apache Software Foundation (ASF) under one or more")
+                 ps.println(s"# contributor license agreements.  See the NOTICE file distributed with")
+                 ps.println(s"# this work for additional information regarding copyright ownership.")
+                 ps.println(s"# The ASF licenses this file to You under the Apache License, Version 2.0")
+                 ps.println(s"# (the 'License'); you may not use this file except in compliance with")
+                 ps.println(s"# the License.  You may obtain a copy of the License at")
+                 ps.println(s"#")
+                 ps.println(s"#      http://www.apache.org/licenses/LICENSE-2.0")
+                 ps.println(s"#")
+                 ps.println(s"# Unless required by applicable law or agreed to in writing, software")
+                 ps.println(s"# distributed under the License is distributed on an 'AS IS' BASIS,")
+                 ps.println(s"# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.")
+                 ps.println(s"# See the License for the specific language governing permissions and")
+                 ps.println(s"# limitations under the License.")
+                 ps.println(s"#")
                  ps.println(s"# Auto-generated on: ${new Date()}")
                  ps.println(s"# Total lines: ${seq.size}")
                  ps.println(s"#")