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 @@ UTF-8 UTF-8 - 0.0.49-SNAPSHOT + 0.0.49 + 2.6.0 + 0.0.9 + 0.0.5 + 3.1.0 + 31.1-jre - 2.14.1 - 2.14.1 - 3.10.1 + + 3.10.1 + 3.0.0-M7 @@ -101,25 +106,25 @@ dev.struchkov.haiti.utils haiti-utils-field-constants - 0.0.6 + ${haiti.utils.fields.version} dev.struchkov.haiti haiti-utils - 2.5.0 + ${haiti.utils.version} dev.struchkov.haiti haiti-exception - 2.5.0 + ${haiti.utils.version} dev.struchkov.haiti.filter haiti-filter-criteria - 0.0.5 + ${haiti.filter.version} @@ -171,29 +176,15 @@ - - - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.databind.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.datatype.jsr310.version} - - - + + org.apache.maven.plugins + maven-release-plugin + org.apache.maven.plugins maven-compiler-plugin @@ -205,7 +196,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${plugin.maven.compiler.version} + ${plugin.maven.compiler.ver} ${java.version} ${java.version} @@ -237,10 +228,6 @@ org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-release-plugin - 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;