You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by sm...@apache.org on 2020/04/22 10:16:08 UTC
[incubator-nlpcraft] branch NLPCRAFT-39 updated: NLPCRAFT-39: Add
Java 11 support
This is an automated email from the ASF dual-hosted git repository.
smakov pushed a commit to branch NLPCRAFT-39
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-39 by this push:
new 17fa1a2 NLPCRAFT-39: Add Java 11 support
17fa1a2 is described below
commit 17fa1a21b0f117b04b70fd80caf515b8d8d4f829
Author: smakov <sm...@apache.org>
AuthorDate: Wed Apr 22 13:16:02 2020 +0300
NLPCRAFT-39: Add Java 11 support
---
pom.xml | 9 ++++-----
src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala | 1 +
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 179730d..b0deedf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<apache.common.lang.ver>3.8.1</apache.common.lang.ver>
<apache.httpcomponents.ver>4.5.7</apache.httpcomponents.ver>
<apache.opennlp.ver>1.9.1</apache.opennlp.ver>
- <maven.javadoc.plugin.ver>3.0.0-M1</maven.javadoc.plugin.ver>
+ <maven.javadoc.plugin.ver>3.2.0</maven.javadoc.plugin.ver>
<maven.shade.plugin.ver>3.2.1</maven.shade.plugin.ver>
<maven.source.plugin.ver>3.0.1</maven.source.plugin.ver>
<maven.gpg.plugin.ver>1.6</maven.gpg.plugin.ver>
@@ -573,11 +573,11 @@
------------------------------------------------------------------------
You are trying to compile NLPCraft with inappropriate JDK version!
Detected JDK Version: ${java.runtime.version}
-JDK version should be 1.8
+JDK version should be 8 or 11
------------------------------------------------------------------------
</message>
- <version>[1.8,1.9)</version>
+ <version>1.8,11</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -595,8 +595,7 @@ JDK version should be 1.8
<version>${maven.javadoc.plugin.ver}</version>
<configuration>
<!-- Required as of JDK 8u121 -->
- <additionalparam>--allow-script-in-comments, -Xdoclint:none</additionalparam>
-
+ <additionalOptions>--allow-script-in-comments, -Xdoclint:none</additionalOptions>
<javadocDirectory>${project.basedir}/javadoc</javadocDirectory>
<docfilessubdirs>true</docfilessubdirs>
<encoding>UTF-8</encoding>
diff --git a/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala b/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index 94639f3..f32a8a3 100644
--- a/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -1587,7 +1587,7 @@ object NCUtils extends LazyLogging {
def mkObject[T](clsName: String): T = {
try
// Try Java reflection first.
- Class.forName(clsName).newInstance().asInstanceOf[T]
+ Class.forName(clsName).getDeclaredConstructor().newInstance().asInstanceOf[T]
catch {
case _: Throwable ⇒
// Try Scala reflection second.
diff --git a/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala b/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index 746bdda..d564737 100644
--- a/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++ b/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -109,6 +109,7 @@ object NCDeployManager extends NCService with DecorateAsScala {
private def makeModelFactory(clsName: String): NCModelFactory =
catching(classOf[Throwable]) either Thread.currentThread().getContextClassLoader.
loadClass(clsName).
+ getDeclaredConstructor().
newInstance().
asInstanceOf[NCModelFactory]
match {