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 <[email protected]> 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://[email protected]/apache/incubator-nlpcraft.git</connection> <developerConnection>scm:git:ssh://[email protected]/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>
