You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2021/05/20 21:47:26 UTC
[incubator-nlpcraft] branch NLPCRAFT-326-Scala3 updated (f2361b4 ->
a549601)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-326-Scala3
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from f2361b4 Update NCMetadata.java
new b7b7253 Changed ver. to 1.0.0
new a549601 WIP.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 4 ++--
docker/readme.md | 14 ++++++------
nlpcraft-examples/alarm/pom.xml | 2 +-
nlpcraft-examples/echo/pom.xml | 2 +-
nlpcraft-examples/helloworld/pom.xml | 2 +-
nlpcraft-examples/lightswitch/pom.xml | 2 +-
nlpcraft-examples/minecraft/pom.xml | 2 +-
nlpcraft-examples/phone/pom.xml | 2 +-
nlpcraft-examples/sql/pom.xml | 2 +-
nlpcraft-examples/time/pom.xml | 2 +-
nlpcraft-examples/weather/pom.xml | 2 +-
nlpcraft-stanford/pom.xml | 2 +-
nlpcraft/pom.xml | 5 ++---
.../apache/nlpcraft/common/version/NCVersion.scala | 5 +++--
openapi/nlpcraft_swagger.yml | 2 +-
pom.xml | 26 ++++++++--------------
16 files changed, 34 insertions(+), 42 deletions(-)
[incubator-nlpcraft] 02/02: WIP.
Posted by ar...@apache.org.
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
commit a54960143f0d178de62adc413558ea350582c518
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Thu May 20 14:04:19 2021 -0700
WIP.
---
nlpcraft/pom.xml | 3 +--
.../apache/nlpcraft/common/version/NCVersion.scala | 6 +++---
pom.xml | 24 ++++++++--------------
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/nlpcraft/pom.xml b/nlpcraft/pom.xml
index 6b6ff6b..d670018 100644
--- a/nlpcraft/pom.xml
+++ b/nlpcraft/pom.xml
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>com.typesafe.scala-logging</groupId>
- <artifactId>scala-logging_${scala.base}</artifactId>
+ <artifactId>scala-logging_3.0.0-RC1</artifactId>
</dependency>
<dependency>
<groupId>org.apache.opennlp</groupId>
@@ -136,7 +136,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect</artifactId>
- <!-- Ignite contains 13 version but it contains 12. -->
<exclusions>
<exclusion>
<groupId>com.intellij</groupId>
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
index 4061773..6d09984 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
@@ -47,17 +47,17 @@ object NCVersion extends LazyLogging {
// | UPDATE THIS SEQUENCE FOR EACH RELEASE MANUALLY. |
// +=================================================+
private final val VERSIONS = Seq(
- Version("0.5.0", LocalDate.of(2020, 4, 16)),
+ Version("0.5.0", LocalDate.of(2020, 4, 16)), // Java 8, Scala 2.12 minimums.
Version("0.6.0", LocalDate.of(2020, 5, 25)),
Version("0.6.2", LocalDate.of(2020, 7, 9)),
Version("0.7.0", LocalDate.of(2020, 9, 29)),
Version("0.7.1", LocalDate.of(2020, 10, 29)),
Version("0.7.2", LocalDate.of(2020, 11, 19)),
Version("0.7.3", LocalDate.of(2020, 12, 31)),
- Version("0.7.4", LocalDate.of(2021, 1, 31)),
+ Version("0.7.4", LocalDate.of(2021, 1, 31)), // Java 11, Scala 2.12 minimums.
Version("0.7.5", LocalDate.of(2021, 4, 30)),
Version("0.8.0", LocalDate.of(2021, 5, 30)),
- Version("1.0.0", LocalDate.of(2021, 7, 30))
+ Version("1.0.0", LocalDate.of(2021, 7, 30)) // Java 11, Scala 3 minimums.
).sortBy(_.version)
// +=================================================+
// | UPDATE THIS SEQUENCE FOR EACH RELEASE MANUALLY. |
diff --git a/pom.xml b/pom.xml
index c1e262d..0c2ece6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,12 +67,11 @@
<connection>scm:git:ssh://git@github.com/apache/incubator-nlpcraft.git</connection>
<developerConnection>scm:git:ssh://git@github.com/apache/incubator-nlpcraft.git</developerConnection>
<!-- Set actual tag name here -->
- <tag>v0.8.0</tag>
+ <tag>v1.0.0</tag>
</scm>
<properties>
- <!-- Major Scala version. -->
- <scala.base>2.12</scala.base>
+ <!-- Major Java version. -->
<java.ver>11</java.ver>
<maven.build.timestamp.format>yyyy-MM-dd-HH-mm</maven.build.timestamp.format>
@@ -83,7 +82,7 @@
<gridgain.agent.ver>2.8.1.2</gridgain.agent.ver>
<scala.plugin.ver>4.3.1</scala.plugin.ver>
<log4j.ver>2.12.0</log4j.ver>
- <scala.ver>${scala.base}.11</scala.ver>
+ <scala.ver>3.36.0</scala.ver>
<scala.config.ver>1.3.4</scala.config.ver>
<commons.codec.ver>1.14</commons.codec.ver>
<commons.io.ver>2.7</commons.io.ver>
@@ -92,12 +91,12 @@
<apache.commons.text.ver>1.9</apache.commons.text.ver>
<jsoup.ver>1.13.1</jsoup.ver>
<slf4j.ver>1.7.26</slf4j.ver>
- <scala.logging.ver>3.9.2</scala.logging.ver>
+ <scala.logging.ver>3.9.3</scala.logging.ver>
<scala.arm.ver>2.0</scala.arm.ver>
<scala.xml.ver>1.1.1</scala.xml.ver>
- <c3p0.ver>0.9.5.4</c3p0.ver> <!-- Upgraded to due security vulnerability. -->
+ <c3p0.ver>0.9.5.4</c3p0.ver>
<scalatest.ver>3.0.8</scalatest.ver>
- <lift.json.ver>3.3.0</lift.json.ver>
+ <lift.json.ver>3.4.3</lift.json.ver>
<scalaj.ver>2.4.1</scalaj.ver>
<spray.ver>1.3.5</spray.ver>
<tika.ver>1.21</tika.ver>
@@ -275,7 +274,7 @@
<dependency>
<groupId>com.typesafe.scala-logging</groupId>
- <artifactId>scala-logging_${scala.base}</artifactId>
+ <artifactId>scala-logging_3.0.0-RC1</artifactId>
<version>${scala.logging.ver}</version>
</dependency>
@@ -322,16 +321,9 @@
</dependency>
<dependency>
- <groupId>com.jsuereth</groupId>
- <artifactId>scala-arm_${scala.base}</artifactId>
- <version>${scala.arm.ver}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect</artifactId>
<version>${tika.ver}</version>
- <!-- Ignite contains 13 version but it contains 12. -->
<exclusions>
<exclusion>
<groupId>com.intellij</groupId>
@@ -360,7 +352,7 @@
<dependency>
<groupId>net.liftweb</groupId>
- <artifactId>lift-json_${scala.base}</artifactId>
+ <artifactId>lift-json_2.13</artifactId>
<version>${lift.json.ver}</version>
</dependency>
[incubator-nlpcraft] 01/02: Changed ver. to 1.0.0
Posted by ar...@apache.org.
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
commit b7b7253e2af99efe4fd8ec1644dfa122e5cf1974
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Thu May 20 13:56:16 2021 -0700
Changed ver. to 1.0.0
---
README.md | 4 ++--
docker/readme.md | 14 +++++++-------
nlpcraft-examples/alarm/pom.xml | 2 +-
nlpcraft-examples/echo/pom.xml | 2 +-
nlpcraft-examples/helloworld/pom.xml | 2 +-
nlpcraft-examples/lightswitch/pom.xml | 2 +-
nlpcraft-examples/minecraft/pom.xml | 2 +-
nlpcraft-examples/phone/pom.xml | 2 +-
nlpcraft-examples/sql/pom.xml | 2 +-
nlpcraft-examples/time/pom.xml | 2 +-
nlpcraft-examples/weather/pom.xml | 2 +-
nlpcraft-stanford/pom.xml | 2 +-
nlpcraft/pom.xml | 2 +-
.../org/apache/nlpcraft/common/version/NCVersion.scala | 1 +
openapi/nlpcraft_swagger.yml | 2 +-
pom.xml | 2 +-
16 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index 28b27db..e001300 100644
--- a/README.md
+++ b/README.md
@@ -105,11 +105,11 @@ Add NLPCraft dependency to your project:
<dependency>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft</artifactId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
```
-NOTE: **0.8.0** should be the latest NLPCraft version.
+NOTE: **1.0.0** should be the latest NLPCraft version.
### Define Data Model
Declare the static part of the data model using YAML which we will later load in our model implementation. You can declare entire
diff --git a/docker/readme.md b/docker/readme.md
index 719c934..e1bf4c9 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -28,9 +28,9 @@ also prepare your own images following the instructions below.
#### Using Server Image
1. [Install](https://docs.docker.com/install/) docker.
- 2. Pull actual NLPCraft server image: ```docker pull nlpcraftserver/server:0.8.0```,
- where `0.7.5` is the desired version.
- 3. Run image: ```docker run -m 8G -p 8081:8081 -p 8201:8201 -p 8202:8202 nlpcraftserver/server:0.8.0```
+ 2. Pull actual NLPCraft server image: ```docker pull nlpcraftserver/server:1.0.0```,
+ where `1.0.0` is the desired version.
+ 3. Run image: ```docker run -m 8G -p 8081:8081 -p 8201:8201 -p 8202:8202 nlpcraftserver/server:1.0.0```
**NOTE**:
Default docker image run REST server with default configuration (see file `build/nlpcraft.conf`). See [configuration](https://nlpcraft.apache.org/server-and-probe.html)
@@ -40,13 +40,13 @@ also prepare your own images following the instructions below.
You can prepare your own NLPCraft server image following these instructions:
1. Build the release with maven: ```mvn clean package -P release```
2. Prepare docker image with `prepare.sh` (modify it if necessary):
- ```./prepare.sh docker_acct server 0.8.0```, where
- * `0.8.0` - maven build version, prepared on previous step.
+ ```./prepare.sh docker_acct server 1.0.0```, where
+ * `1.0.0` - maven build version, prepared on previous step.
* `docker_acct` - change it to your own [DockerHub](https://hub.docker.com) account.
- Note that docker image name will be `docker_acct/server:0.8.0`
+ Note that docker image name will be `docker_acct/server:1.0.0`
3. Login to [DockerHub](https://hub.docker.com): ```docker login```
- 4. Push prepared docker image: ```docker push docker_acct/server:0.8.0```
+ 4. Push prepared docker image: ```docker push docker_acct/server:1.0.0```
5. Logout from [DockerHub](https://hub.docker.com): ```docker logout```
**NOTE**:
diff --git a/nlpcraft-examples/alarm/pom.xml b/nlpcraft-examples/alarm/pom.xml
index 763b8f6..541f834 100644
--- a/nlpcraft-examples/alarm/pom.xml
+++ b/nlpcraft-examples/alarm/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/echo/pom.xml b/nlpcraft-examples/echo/pom.xml
index 0e58925..ab519d1 100644
--- a/nlpcraft-examples/echo/pom.xml
+++ b/nlpcraft-examples/echo/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/helloworld/pom.xml b/nlpcraft-examples/helloworld/pom.xml
index 7f897a9..7fda937 100644
--- a/nlpcraft-examples/helloworld/pom.xml
+++ b/nlpcraft-examples/helloworld/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/lightswitch/pom.xml b/nlpcraft-examples/lightswitch/pom.xml
index f2bce0d..a8dc4c5 100644
--- a/nlpcraft-examples/lightswitch/pom.xml
+++ b/nlpcraft-examples/lightswitch/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/minecraft/pom.xml b/nlpcraft-examples/minecraft/pom.xml
index 5f01310..9f5028e 100644
--- a/nlpcraft-examples/minecraft/pom.xml
+++ b/nlpcraft-examples/minecraft/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/phone/pom.xml b/nlpcraft-examples/phone/pom.xml
index 365496f..dd4a4c7 100644
--- a/nlpcraft-examples/phone/pom.xml
+++ b/nlpcraft-examples/phone/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/sql/pom.xml b/nlpcraft-examples/sql/pom.xml
index df6d1b3..19fa192 100644
--- a/nlpcraft-examples/sql/pom.xml
+++ b/nlpcraft-examples/sql/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/time/pom.xml b/nlpcraft-examples/time/pom.xml
index ca52709..84538fc 100644
--- a/nlpcraft-examples/time/pom.xml
+++ b/nlpcraft-examples/time/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-examples/weather/pom.xml b/nlpcraft-examples/weather/pom.xml
index 1716cb2..cd4021d 100644
--- a/nlpcraft-examples/weather/pom.xml
+++ b/nlpcraft-examples/weather/pom.xml
@@ -27,7 +27,7 @@
<parent>
<artifactId>nlpcraft-parent</artifactId>
<groupId>org.apache.nlpcraft</groupId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft-stanford/pom.xml b/nlpcraft-stanford/pom.xml
index b50eea7..c9d2eb8 100644
--- a/nlpcraft-stanford/pom.xml
+++ b/nlpcraft-stanford/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft/pom.xml b/nlpcraft/pom.xml
index 9a198c1..6b6ff6b 100644
--- a/nlpcraft/pom.xml
+++ b/nlpcraft/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
index 739ba17..4061773 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/version/NCVersion.scala
@@ -57,6 +57,7 @@ object NCVersion extends LazyLogging {
Version("0.7.4", LocalDate.of(2021, 1, 31)),
Version("0.7.5", LocalDate.of(2021, 4, 30)),
Version("0.8.0", LocalDate.of(2021, 5, 30)),
+ Version("1.0.0", LocalDate.of(2021, 7, 30))
).sortBy(_.version)
// +=================================================+
// | UPDATE THIS SEQUENCE FOR EACH RELEASE MANUALLY. |
diff --git a/openapi/nlpcraft_swagger.yml b/openapi/nlpcraft_swagger.yml
index 8b239c3..9cc692d 100644
--- a/openapi/nlpcraft_swagger.yml
+++ b/openapi/nlpcraft_swagger.yml
@@ -21,7 +21,7 @@ info:
REST API for <a href="https://nlpcraft.apache.org">Apache NLPCraft</a> - an open source library for
adding Natural Language Interface to any applications. For Data Model APIs see
<a href="https://nlpcraft.apache.org/apis/latest/index.html">Javadoc</a> documentation.
- version: 0.8.0
+ version: 1.0.0
title: Apache NLPCraft API
host: localhost:8081
basePath: /api/v1
diff --git a/pom.xml b/pom.xml
index b85025e..c1e262d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<name>NLPCraft Parent</name>
<groupId>org.apache.nlpcraft</groupId>
<artifactId>nlpcraft-parent</artifactId>
- <version>0.8.0</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<url>https://nlpcraft.apache.org</url>