You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/04/17 21:13:35 UTC

[incubator-nlpcraft] branch NLPCRAFT-38 created (now 5594425)

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

aradzinski pushed a change to branch NLPCRAFT-38
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.


      at 5594425  Fixed NLPCRAFT-38.

This branch includes the following new commits:

     new 5594425  Fixed NLPCRAFT-38.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-nlpcraft] 01/01: Fixed NLPCRAFT-38.

Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 559442531a2aeb5cfe0b116af2f48eb45c4b70dc
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Fri Apr 17 14:13:31 2020 -0700

    Fixed NLPCRAFT-38.
---
 bin/prepare.sh              |  4 ++--
 docs/404.html               | 17 +++++++++++++++++
 docs/_layouts/compress.html | 17 +++++++++++++++++
 pom.xml                     | 31 +++++++++++++++++--------------
 4 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/bin/prepare.sh b/bin/prepare.sh
index a7741b9..d314d71 100755
--- a/bin/prepare.sh
+++ b/bin/prepare.sh
@@ -28,7 +28,7 @@ localUser=223A2AADD175994F4450467491D161EDD8405C82
 
 zipDir=zips
 tmpDir=apache-nlpcraft
-zipFileBin=apache-nlpcraft-incubating-bin-$1.zip # NOT an officual ASF release.
+zipFileBin=apache-nlpcraft-incubating-bin-$1.zip # NOT an official ASF release.
 zipFileSrc=apache-nlpcraft-incubating-$1.zip # An OFFICIAL ASF release.
 
 curDir=$(pwd)
@@ -51,7 +51,6 @@ rsync -avzq sql ${zipDir}/${tmpDir} --exclude '**/.DS_Store'
 cp bindist/LICENSE ${zipDir}/${tmpDir}
 cp NOTICE ${zipDir}/${tmpDir}
 cp DISCLAIMER ${zipDir}/${tmpDir}
-cp KEYS ${zipDir}/${tmpDir}
 cp src/main/resources/nlpcraft.conf ${zipDir}/${tmpDir}/build
 cp src/main/resources/ignite.xml ${zipDir}/${tmpDir}/build
 cp src/main/resources/log4j2.xml ${zipDir}/${tmpDir}/build
@@ -65,6 +64,7 @@ zip -rq ${zipFileBin} ${tmpDir} 2> /dev/null
 
 # Deletes some data for src zip
 rm -R ${tmpDir}/build 2> /dev/null
+rm -R ${tmpDir}/javadoc 2> /dev/null
 
 # Adds some data for src zip.
 cd ../
diff --git a/docs/404.html b/docs/404.html
index d40b571..c6433bc 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -2,6 +2,23 @@
 layout: default
 ---
 
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 <div class="container page-not-found">
   <h1>404</h1>
   <p><strong>Page not found :(</strong></p>
diff --git a/docs/_layouts/compress.html b/docs/_layouts/compress.html
index bb34487..bc21ca0 100644
--- a/docs/_layouts/compress.html
+++ b/docs/_layouts/compress.html
@@ -6,5 +6,22 @@
 # MIT License
 ---
 
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 {% capture _LINE_FEED %}
 {% endcapture %}{% if site.compress_html.ignore.envs contains jekyll.environment or site.compress_html.ignore.envs == "all" %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% fo [...]
diff --git a/pom.xml b/pom.xml
index 0050c98..d5bb488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -570,12 +570,15 @@
                     <rules>
                         <requireJavaVersion>
                             <message>
-                                [INFO] ------------------------------------------------------------------------
-                                [ERROR] You are trying to compile NLPCraft with inappropriate JDK version!
-                                [ERROR] Detected JDK Version: ${java.runtime.version}
-                                [ERROR] JDK version should be &gt;= 1.8.0_1.
+
+------------------------------------------------------------------------
+You are trying to compile NLPCraft with inappropriate JDK version!
+Detected JDK Version: ${java.runtime.version}
+JDK version should be 1.8
+------------------------------------------------------------------------
+
                             </message>
-                            <version>[1.8.0,)</version>
+                            <version>[1.8,1.9)</version>
                         </requireJavaVersion>
                     </rules>
                 </configuration>
@@ -808,24 +811,24 @@
                         <version>${apache.rat.plugin.ver}</version>
                         <configuration>
                             <excludes>
-                                <exclude>docs/**/*</exclude>
-                                <exclude>zips/**/*</exclude>
-                                <exclude>LICENSE</exclude>
-                                <exclude>KEYS</exclude>
-                                <exclude>DISCLAIMER</exclude>
-                                <exclude>NOTICE</exclude>
                                 <exclude>.gitignore</exclude>
                                 <exclude>.travis.yml</exclude>
                                 <exclude>build</exclude>
                                 <exclude>.idea</exclude>
                                 <exclude>venv</exclude>
                                 <exclude>*.iml</exclude>
-                                <exclude>**/*.html</exclude>
                                 <exclude>**/*.txt</exclude>
-                                <exclude>**/*.json</exclude>
-                                <exclude>docs/**/*</exclude>
+                                <exclude>src/main/resources/geo/countries/*.json</exclude>
                                 <exclude>idea/**/*</exclude>
+                                <exclude>docs/_site/**/*</exclude>
+                                <exclude>docs/ext/**/*</exclude>
+                                <exclude>docs/images/**/*</exclude>
+                                <exclude>docs/.sass-cache/**/*</exclude>
+                                <exclude>docs/apis/**/*</exclude>
+                                <exclude>zips/**/*</exclude>
+                                <exclude>docs/fonts/**/*</exclude>
                                 <exclude>javadoc/**/*</exclude>
+                                <exclude>src/main/resources/**/*.json</exclude>
                                 <exclude>src/main/resources/moby/*</exclude>
                                 <exclude>src/main/scala/org/apache/nlpcraft/model/intent/impl/antlr4/*</exclude>
                                 <exclude>src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/*</exclude>