diff --git a/bitbucket-app/pom.xml b/bitbucket-app/pom.xml
index 3ef3a7a..0d72b19 100644
--- a/bitbucket-app/pom.xml
+++ b/bitbucket-app/pom.xml
@@ -3,27 +3,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- bitbucketbot
org.sadtech.bot.bitbucketbot
+ bitbucketbot
3.0.0-RELEASE
4.0.0
bitbucket-app
- ${org.sadtech.bot.bitbucket-app.version}
+ ${sadtech.bitbucketbot.app.version}
org.sadtech.bot.bitbucketbot
bitbucketbot-core
- 3.1.0-SNAPSHOT
-
-
-
- org.sadtech.bot.bitbucketbot
- bitbucketbot-data
- 3.0.1-SNAPSHOT
@@ -31,6 +24,11 @@
bot-core
+
+ org.sadtech.bot.bitbucketbot
+ bitbucketbot-data
+
+
org.sadtech.bot.bitbucketbot
bot-rest
diff --git a/bitbucket-sdk/pom.xml b/bitbucket-sdk/pom.xml
index be7fb6c..66e5219 100644
--- a/bitbucket-sdk/pom.xml
+++ b/bitbucket-sdk/pom.xml
@@ -10,7 +10,7 @@
4.0.0
bitbucket-sdk
- ${org.sadtech.bot.bitbucket-sdk.version}
+ ${sadtech.bitbucketbot.bitbucket.sdk.version}
diff --git a/bitbucketbot-context/pom.xml b/bitbucketbot-context/pom.xml
index 7fec40a..35d4de8 100644
--- a/bitbucketbot-context/pom.xml
+++ b/bitbucketbot-context/pom.xml
@@ -10,7 +10,7 @@
4.0.0
bitbucketbot-context
- ${org.sadtech.bot.bitbucket-context.version}
+ ${sadtech.bitbucketbot.context.version}
@@ -25,7 +25,7 @@
org.sadtech.haiti.filter
- criteria-filter
+ haiti-filter-criteria
diff --git a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java
index 4760332..ddd4607 100644
--- a/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java
+++ b/bitbucketbot-context/src/main/java/org/sadtech/bot/vsc/bitbucketbot/context/service/PullRequestsService.java
@@ -8,7 +8,7 @@ import org.sadtech.bot.vsc.bitbucketbot.context.domain.filter.PullRequestFilter;
import org.sadtech.bot.vsc.context.domain.PullRequestStatus;
import org.sadtech.bot.vsc.context.domain.ReviewerStatus;
import org.sadtech.haiti.context.service.SimpleManagerService;
-import org.sadtech.haiti.context.service.simple.FilterService;
+import org.sadtech.haiti.filter.FilterService;
import java.util.List;
import java.util.Optional;
diff --git a/bitbucketbot-core/pom.xml b/bitbucketbot-core/pom.xml
index 70c2546..432144c 100644
--- a/bitbucketbot-core/pom.xml
+++ b/bitbucketbot-core/pom.xml
@@ -10,7 +10,7 @@
4.0.0
bitbucketbot-core
- ${org.sadtech.bot.bitbucket-context.version}
+ ${sadtech.bitbucketbot.context.version}
@@ -36,7 +36,6 @@
org.sadtech.bot.vcs
vcs-bot-context
- 0.0.1-DEVELOP
diff --git a/bitbucketbot-data/pom.xml b/bitbucketbot-data/pom.xml
index 88e8dc5..edbcc46 100644
--- a/bitbucketbot-data/pom.xml
+++ b/bitbucketbot-data/pom.xml
@@ -10,7 +10,7 @@
4.0.0
bitbucketbot-data
- 3.0.1-SNAPSHOT
+ ${sadtech.bitbucketbot.data.version}
@@ -22,7 +22,7 @@
spring-data-jpa
- org.sadtech.haiti
+ org.sadtech.haiti.data
haiti-database
diff --git a/bot-core/pom.xml b/bot-core/pom.xml
index bf936a7..d194d21 100644
--- a/bot-core/pom.xml
+++ b/bot-core/pom.xml
@@ -3,19 +3,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- bitbucketbot
org.sadtech.bot.bitbucketbot
+ bitbucketbot
3.0.0-RELEASE
4.0.0
bot-core
- ${org.sadtech.bot-core.version}
+ ${sadtech.bitbucketbot.core.version}
org.sadtech.haiti.filter
- criteria-filter
+ haiti-filter-criteria
@@ -24,7 +24,7 @@
- org.sadtech.haiti
+ org.sadtech.haiti.data
haiti-database
diff --git a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java b/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java
index 7d3e62b..20bb371 100644
--- a/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java
+++ b/bot-core/src/main/java/org/sadtech/bot/vcs/core/service/impl/PullRequestsServiceImpl.java
@@ -26,9 +26,9 @@ import org.sadtech.bot.vsc.context.domain.PullRequestStatus;
import org.sadtech.bot.vsc.context.domain.ReviewerStatus;
import org.sadtech.haiti.context.page.Pagination;
import org.sadtech.haiti.context.page.Sheet;
-import org.sadtech.haiti.context.service.simple.FilterService;
import org.sadtech.haiti.core.service.AbstractSimpleManagerService;
import org.sadtech.haiti.core.util.Assert;
+import org.sadtech.haiti.filter.FilterService;
import org.sadtech.haiti.filter.criteria.CriteriaFilter;
import org.sadtech.haiti.filter.criteria.CriteriaQuery;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -333,13 +333,8 @@ public class PullRequestsServiceImpl extends AbstractSimpleManagerService getAll(@NonNull PullRequestFilter filter) {
- return filterService.getAll(filter);
- }
-
- @Override
- public Optional getFirst(@NonNull PullRequestFilter filter) {
- return filterService.getFirst(filter);
+ public Optional getFirst(@NonNull PullRequestFilter pullRequestFilter) {
+ return filterService.getFirst(pullRequestFilter);
}
@Override
@@ -347,6 +342,11 @@ public class PullRequestsServiceImpl extends AbstractSimpleManagerService4.0.0
bot-rest
- ${org.sadtech.bot.rest.version}
+ ${sadtech.bitbucketbot.rest.version}
diff --git a/pom.xml b/pom.xml
index 7593243..46c20a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,22 +30,23 @@
1.8
1.8
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
- 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
+ 3.0.0-RELEASE
- 0.0.1-SNAPSHOT
- 0.0.1-SNAPSHOT
- 0.0.1-DEVELOPER
- 0.0.1-DEVELOP
-
- 0.0.1-SNAPSHOT
- 0.1.0-SNAPSHOT
+ 0.0.1-RELEASE
+ 0.0.1-RELEASE
+ 0.0.1-RELEASE
+ 0.0.1-RELEASE
+ 0.0.1-DEVELOP
2.2
@@ -56,114 +57,143 @@
+
+
+
+ org.sadtech.bot.vcs
+ vcs-bot-context
+ ${sadtech.bot.vsc.context.version}
+
+
+
+
+
org.sadtech.bot.bitbucketbot
- bot-rest
- ${org.sadtech.bot.rest.version}
+ bitbucketbot-core
+ ${sadtech.bitbucketbot.core.version}
org.sadtech.bot.bitbucketbot
- telegram-bot
- ${org.sadtech.bot.telegram.version}
+ bot-rest
+ ${sadtech.bitbucketbot.rest.version}
org.sadtech.bot.bitbucketbot
bot-core
- ${org.sadtech.bot-core.version}
+ ${sadtech.bitbucketbot.core.version}
+
+
+
+ org.sadtech.bot.bitbucketbot
+ telegram-bot
+ ${sadtech.bitbucketbot.telegram.version}
org.sadtech.bot.bitbucketbot
teamcity-sdk
- ${org.sadtech.bot.teamcity-sdk.version}
+ ${sadtech.bitbucketbot.teamcity.sdk.version}
org.sadtech.bot.bitbucketbot
bitbucketbot-context
- ${org.sadtech.bot.bitbucket-context.version}
+ ${sadtech.bitbucketbot.context.version}
org.sadtech.bot.bitbucketbot
bitbucket-sdk
- ${org.sadtech.bot.bitbucket-sdk.version}
+ ${sadtech.bitbucketbot.bitbucket.sdk.version}
org.sadtech.bot.bitbucketbot
teamcity-core
- ${org.sadtech.bot.teamcity-core.version}
+ ${sadtech.bitbucketbot.teamcity.core.version}
- org.sadtech.basic.filter
- criteria-filter
- ${sadtech.project.filter.criteria.version}
+ org.sadtech.bot.bitbucketbot
+ bitbucketbot-data
+ ${sadtech.bitbucketbot.data.version}
+
+
+
- org.sadtech.haiti
+ org.sadtech.haiti.data
haiti-database
- ${org.sadtech.haiti.database.version}
+ ${haiti.database.version}
- org.sadtech.telegram
+ org.sadtech.bot.godfather
telegram-bot
- ${org.sadtech.telegram.bot-core.version}
+ 0.0.1-RELEASE
org.sadtech.haiti
haiti-context
- ${org.sadtech.haiti.context.version}
-
-
-
- org.sadtech.bot.vcs
- vcs-bot-context
- ${org.sadtech.bot.vsc.context.version}
+ ${haiti.context.version}
org.sadtech.haiti.filter
- criteria-filter
- ${org.sadtech.haiti.filter.version}
+ haiti-filter-criteria
+ ${haiti.filter.criteria.version}
+
+
+
org.hibernate.orm
hibernate-jpamodelgen
${hibernate.jpa-modelgen.version}
-
- com.google.guava
- guava
- ${google.guava.version}
-
-
-
- org.liquibase
- liquibase-core
- ${liquibase.version}
-
-
org.postgresql
postgresql
${postgresql.version}
+
+ org.liquibase
+ liquibase-core
+ ${liquibase.version}
+
+
+
+ javax.persistence
+ javax.persistence-api
+ ${javax.persistance.version}
+
+
+
+
+
+
+ com.google.guava
+ guava
+ ${google.guava.version}
+
+
org.projectlombok
lombok
${lombok.version}
+
+
+
org.springframework.boot
spring-boot-starter-web
@@ -176,6 +206,9 @@
+
+
+
com.squareup.okhttp3
okhttp
@@ -188,11 +221,7 @@
${jackson.version}
-
- javax.persistence
- javax.persistence-api
- ${javax.persistance.version}
-
+
@@ -241,7 +270,8 @@
uPagge
Struchkov Mark
- upagge@mail.ru
+ upagge@ya.ru
+ SADTECH
diff --git a/teamcity/pom.xml b/teamcity/pom.xml
index 589b5e5..fdf0aa5 100644
--- a/teamcity/pom.xml
+++ b/teamcity/pom.xml
@@ -10,21 +10,12 @@
4.0.0
teamcity
+ ${sadtech.bitbucketbot.teamcity.version}
pom
+
teamcity-sdk
teamcity-core
-
-
-
- org.sadtech.bot.bitbucketbot
- teamcity-sdk
- ${org.sadtech.bot.teamcity-sdk.version}
-
-
-
-
-
\ No newline at end of file
diff --git a/teamcity/teamcity-core/pom.xml b/teamcity/teamcity-core/pom.xml
index 9289002..ff6e671 100644
--- a/teamcity/teamcity-core/pom.xml
+++ b/teamcity/teamcity-core/pom.xml
@@ -10,10 +10,9 @@
4.0.0
teamcity-core
- ${org.sadtech.bot.teamcity-core.version}
+ ${sadtech.bitbucketbot.teamcity.core.version}
-
org.sadtech.bot.bitbucketbot
bot-core
diff --git a/teamcity/teamcity-sdk/pom.xml b/teamcity/teamcity-sdk/pom.xml
index d0a3f6d..4a83b77 100644
--- a/teamcity/teamcity-sdk/pom.xml
+++ b/teamcity/teamcity-sdk/pom.xml
@@ -10,7 +10,7 @@
4.0.0
teamcity-sdk
- ${org.sadtech.bot.teamcity-sdk.version}
+ ${sadtech.bitbucketbot.teamcity.sdk.version}
diff --git a/telegram-bot/pom.xml b/telegram-bot/pom.xml
index 518682b..6d117d3 100644
--- a/telegram-bot/pom.xml
+++ b/telegram-bot/pom.xml
@@ -10,6 +10,7 @@
4.0.0
telegram-bot
+ ${sadtech.bitbucketbot.telegram.version}
@@ -23,7 +24,7 @@
- org.sadtech.telegram
+ org.sadtech.bot.godfather
telegram-bot
diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java
index 3221cbc..94b6895 100644
--- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/config/TelegramBotConfig.java
@@ -2,6 +2,12 @@ package org.sadtech.bot.vcs.telegram.config;
import org.sadtech.autoresponder.repository.UnitPointerRepository;
import org.sadtech.autoresponder.repository.UnitPointerRepositoryMap;
+import org.sadtech.bot.godfather.telegram.autoresponder.MessageAutoresponderTelegram;
+import org.sadtech.bot.godfather.telegram.config.TelegramPollingConfig;
+import org.sadtech.bot.godfather.telegram.listen.EventDistributor;
+import org.sadtech.bot.godfather.telegram.listen.EventDistributorImpl;
+import org.sadtech.bot.godfather.telegram.listen.TelegramConnect;
+import org.sadtech.bot.godfather.telegram.listen.TelegramSender;
import org.sadtech.bot.vcs.telegram.service.ReplaceUrlLocalhost;
import org.sadtech.social.bot.domain.unit.AnswerCheck;
import org.sadtech.social.core.domain.content.Mail;
@@ -10,12 +16,6 @@ import org.sadtech.social.core.service.MailService;
import org.sadtech.social.core.service.MessageService;
import org.sadtech.social.core.service.impl.MailServiceImpl;
import org.sadtech.social.core.service.sender.Sending;
-import org.sadtech.telegram.bot.autoresponder.MessageAutoresponderTelegram;
-import org.sadtech.telegram.bot.config.TelegramPollingConfig;
-import org.sadtech.telegram.bot.listen.EventDistributor;
-import org.sadtech.telegram.bot.listen.EventDistributorImpl;
-import org.sadtech.telegram.bot.listen.TelegramConnect;
-import org.sadtech.telegram.bot.listen.TelegramSender;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java
index 602a073..bfa98b5 100644
--- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/scheduler/CheckNewMessage.java
@@ -1,7 +1,7 @@
package org.sadtech.bot.vcs.telegram.scheduler;
import lombok.RequiredArgsConstructor;
-import org.sadtech.telegram.bot.autoresponder.MessageAutoresponderTelegram;
+import org.sadtech.bot.godfather.telegram.autoresponder.MessageAutoresponderTelegram;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
diff --git a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java
index 594e4e6..f8ca07e 100644
--- a/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java
+++ b/telegram-bot/src/main/java/org/sadtech/bot/vcs/telegram/service/ReplaceUrlLocalhost.java
@@ -1,6 +1,6 @@
package org.sadtech.bot.vcs.telegram.service;
-import org.sadtech.telegram.bot.service.SendPreProcessing;
+import org.sadtech.bot.godfather.telegram.service.SendPreProcessing;
import org.springframework.stereotype.Component;
/**