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 2b5ab55 WIP.
2b5ab55 is described below
commit 2b5ab5555ba23aaecc2018feb1acd86c057cc389
Author: Sergey Kamov <[email protected]>
AuthorDate: Fri Apr 23 18:04:19 2021 +0300
WIP.
---
nlpcraft-examples/alarm/pom.xml | 7 ++++++-
nlpcraft-examples/echo/pom.xml | 7 ++++++-
nlpcraft-examples/helloworld/pom.xml | 7 ++++++-
nlpcraft-examples/lightswitch/pom.xml | 19 +++++++++++--------
nlpcraft-examples/minecraft/pom.xml | 13 ++++++++-----
nlpcraft-examples/phone/pom.xml | 2 +-
nlpcraft-examples/sql/pom.xml | 7 ++++++-
nlpcraft-examples/time/pom.xml | 7 ++++++-
8 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/nlpcraft-examples/alarm/pom.xml b/nlpcraft-examples/alarm/pom.xml
index c9f71f3..2dbadae 100644
--- a/nlpcraft-examples/alarm/pom.xml
+++ b/nlpcraft-examples/alarm/pom.xml
@@ -31,6 +31,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -92,7 +97,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/echo/pom.xml b/nlpcraft-examples/echo/pom.xml
index ae74d3b..98b3d63 100644
--- a/nlpcraft-examples/echo/pom.xml
+++ b/nlpcraft-examples/echo/pom.xml
@@ -31,6 +31,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -92,7 +97,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/helloworld/pom.xml
b/nlpcraft-examples/helloworld/pom.xml
index 579a194..9b8b896 100644
--- a/nlpcraft-examples/helloworld/pom.xml
+++ b/nlpcraft-examples/helloworld/pom.xml
@@ -31,6 +31,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -92,7 +97,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/lightswitch/pom.xml
b/nlpcraft-examples/lightswitch/pom.xml
index 4f09adb..d312598 100644
--- a/nlpcraft-examples/lightswitch/pom.xml
+++ b/nlpcraft-examples/lightswitch/pom.xml
@@ -24,12 +24,6 @@
<name>NLPCraft example Light Switch</name>
<artifactId>nlpcraft-example-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>
@@ -37,6 +31,15 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+
+ <kotlin.ver>1.4.32</kotlin.ver>
+ <groovy.ver>3.0.7</groovy.ver>
+ <gmavenplus.ver>1.12.1</gmavenplus.ver>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -81,7 +84,7 @@
<executions>
<execution>
<id>compile</id>
- <phase>compile</phase>
+ <phase>process-sources</phase>
<goals>
<goal>compile</goal>
</goals>
@@ -162,7 +165,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/minecraft/pom.xml
b/nlpcraft-examples/minecraft/pom.xml
index 1ab3e89..672c842 100644
--- a/nlpcraft-examples/minecraft/pom.xml
+++ b/nlpcraft-examples/minecraft/pom.xml
@@ -24,10 +24,6 @@
<name>NLPCraft example Minecraft</name>
<artifactId>nlpcraft-example-minecraft</artifactId>
- <properties>
- <kotlin.ver>1.4.32</kotlin.ver>
- </properties>
-
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
@@ -35,6 +31,13 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+
+ <kotlin.ver>1.4.32</kotlin.ver>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
@@ -141,7 +144,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/phone/pom.xml b/nlpcraft-examples/phone/pom.xml
index 0422899..4579d66 100644
--- a/nlpcraft-examples/phone/pom.xml
+++ b/nlpcraft-examples/phone/pom.xml
@@ -39,7 +39,7 @@
</dependency>
</dependencies>
- <!--Integration and local tests skipped for this module. -->
+ <!-- Integration and local tests skipped for this module. -->
<build>
<plugins>
<plugin>
diff --git a/nlpcraft-examples/sql/pom.xml b/nlpcraft-examples/sql/pom.xml
index fdd71d5..a0afc28 100644
--- a/nlpcraft-examples/sql/pom.xml
+++ b/nlpcraft-examples/sql/pom.xml
@@ -31,6 +31,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -100,7 +105,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
diff --git a/nlpcraft-examples/time/pom.xml b/nlpcraft-examples/time/pom.xml
index 204aa8c..7c9de9b 100644
--- a/nlpcraft-examples/time/pom.xml
+++ b/nlpcraft-examples/time/pom.xml
@@ -31,6 +31,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <properties>
+ <nlpcraft.server.module>nlpcraft</nlpcraft.server.module>
+
<nlpcraft.all.deps.jar>apache-${nlpcraft.server.module}-incubating-${project.version}-all-deps.jar</nlpcraft.all.deps.jar>
+ </properties>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -100,7 +105,7 @@
<argument>-DNLPCRAFT_ANSI_COLOR_DISABLED=true</argument> <!-- Remove ANSI at
least from NLPCraft output. -->
<argument>-Djdk.tls.client.protocols=TLSv1.2</argument>
<argument>-jar</argument>
-
<argument>${project.build.directory}/${nlpcraft.all.deps.jar}</argument>
+
<argument>${project.basedir}/../../${nlpcraft.server.module}/target/${nlpcraft.all.deps.jar}</argument>
<argument>-server</argument>
</arguments>
</configuration>
