Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

Обновил версии
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Struchkov Mark 2023-02-18 11:39:03 +03:00
parent 2c9bd6cfc0
commit 1f587f80de
Signed by: upagge
GPG Key ID: D3018BE7BA428CA6
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java
View File

@ -1,6 +1,6 @@
package dev.struchkov.bot.gitlab.context.domain.notify.task; 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.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Singular; import lombok.Singular;

2
bot-core/src/main/java/dev/struchkov/bot/gitlab/core/service/impl/DiscussionServiceImpl.java
View File

@ -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.GitlabProperty;
import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty; import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty;
import dev.struchkov.bot.gitlab.core.utils.StringUtils; 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.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

49
pom.xml
View File

@ -44,15 +44,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <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> <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> <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> <plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
</properties> </properties>
@ -101,25 +106,25 @@
<dependency> <dependency>
<groupId>dev.struchkov.haiti.utils</groupId> <groupId>dev.struchkov.haiti.utils</groupId>
<artifactId>haiti-utils-field-constants</artifactId> <artifactId>haiti-utils-field-constants</artifactId>
<version>0.0.6</version> <version>${haiti.utils.fields.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-utils</artifactId> <artifactId>haiti-utils</artifactId>
<version>2.5.0</version> <version>${haiti.utils.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.struchkov.haiti</groupId> <groupId>dev.struchkov.haiti</groupId>
<artifactId>haiti-exception</artifactId> <artifactId>haiti-exception</artifactId>
<version>2.5.0</version> <version>${haiti.utils.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>dev.struchkov.haiti.filter</groupId> <groupId>dev.struchkov.haiti.filter</groupId>
<artifactId>haiti-filter-criteria</artifactId> <artifactId>haiti-filter-criteria</artifactId>
<version>0.0.5</version> <version>${haiti.filter.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -171,29 +176,15 @@
</dependency> </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> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -205,7 +196,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${plugin.maven.compiler.version}</version> <version>${plugin.maven.compiler.ver}</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>
@ -237,10 +228,6 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>

2
telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/notify/NewThreadNotifyGenerator.java
View File

@ -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.domain.notify.task.DiscussionNewNotify;
import dev.struchkov.bot.gitlab.context.utils.Icons; import dev.struchkov.bot.gitlab.context.utils.Icons;
import dev.struchkov.godfather.simple.domain.BoxAnswer; 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 org.springframework.stereotype.Component;
import java.util.List; import java.util.List;