From 1f587f80de048287e22dac1fbbb7703daaa3ad61 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Sat, 18 Feb 2023 11:39:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notify/task/DiscussionNewNotify.java      |  2 +-
 .../service/impl/DiscussionServiceImpl.java   |  2 +-
 pom.xml                                       | 49 +++++++------------
 .../notify/NewThreadNotifyGenerator.java      |  2 +-
 4 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java
index 7e06255..78cc270 100644
--- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java
+++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java
@@ -1,6 +1,6 @@
 package dev.struchkov.bot.gitlab.context.domain.notify.task;
 
-import dev.struchkov.haiti.utils.Pair;
+import dev.struchkov.haiti.utils.container.Pair;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Singular;
diff --git a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java
index 1f9f5ae..080673a 100644
--- a/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java
+++ b/bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java
@@ -17,7 +17,7 @@ import dev.struchkov.bot.gitlab.context.service.NotifyService;
 import dev.struchkov.bot.gitlab.core.config.properties.GitlabProperty;
 import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
 import dev.struchkov.bot.gitlab.core.utils.StringUtils;
-import dev.struchkov.haiti.utils.Pair;
+import dev.struchkov.haiti.utils.container.Pair;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/pom.xml b/pom.xml
index f61a649..ff773ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,15 +44,20 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <godfather.telegram.core.version>0.0.49-SNAPSHOT</godfather.telegram.core.version>
+        <godfather.telegram.core.version>0.0.49</godfather.telegram.core.version>
+        <haiti.utils.version>2.6.0</haiti.utils.version>
+        <haiti.utils.fields.version>0.0.9</haiti.utils.fields.version>
+        <haiti.filter.version>0.0.5</haiti.filter.version>
 
+        <!-- https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api -->
         <jakarta.persistance.version>3.1.0</jakarta.persistance.version>
 
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
         <google.guava.version>31.1-jre</google.guava.version>
-        <jackson.databind.version>2.14.1</jackson.databind.version>
-        <jackson.datatype.jsr310.version>2.14.1</jackson.datatype.jsr310.version>
 
-        <plugin.maven.compiler.version>3.10.1</plugin.maven.compiler.version>
+        <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin -->
+        <plugin.maven.compiler.ver>3.10.1</plugin.maven.compiler.ver>
+        <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
         <plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
     </properties>
 
@@ -101,25 +106,25 @@
             <dependency>
                 <groupId>dev.struchkov.haiti.utils</groupId>
                 <artifactId>haiti-utils-field-constants</artifactId>
-                <version>0.0.6</version>
+                <version>${haiti.utils.fields.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>dev.struchkov.haiti</groupId>
                 <artifactId>haiti-utils</artifactId>
-                <version>2.5.0</version>
+                <version>${haiti.utils.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>dev.struchkov.haiti</groupId>
                 <artifactId>haiti-exception</artifactId>
-                <version>2.5.0</version>
+                <version>${haiti.utils.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>dev.struchkov.haiti.filter</groupId>
                 <artifactId>haiti-filter-criteria</artifactId>
-                <version>0.0.5</version>
+                <version>${haiti.filter.version}</version>
             </dependency>
 
             <dependency>
@@ -171,29 +176,15 @@
             </dependency>
 
             <!-- /утилиты -->
-            <!-- spring -->
-
-            <!-- /spring -->
-            <!-- http -->
-
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson.databind.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson.datatype.jsr310.version}</version>
-            </dependency>
-            <!-- /http -->
-
         </dependencies>
     </dependencyManagement>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -205,7 +196,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${plugin.maven.compiler.version}</version>
+                    <version>${plugin.maven.compiler.ver}</version>
                     <configuration>
                         <source>${java.version}</source>
                         <target>${java.version}</target>
@@ -237,10 +228,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewThreadNotifyGenerator.java b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewThreadNotifyGenerator.java
index 5ed1a4d..2fe6e22 100644
--- a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewThreadNotifyGenerator.java
+++ b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewThreadNotifyGenerator.java
@@ -3,7 +3,7 @@ package dev.struchkov.bot.gitlab.telegram.service.notify;
 import dev.struchkov.bot.gitlab.context.domain.notify.task.DiscussionNewNotify;
 import dev.struchkov.bot.gitlab.context.utils.Icons;
 import dev.struchkov.godfather.simple.domain.BoxAnswer;
-import dev.struchkov.haiti.utils.Pair;
+import dev.struchkov.haiti.utils.container.Pair;
 import org.springframework.stereotype.Component;
 
 import java.util.List;