This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-91-MODULES
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-91-MODULES by this
push:
new 521f3a8 WIP.
521f3a8 is described below
commit 521f3a8d0795f03ff256231da80a79f283d8e120
Author: Sergey Kamov <[email protected]>
AuthorDate: Fri Apr 23 11:16:23 2021 +0300
WIP.
---
.../{utils => examples}/alarm/AlarmModel.java | 2 +-
.../alarm/NCTestExampleModelsSpec.scala | 2 +-
.../{utils => examples}/echo/EchoModel.scala | 2 +-
.../echo/NCTestExampleModelsSpec.scala | 2 +-
nlpcraft-examples/lightswitch/pom.xml | 70 ++++++++++++++
.../lightswitch/LightSwitchGroovyModel.groovy | 2 +-
.../lightswitch/LightSwitchJavaModel.java | 2 +-
.../lightswitch/LightSwitchKotlinModel.kt | 2 +-
.../lightswitch/LightSwitchModel.scala | 2 +-
.../lightswitch/NCTestExampleModelsSpec.scala | 2 +-
nlpcraft-examples/minecraft/pom.xml | 12 +++
.../example/{ => minecraft}/FIllMatchProcessor.kt | 4 +-
.../example/{ => minecraft}/MinecraftModel.kt | 4 +-
.../nlpcraft/example/{ => minecraft}/Utils.kt | 2 +-
.../example/{ => minecraft}/ValueLoaders.kt | 2 +-
.../{ => minecraft}/NCMinecraftModelSpec.kt | 2 +-
.../{ => minecraft}/NCTestExampleModelsSpec.scala | 2 +-
.../{utils => examples}/phone/PhoneModel.java | 2 +-
nlpcraft-examples/sql/pom.xml | 4 +-
nlpcraft-examples/time/pom.xml | 4 +-
.../{utils => examples}/time/TimeModel.java | 2 +-
.../{utils => examples}/time/TimeModelApp.java | 2 +-
.../time/NCTestExampleModelsSpec.scala | 2 +-
.../{utils => examples}/time/NCTimeModelSpec.scala | 2 +-
.../{utils => examples}/weather/WeatherModel.java | 6 +-
.../weather/darksky/DarkSkyException.java | 2 +-
.../weather/darksky/DarkSkyService.java | 2 +-
.../weather/NCTestExampleModelsSpec.scala | 2 +-
pom.xml | 103 ---------------------
29 files changed, 114 insertions(+), 135 deletions(-)
diff --git
a/nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/utils/alarm/AlarmModel.java
b/nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/examples/alarm/AlarmModel.java
similarity index 99%
rename from
nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/utils/alarm/AlarmModel.java
rename to
nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/examples/alarm/AlarmModel.java
index 0129caf..8c26ae1 100644
---
a/nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/utils/alarm/AlarmModel.java
+++
b/nlpcraft-examples/alarm/src/main/java/org/apache/nlpcraft/examples/alarm/AlarmModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.alarm;
+package org.apache.nlpcraft.examples.alarm;
import org.apache.nlpcraft.model.*;
import java.time.*;
diff --git
a/nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/utils/alarm/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/examples/alarm/NCTestExampleModelsSpec.scala
similarity index 96%
rename from
nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/utils/alarm/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/examples/alarm/NCTestExampleModelsSpec.scala
index 7483b43..b942742 100644
---
a/nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/utils/alarm/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/alarm/src/test/java/org/apache/nlpcraft/examples/alarm/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.alarm
+package org.apache.nlpcraft.examples.alarm
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git
a/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/utils/echo/EchoModel.scala
b/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/echo/EchoModel.scala
similarity index 98%
rename from
nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/utils/echo/EchoModel.scala
rename to
nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/echo/EchoModel.scala
index 35f85e1..15c509b 100644
---
a/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/utils/echo/EchoModel.scala
+++
b/nlpcraft-examples/echo/src/main/java/org/apache/nlpcraft/examples/echo/EchoModel.scala
@@ -1,4 +1,4 @@
-package org.apache.nlpcraft.utils.echo
+package org.apache.nlpcraft.examples.echo
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git
a/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/utils/echo/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCTestExampleModelsSpec.scala
similarity index 96%
rename from
nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/utils/echo/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCTestExampleModelsSpec.scala
index d3d800d..7805be9 100644
---
a/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/utils/echo/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/echo/src/test/java/org/apache/nlpcraft/examples/echo/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.echo
+package org.apache.nlpcraft.examples.echo
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git a/nlpcraft-examples/lightswitch/pom.xml
b/nlpcraft-examples/lightswitch/pom.xml
index 9207554..e8f73ef 100644
--- a/nlpcraft-examples/lightswitch/pom.xml
+++ b/nlpcraft-examples/lightswitch/pom.xml
@@ -24,6 +24,12 @@
<name>NLPCraft example Light Switch</name>
<artifactId>lightswitch</artifactId>
+ <properties>
+ <kotlin.ver>1.4.32</kotlin.ver>
+ <groovy.ver>3.0.7</groovy.ver>
+ <gmavenplus.ver>1.12.1</gmavenplus.ver>
+ </properties>
+
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
@@ -38,6 +44,17 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jdk8</artifactId>
+ <version>${kotlin.ver}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.ver}</version>
+ </dependency>
+
<!-- Test dependencies. -->
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -57,6 +74,59 @@
<target>${java.ver}</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
+ <version>${kotlin.ver}</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>test-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jvmTarget>${java.ver}</jvmTarget>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>${gmavenplus.ver}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sources>
+ <source>
+
<directory>${project.basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.groovy</include>
+ </includes>
+ </source>
+ </sources>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.ver}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchGroovyModel.groovy
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchGroovyModel.groovy
similarity index 98%
rename from
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchGroovyModel.groovy
rename to
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchGroovyModel.groovy
index 9dac096..b8f0cc6 100644
---
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchGroovyModel.groovy
+++
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchGroovyModel.groovy
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.lightswitch
+package org.apache.nlpcraft.examples.lightswitch
import org.apache.nlpcraft.model.*
diff --git
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchJavaModel.java
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchJavaModel.java
similarity index 98%
rename from
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchJavaModel.java
rename to
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchJavaModel.java
index 2183284..9b81e82 100644
---
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchJavaModel.java
+++
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchJavaModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.lightswitch;
+package org.apache.nlpcraft.examples.lightswitch;
import org.apache.nlpcraft.model.*;
diff --git
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchKotlinModel.kt
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
similarity index 98%
rename from
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchKotlinModel.kt
rename to
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
index 1d3455e..cc87371 100644
---
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchKotlinModel.kt
+++
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchKotlinModel.kt
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.lightswitch
+package org.apache.nlpcraft.examples.lightswitch
import org.apache.nlpcraft.model.*
import java.util.stream.Collectors
diff --git
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchModel.scala
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
similarity index 98%
rename from
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchModel.scala
rename to
nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
index 0ac9db1..a8f65b1 100644
---
a/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/utils/lightswitch/LightSwitchModel.scala
+++
b/nlpcraft-examples/lightswitch/src/main/java/org/apache/nlpcraft/examples/lightswitch/LightSwitchModel.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.lightswitch
+package org.apache.nlpcraft.examples.lightswitch
import org.apache.nlpcraft.model.{NCIntentTerm, _}
diff --git
a/nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/utils/lightswitch/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/examples/lightswitch/NCTestExampleModelsSpec.scala
similarity index 96%
rename from
nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/utils/lightswitch/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/examples/lightswitch/NCTestExampleModelsSpec.scala
index dc28bdf..ada9677 100644
---
a/nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/utils/lightswitch/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/lightswitch/src/test/java/org/apache/nlpcraft/examples/lightswitch/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.lightswitch
+package org.apache.nlpcraft.examples.lightswitch
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git a/nlpcraft-examples/minecraft/pom.xml
b/nlpcraft-examples/minecraft/pom.xml
index aa391aa..875687b 100644
--- a/nlpcraft-examples/minecraft/pom.xml
+++ b/nlpcraft-examples/minecraft/pom.xml
@@ -24,6 +24,10 @@
<name>NLPCraft example Minecraft</name>
<artifactId>minecraft</artifactId>
+ <properties>
+ <kotlin.ver>1.4.32</kotlin.ver>
+ </properties>
+
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
@@ -47,12 +51,20 @@
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.ver}</version>
</dependency>
+
+ <!-- Test dependencies. -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-test</artifactId>
+ <version>${kotlin.ver}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nlpcraft</artifactId>
<version>${project.version}</version>
diff --git
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/FIllMatchProcessor.kt
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/FIllMatchProcessor.kt
similarity index 96%
rename from
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/FIllMatchProcessor.kt
rename to
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/FIllMatchProcessor.kt
index 2c32782..c8eff65 100644
---
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/FIllMatchProcessor.kt
+++
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/FIllMatchProcessor.kt
@@ -16,9 +16,9 @@
*
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
-import org.apache.nlpcraft.example.MinecraftObjectValueLoader.Companion.dumps
+import
org.apache.nlpcraft.example.minecraft.MinecraftObjectValueLoader.Companion.dumps
import org.apache.nlpcraft.model.*
import java.util.*
diff --git
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/MinecraftModel.kt
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt
similarity index 96%
rename from
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/MinecraftModel.kt
rename to
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt
index 1eab556..58dfe74 100644
---
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/MinecraftModel.kt
+++
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/MinecraftModel.kt
@@ -16,10 +16,10 @@
*
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
import org.apache.nlpcraft.common.NCException
-import org.apache.nlpcraft.example.MinecraftObjectValueLoader.Companion.dumps
+import
org.apache.nlpcraft.example.minecraft.MinecraftObjectValueLoader.Companion.dumps
import org.apache.nlpcraft.model.*
import java.util.*
diff --git
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/Utils.kt
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/Utils.kt
similarity index 96%
rename from
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/Utils.kt
rename to
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/Utils.kt
index ae52a10..31fdf47 100644
---
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/Utils.kt
+++
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/Utils.kt
@@ -16,7 +16,7 @@
*
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
import org.apache.nlpcraft.model.NCToken
diff --git
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/ValueLoaders.kt
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/ValueLoaders.kt
similarity index 98%
rename from
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/ValueLoaders.kt
rename to
nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/ValueLoaders.kt
index e91d4a3..6342bf1 100644
---
a/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/ValueLoaders.kt
+++
b/nlpcraft-examples/minecraft/src/main/kotlin/org/apache/nlpcraft/example/minecraft/ValueLoaders.kt
@@ -16,7 +16,7 @@
*
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
diff --git
a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCMinecraftModelSpec.kt
b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt
similarity index 96%
rename from
nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCMinecraftModelSpec.kt
rename to
nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt
index a7fbc66..b32fa53 100644
---
a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCMinecraftModelSpec.kt
+++
b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCMinecraftModelSpec.kt
@@ -16,7 +16,7 @@
*
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
import org.apache.nlpcraft.NCTestContext
import org.apache.nlpcraft.NCTestEnvironment
diff --git
a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCTestExampleModelsSpec.scala
similarity index 96%
rename from
nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCTestExampleModelsSpec.scala
index 91687a6..70fcda8 100644
---
a/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/minecraft/src/test/kotlin/org/apache/nlpcraft/example/minecraft/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.example
+package org.apache.nlpcraft.example.minecraft
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git
a/nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/utils/phone/PhoneModel.java
b/nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/examples/phone/PhoneModel.java
similarity index 98%
rename from
nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/utils/phone/PhoneModel.java
rename to
nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/examples/phone/PhoneModel.java
index 2f6dd70..fe19f09 100644
---
a/nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/utils/phone/PhoneModel.java
+++
b/nlpcraft-examples/phone/src/main/java/org/apache/nlpcraft/examples/phone/PhoneModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.phone;
+package org.apache.nlpcraft.examples.phone;
import org.apache.nlpcraft.model.*;
import java.util.*;
diff --git a/nlpcraft-examples/sql/pom.xml b/nlpcraft-examples/sql/pom.xml
index f41609f..cb575bf 100644
--- a/nlpcraft-examples/sql/pom.xml
+++ b/nlpcraft-examples/sql/pom.xml
@@ -49,8 +49,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>nlpcraft</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>compile</scope>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/nlpcraft-examples/time/pom.xml b/nlpcraft-examples/time/pom.xml
index 926785e..a242931 100644
--- a/nlpcraft-examples/time/pom.xml
+++ b/nlpcraft-examples/time/pom.xml
@@ -49,8 +49,8 @@
<groupId>${project.groupId}</groupId>
<artifactId>nlpcraft</artifactId>
<version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>compile</scope>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModel.java
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
similarity index 99%
rename from
nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModel.java
rename to
nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
index c03cdb1..6347bb9 100644
---
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModel.java
+++
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.time;
+package org.apache.nlpcraft.examples.time;
import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.databind.*;
diff --git
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModelApp.java
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModelApp.java
similarity index 97%
rename from
nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModelApp.java
rename to
nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModelApp.java
index f9af63b..8f52122 100644
---
a/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/utils/time/TimeModelApp.java
+++
b/nlpcraft-examples/time/src/main/java/org/apache/nlpcraft/examples/time/TimeModelApp.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.time;
+package org.apache.nlpcraft.examples.time;
import org.apache.nlpcraft.model.tools.embedded.NCEmbeddedProbe;
diff --git
a/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTestExampleModelsSpec.scala
similarity index 96%
rename from
nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTestExampleModelsSpec.scala
index b959b88..833385f 100644
---
a/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.time
+package org.apache.nlpcraft.examples.time
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git
a/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTimeModelSpec.scala
b/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTimeModelSpec.scala
similarity index 97%
rename from
nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTimeModelSpec.scala
rename to
nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTimeModelSpec.scala
index 989b13b..ccc5e31 100644
---
a/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/utils/time/NCTimeModelSpec.scala
+++
b/nlpcraft-examples/time/src/test/java/org/apache/nlpcraft/examples/time/NCTimeModelSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.time
+package org.apache.nlpcraft.examples.time
import org.apache.nlpcraft.{NCTestContext, NCTestEnvironment}
import org.apache.nlpcraft.common.NCException
diff --git
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/WeatherModel.java
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
similarity index 98%
rename from
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/WeatherModel.java
rename to
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
index 804432f..d53a4fe 100644
---
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/WeatherModel.java
+++
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.weather;
+package org.apache.nlpcraft.examples.weather;
import com.google.gson.Gson;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.nlpcraft.examples.weather.darksky.DarkSkyException;
+import org.apache.nlpcraft.examples.weather.darksky.DarkSkyService;
import org.apache.nlpcraft.utils.keycdn.GeoManager;
import org.apache.nlpcraft.utils.keycdn.beans.GeoDataBean;
-import org.apache.nlpcraft.utils.weather.darksky.DarkSkyException;
-import org.apache.nlpcraft.utils.weather.darksky.DarkSkyService;
import org.apache.nlpcraft.model.NCIntent;
import org.apache.nlpcraft.model.NCIntentMatch;
import org.apache.nlpcraft.model.NCIntentSample;
diff --git
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyException.java
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyException.java
similarity index 95%
rename from
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyException.java
rename to
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyException.java
index cd019ec..58dae11 100644
---
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyException.java
+++
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.weather.darksky;
+package org.apache.nlpcraft.examples.weather.darksky;
/**
* DarkSkyException exception.
diff --git
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyService.java
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyService.java
similarity index 99%
rename from
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyService.java
rename to
nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyService.java
index a41bd72..e3b2572 100644
---
a/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/utils/weather/darksky/DarkSkyService.java
+++
b/nlpcraft-examples/weather/src/main/java/org/apache/nlpcraft/examples/weather/darksky/DarkSkyService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.weather.darksky;
+package org.apache.nlpcraft.examples.weather.darksky;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
diff --git
a/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/utils/weather/NCTestExampleModelsSpec.scala
b/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCTestExampleModelsSpec.scala
similarity index 97%
rename from
nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/utils/weather/NCTestExampleModelsSpec.scala
rename to
nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCTestExampleModelsSpec.scala
index 635e018..25f24e9 100644
---
a/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/utils/weather/NCTestExampleModelsSpec.scala
+++
b/nlpcraft-examples/weather/src/test/java/org/apache/nlpcraft/examples/weather/NCTestExampleModelsSpec.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.nlpcraft.utils.weather
+package org.apache.nlpcraft.examples.weather
import org.apache.nlpcraft.model.tools.test.NCTestAutoModelValidator
import org.junit.jupiter.api.{Assertions, Test}
diff --git a/pom.xml b/pom.xml
index a441862..8e78139 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,8 +74,6 @@
<!-- Major Scala version. -->
<scala.base>2.12</scala.base>
<java.ver>11</java.ver>
- <kotlin.ver>1.4.32</kotlin.ver>
- <groovy.ver>3.0.7</groovy.ver>
<!-- Versions. -->
<ignite.ver>2.9.1</ignite.ver>
@@ -165,7 +163,6 @@
the end user, when required.
-->
<stanford.corenlp.ver>3.9.2</stanford.corenlp.ver>
- <kotlin.version>1.4.30-M1</kotlin.version>
</properties>
<dependencyManagement>
@@ -505,53 +502,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
- <version>${kotlin.ver}</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-test</artifactId>
- <version>${kotlin.ver}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.ver}</version>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>bintray.kotlin.eap</id>
- <name>Bintray Kotlin EAP Repository</name>
- <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>bintray.kotlin.eap</id>
- <name>Bintray Kotlin EAP Repository</name>
- <url>https://dl.bintray.com/kotlin/kotlin-eap</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
@@ -644,59 +594,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- <version>${kotlin.ver}</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-compile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jvmTarget>1.8</jvmTarget>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>1.12.1</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sources>
- <source>
-
<directory>${project.basedir}/src/main/scala</directory>
- <includes>
- <include>**/*.groovy</include>
- </includes>
- </source>
- </sources>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.ver}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
