This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new 8101350 Fixes for Apache RAT report.
8101350 is described below
commit 8101350f5dfdd6deb5e2a1cadc479403ba60a245
Author: Aaron Radzinzski <[email protected]>
AuthorDate: Fri Apr 3 16:31:10 2020 -0700
Fixes for Apache RAT report.
---
bin/prepare.sh | 2 +-
pom.xml | 18 +++++++++---------
.../scala/org/apache/nlpcraft/model/NCUser.java | 22 +++++++++++++++-------
.../nlp/core/google/NCGoogleNerEnricher.scala | 17 +++++++++++++++++
4 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/bin/prepare.sh b/bin/prepare.sh
index aadda11..cc6f695 100755
--- a/bin/prepare.sh
+++ b/bin/prepare.sh
@@ -35,7 +35,7 @@ curDir=$(pwd)
cd ../
-mvn clean package -P release
+mvn clean package -Prelease
rm -R ${zipDir} 2> /dev/null
diff --git a/pom.xml b/pom.xml
index 5456bd7..dfd9689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,6 +452,11 @@
<plugins>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
+ </plugin>
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>${scala.plugin.ver}</version>
@@ -802,19 +807,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${maven.gpg.plugin.ver}</version>
- <configuration>
- <keyname>${gpg.keyname}</keyname>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
<executions>
<execution>
- <id>sign-artifacts</id>
<phase>verify</phase>
<goals>
- <goal>sign</goal>
+ <goal>check</goal>
</goals>
</execution>
</executions>
diff --git a/src/main/scala/org/apache/nlpcraft/model/NCUser.java
b/src/main/scala/org/apache/nlpcraft/model/NCUser.java
index d72e086..e6e8931 100644
--- a/src/main/scala/org/apache/nlpcraft/model/NCUser.java
+++ b/src/main/scala/org/apache/nlpcraft/model/NCUser.java
@@ -1,10 +1,18 @@
-// @java.file.header
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+/*
+ * 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.
*/
package org.apache.nlpcraft.model;
diff --git
a/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
b/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
index d30c98a..e61ff29 100644
---
a/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
+++
b/src/main/scala/org/apache/nlpcraft/server/nlp/core/google/NCGoogleNerEnricher.scala
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
package org.apache.nlpcraft.server.nlp.core.google
import com.google.cloud.language.v1.{AnalyzeEntitiesRequest,
AnalyzeEntitiesResponse, Document, EncodingType, Entity, EntityMention,
LanguageServiceClient}