This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-326-Scala3
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-326-Scala3 by this
push:
new 985f34a WIP.
985f34a is described below
commit 985f34adf00cc3d0e6276ca0d79f9b7accb13de4
Author: Aaron Radzinzski <[email protected]>
AuthorDate: Thu May 20 16:20:34 2021 -0700
WIP.
---
.../nlpcraft/examples/sql/db/SqlAccess.scala | 2 +-
nlpcraft/pom.xml | 8 +++----
.../nlpcraft/common/ascii/NCAsciiTable.scala | 2 +-
.../common/extcfg/NCExternalConfigManager.scala | 2 +-
.../nlp/core/opennlp/NCOpenNlpTokenizer.scala | 2 +-
.../org/apache/nlpcraft/common/util/NCUtils.scala | 2 +-
.../model/tools/cmdline/NCCliAnsiBleach.scala | 2 +-
.../sqlgen/impl/NCSqlModelGeneratorImpl.scala | 2 +-
.../org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
.../probe/mgrs/deploy/NCDeployManager.scala | 2 +-
.../org/apache/nlpcraft/server/NCServer.scala | 2 +-
.../nlp/core/opennlp/NCOpenNlpNerEnricher.scala | 2 +-
.../server/nlp/core/opennlp/NCOpenNlpParser.scala | 2 +-
.../mgrs/nlp/enrichers/NCEnrichersTestBeans.scala | 2 +-
pom.xml | 25 ++++++++++------------
15 files changed, 28 insertions(+), 31 deletions(-)
diff --git
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
index f26e356..10a780d 100644
---
a/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
+++
b/nlpcraft-examples/sql/src/main/java/org/apache/nlpcraft/examples/sql/db/SqlAccess.scala
@@ -24,7 +24,7 @@ import com.typesafe.scalalogging.LazyLogging
import org.apache.nlpcraft.common.ascii.NCAsciiTable
import org.h2.jdbc.JdbcSQLException
import org.h2.jdbcx.JdbcDataSource
-import resource.managed
+import scala.util.Using
/**
* Ad-hoc querying for H2 Database. This is a simple, single thread
implementation.
diff --git a/nlpcraft/pom.xml b/nlpcraft/pom.xml
index d0bc7d1..c54233a 100644
--- a/nlpcraft/pom.xml
+++ b/nlpcraft/pom.xml
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>com.typesafe.scala-logging</groupId>
- <artifactId>scala-logging_3.0.0-RC1</artifactId>
+ <artifactId>scala-logging_2.13</artifactId>
</dependency>
<dependency>
<groupId>org.apache.opennlp</groupId>
@@ -185,15 +185,15 @@
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http_2.12</artifactId>
+ <artifactId>akka-http_2.13</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream_2.12</artifactId>
+ <artifactId>akka-stream_2.13</artifactId>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http-spray-json_2.12</artifactId>
+ <artifactId>akka-http-spray-json_2.13</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
index 4d14053..7bea251 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/ascii/NCAsciiTable.scala
@@ -18,7 +18,6 @@
package org.apache.nlpcraft.common.ascii
import java.io.{IOException, PrintStream}
-
import com.typesafe.scalalogging.Logger
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.common.ascii.NCAsciiTable._
@@ -26,6 +25,7 @@ import org.apache.nlpcraft.common.ansi.NCAnsi._
import scala.collection.JavaConverters._
import scala.collection.mutable
+import scala.util.Using
/**
* `ASCII`-based table with minimal styling support.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
index 5e700cb..c572219 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/extcfg/NCExternalConfigManager.scala
@@ -26,7 +26,6 @@ import org.apache.nlpcraft.common.module.NCModule
import org.apache.nlpcraft.common.module.NCModule.{NCModule, PROBE, SERVER}
import org.apache.nlpcraft.common.pool.NCThreadPoolManager
import org.apache.nlpcraft.common.{NCE, NCService, U}
-import resource.managed
import java.io._
import java.net.URL
@@ -35,6 +34,7 @@ import java.util.concurrent.ConcurrentHashMap
import scala.collection.JavaConverters._
import scala.concurrent.ExecutionContext
import scala.io.Source
+import scala.util.Using
/**
* External configuration manager.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/core/opennlp/NCOpenNlpTokenizer.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/core/opennlp/NCOpenNlpTokenizer.scala
index ac615e6..5e276cb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/core/opennlp/NCOpenNlpTokenizer.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/nlp/core/opennlp/NCOpenNlpTokenizer.scala
@@ -22,7 +22,7 @@ import opennlp.tools.tokenize.{Tokenizer, TokenizerME,
TokenizerModel}
import org.apache.nlpcraft.common.NCService
import org.apache.nlpcraft.common.nlp.core.{NCNlpCoreToken, NCNlpTokenizer}
import org.apache.nlpcraft.common.extcfg.NCExternalConfigManager
-import resource.managed
+import scala.util.Using
import org.apache.nlpcraft.common.extcfg.NCExternalConfigType.OPENNLP
import scala.language.{implicitConversions, postfixOps}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
index becdada..b57a234 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/util/NCUtils.scala
@@ -40,7 +40,7 @@ import
com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper}
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.google.gson.{GsonBuilder, JsonElement}
-import com.typesafe.scalalogging._
+import com.typesafe.scalalogging.{LazyLogging, Logger}
import org.apache.commons.codec.binary.Base64
import org.apache.commons.codec.digest.DigestUtils
import org.apache.commons.io.IOUtils
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliAnsiBleach.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliAnsiBleach.scala
index 5415c2d..3a5a825 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliAnsiBleach.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliAnsiBleach.scala
@@ -21,7 +21,7 @@ import java.io.{BufferedInputStream, BufferedReader}
import org.apache.nlpcraft.common._
import org.jline.utils.InputStreamReader
-import resource.managed
+import scala.util.Using
/**
* Pipe filter to remove ANSI escape sequences.
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
index ff148cb..88f2364 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
@@ -34,7 +34,7 @@ import org.apache.nlpcraft.common.version.NCVersion
import org.apache.nlpcraft.model.impl.json.{NCElementJson, NCMacroJson,
NCModelJson}
import org.apache.nlpcraft.model.tools.sqlgen.NCSqlJoinType
import org.apache.nlpcraft.common._
-import resource.managed
+import scala.util.Using
import scala.collection.JavaConverters._
import scala.collection.immutable.HashMap
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
index 83d23e6..767c90e 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -50,7 +50,7 @@ import
org.apache.nlpcraft.probe.mgrs.nlp.enrichers.stopword.NCStopWordEnricher
import
org.apache.nlpcraft.probe.mgrs.nlp.enrichers.suspicious.NCSuspiciousNounsEnricher
import org.apache.nlpcraft.probe.mgrs.nlp.validate.NCValidateManager
import org.apache.nlpcraft.probe.mgrs.sentence.NCSentenceManager
-import resource.managed
+import scala.util.Using
import java.io._
import java.util.concurrent.CompletableFuture
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index b10a8c9..558c947 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -38,7 +38,7 @@ import org.apache.nlpcraft.model.intent.solver.NCIntentSolver
import org.apache.nlpcraft.model.intent._
import org.apache.nlpcraft.probe.mgrs.NCProbeSynonymChunkKind.{IDL, REGEX,
TEXT}
import org.apache.nlpcraft.probe.mgrs.{NCProbeModel, NCProbeSynonym,
NCProbeSynonymChunk, NCProbeSynonymsWrapper}
-import resource.managed
+import scala.util.Using
import scala.collection.JavaConverters._
import scala.compat.java8.OptionConverters._
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
index cba51e6..08d4db4 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -51,7 +51,7 @@ import org.apache.nlpcraft.server.sql.NCSqlManager
import org.apache.nlpcraft.server.sugsyn.NCSuggestSynonymManager
import org.apache.nlpcraft.server.tx.NCTxManager
import org.apache.nlpcraft.server.user.NCUserManager
-import resource.managed
+import scala.util.Using
import java.io._
import java.util.concurrent.CountDownLatch
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala
index e2c5228..5e2743d 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpNerEnricher.scala
@@ -29,7 +29,7 @@ import org.apache.nlpcraft.common.{NCService, U}
import org.apache.nlpcraft.server.ignite.NCIgniteHelpers._
import org.apache.nlpcraft.server.ignite.NCIgniteInstance
import org.apache.nlpcraft.server.nlp.core.NCNlpNerEnricher
-import resource.managed
+import scala.util.Using
import scala.concurrent.ExecutionContext
import scala.util.control.Exception.catching
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
index f8fc29b..3162321 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/nlp/core/opennlp/NCOpenNlpParser.scala
@@ -30,7 +30,7 @@ import org.apache.nlpcraft.common.{NCService, U}
import org.apache.nlpcraft.server.ignite.NCIgniteHelpers._
import org.apache.nlpcraft.server.ignite.NCIgniteInstance
import org.apache.nlpcraft.server.nlp.core.{NCNlpParser, NCNlpWord}
-import resource.managed
+import scala.util.Using
import scala.concurrent.ExecutionContext
import scala.util.control.Exception.catching
diff --git
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnrichersTestBeans.scala
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnrichersTestBeans.scala
index c622207..4d352b3 100644
---
a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnrichersTestBeans.scala
+++
b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/NCEnrichersTestBeans.scala
@@ -18,7 +18,7 @@
package org.apache.nlpcraft.probe.mgrs.nlp.enrichers
import org.apache.nlpcraft.model.NCToken
-import resource.managed
+import scala.util.Using
import java.io.{ByteArrayInputStream, ByteArrayOutputStream,
ObjectInputStream, ObjectOutputStream}
import java.nio.charset.StandardCharsets.UTF_8
diff --git a/pom.xml b/pom.xml
index 66ba1bc..857ab19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,9 +126,9 @@
<maven.clean.plugin.ver>3.1.0</maven.clean.plugin.ver>
<apache.rat.plugin.ver>0.13</apache.rat.plugin.ver>
<org.antlr4.ver>4.9</org.antlr4.ver>
- <akka.http.2.12.ver>10.2.0</akka.http.2.12.ver>
- <akka.stream.2.12.ver>2.6.8</akka.stream.2.12.ver>
- <akka.http.spray.json.2.12.ver>10.2.0</akka.http.spray.json.2.12.ver>
+ <akka.http.2.13.ver>10.2.4</akka.http.2.13.ver>
+ <akka.stream.2.13.ver>2.6.14</akka.stream.2.13.ver>
+ <akka.http.spray.json.2.13.ver>10.2.0</akka.http.spray.json.2.13.ver>
<google.guava.ver>29.0-jre</google.guava.ver>
<diff.utils.ver>4.7</diff.utils.ver>
<vertical.blank.ver>1.0.1</vertical.blank.ver>
@@ -274,7 +274,7 @@
<dependency>
<groupId>com.typesafe.scala-logging</groupId>
- <artifactId>scala-logging_3.0.0-RC1</artifactId>
+ <artifactId>scala-logging_2.13</artifactId>
<version>${scala.logging.ver}</version>
</dependency>
@@ -400,20 +400,20 @@
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http_2.12</artifactId>
- <version>${akka.http.2.12.ver}</version>
+ <artifactId>akka-http_2.13</artifactId>
+ <version>${akka.http.2.13.ver}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream_2.12</artifactId>
- <version>${akka.stream.2.12.ver}</version>
+ <artifactId>akka-stream_2.13</artifactId>
+ <version>${akka.stream.2.13.ver}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
- <artifactId>akka-http-spray-json_2.12</artifactId>
- <version>${akka.http.spray.json.2.12.ver}</version>
+ <artifactId>akka-http-spray-json_2.13</artifactId>
+ <version>${akka.http.spray.json.2.13.ver}</version>
</dependency>
<dependency>
@@ -510,10 +510,7 @@
<jvmArg>-Xss2048k</jvmArg>
</jvmArgs>
<args>
- <arg>-unchecked</arg>
- <arg>-deprecation</arg>
- <arg>-explaintypes</arg>
- <arg>-feature</arg>
+ <arg>-Ytasty-reader</arg>
</args>
<!-- Suppress warnings on release versions of Scala. -->
<scalaCompatVersion>2.13</scalaCompatVersion>
