From 81ded763faae3408e4f95921297cded7f6d154f4 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sat, 16 Nov 2024 19:28:40 +0300 Subject: [PATCH 1/3] - moved botToken to TelegramClient - replaced getBotToken with getTelegramClient in SpringLongPollingBot --- .../client/okhttp/OkHttpTelegramClient.java | 5 +++ .../TelegramBotsLongPollingApplication.java | 13 +++++-- ...BotsLongPollingApplicationIntegration.java | 28 +++++++++------ .../meta/generics/TelegramClient.java | 1 + .../starter/SpringLongPollingBot.java | 3 +- .../starter/TelegramBotInitializer.java | 3 +- .../TestTelegramBotStarterConfiguration.java | 17 ++++----- ...stTelegramBotStarterRegistrationHooks.java | 36 +++++++++---------- 8 files changed, 61 insertions(+), 45 deletions(-) diff --git a/telegrambots-client/src/main/java/org/telegram/telegrambots/client/okhttp/OkHttpTelegramClient.java b/telegrambots-client/src/main/java/org/telegram/telegrambots/client/okhttp/OkHttpTelegramClient.java index 7c1fafe70..620872b3b 100644 --- a/telegrambots-client/src/main/java/org/telegram/telegrambots/client/okhttp/OkHttpTelegramClient.java +++ b/telegrambots-client/src/main/java/org/telegram/telegrambots/client/okhttp/OkHttpTelegramClient.java @@ -82,6 +82,11 @@ public OkHttpTelegramClient(String botToken) { this(new OkHttpClient.Builder().build(), botToken); } + @Override + public String getBotToken() { + return botToken; + } + @Override public > CompletableFuture executeAsync(Method method) throws TelegramApiException { if (method == null) { diff --git a/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/TelegramBotsLongPollingApplication.java b/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/TelegramBotsLongPollingApplication.java index 9fa3ffc92..2b142fcf4 100644 --- a/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/TelegramBotsLongPollingApplication.java +++ b/telegrambots-longpolling/src/main/java/org/telegram/telegrambots/longpolling/TelegramBotsLongPollingApplication.java @@ -11,6 +11,7 @@ import org.telegram.telegrambots.meta.api.methods.updates.GetUpdates; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.longpolling.interfaces.BackOff; +import org.telegram.telegrambots.meta.generics.TelegramClient; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; @@ -59,14 +60,15 @@ public TelegramBotsLongPollingApplication(Supplier objectMapperSup this.backOffSupplier = backOffSupplier; } - public BotSession registerBot(String botToken, LongPollingUpdateConsumer updatesConsumer) throws TelegramApiException { - return registerBot(botToken, () -> TelegramUrl.DEFAULT_URL, new DefaultGetUpdatesGenerator(), updatesConsumer); + public BotSession registerBot(TelegramClient telegramClient, LongPollingUpdateConsumer updatesConsumer) throws TelegramApiException { + return registerBot(telegramClient, () -> TelegramUrl.DEFAULT_URL, new DefaultGetUpdatesGenerator(), updatesConsumer); } - public BotSession registerBot(String botToken, + public BotSession registerBot(TelegramClient telegramClient, Supplier telegramUrlSupplier, Function getUpdatesGenerator, LongPollingUpdateConsumer updatesConsumer) throws TelegramApiException { + final String botToken = telegramClient.getBotToken(); if (botSessions.containsKey(botToken)) { throw new TelegramApiException("Bot is already registered"); } else { @@ -88,6 +90,11 @@ public BotSession registerBot(String botToken, } } + public void unregisterBot(TelegramClient telegramClient) throws TelegramApiException { + final String botToken = telegramClient.getBotToken(); + unregisterBot(botToken); + } + public void unregisterBot(String botToken) throws TelegramApiException { if (botSessions.containsKey(botToken)) { BotSession botSession = botSessions.remove(botToken); diff --git a/telegrambots-longpolling/src/test/java/org/telegram/telegrambots/longpolling/TestTelegramBotsLongPollingApplicationIntegration.java b/telegrambots-longpolling/src/test/java/org/telegram/telegrambots/longpolling/TestTelegramBotsLongPollingApplicationIntegration.java index 4e549e155..80fe243ee 100644 --- a/telegrambots-longpolling/src/test/java/org/telegram/telegrambots/longpolling/TestTelegramBotsLongPollingApplicationIntegration.java +++ b/telegrambots-longpolling/src/test/java/org/telegram/telegrambots/longpolling/TestTelegramBotsLongPollingApplicationIntegration.java @@ -11,6 +11,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.telegram.telegrambots.longpolling.util.DefaultGetUpdatesGenerator; @@ -21,6 +23,7 @@ import org.telegram.telegrambots.meta.api.objects.ApiResponse; import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.generics.TelegramClient; import java.util.ArrayList; import java.util.List; @@ -32,8 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.*; public class TestTelegramBotsLongPollingApplicationIntegration { private MockWebServer webServer; @@ -44,11 +46,17 @@ public class TestTelegramBotsLongPollingApplicationIntegration { @Spy private ExponentialBackOff exponentialBackOff = new ExponentialBackOff(); + @Mock + private TelegramClient mockTelegramClient = Mockito.mock(TelegramClient.class); + private AutoCloseable mockitoCloseable; @BeforeEach public void setUp() { mockitoCloseable = MockitoAnnotations.openMocks(this); + + when(mockTelegramClient.getBotToken()).then(invocation -> "TOKEN"); + webServer = new MockWebServer(); HttpUrl mockUrl = webServer.url(""); telegramUrl = TelegramUrl.builder().schema(mockUrl.scheme()).host(mockUrl.host()).port(mockUrl.port()).build(); @@ -76,7 +84,7 @@ public void testIsRunningCheck() { assertTrue(application.isRunning()); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); @@ -134,7 +142,7 @@ public void testStartStop() { assertFalse(application.isRunning()); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); @@ -169,7 +177,7 @@ public void testUnregisterBot() { application.stop(); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); @@ -195,14 +203,14 @@ public void testRegisterSameBotTwiceRaisesException() { assertTrue(application.isRunning()); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> { }); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> { @@ -239,7 +247,7 @@ public void testUpdatesAreReceived() { Dispatcher dispatcher = getDispatcher(List.of(getFakeUpdates1())); webServer.setDispatcher(dispatcher); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); @@ -258,7 +266,7 @@ public void testOutOfOrderUpdatesAreIgnored() { Dispatcher dispatcher = getDispatcher(List.of(getFakeUpdates1(), getFakeUpdates1(), getFakeUpdates2())); webServer.setDispatcher(dispatcher); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); @@ -279,7 +287,7 @@ public void testWhenErrorResponseBackOffIsExecuted() { Dispatcher dispatcher = getDispatcher(List.of("WRONGRESPONSE", getFakeUpdates1())); webServer.setDispatcher(dispatcher); - application.registerBot("TOKEN", + application.registerBot(mockTelegramClient, () -> telegramUrl, new DefaultGetUpdatesGenerator(), (LongPollingSingleThreadUpdateConsumer) update -> updateReceived.add(update)); diff --git a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/TelegramClient.java b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/TelegramClient.java index 74495b8e7..2c82a3d55 100644 --- a/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/TelegramClient.java +++ b/telegrambots-meta/src/main/java/org/telegram/telegrambots/meta/generics/TelegramClient.java @@ -29,6 +29,7 @@ import java.util.concurrent.CompletableFuture; public interface TelegramClient { + String getBotToken(); > CompletableFuture executeAsync(Method method) throws TelegramApiException; diff --git a/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/SpringLongPollingBot.java b/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/SpringLongPollingBot.java index 12977ff73..e9731c207 100644 --- a/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/SpringLongPollingBot.java +++ b/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/SpringLongPollingBot.java @@ -1,8 +1,9 @@ package org.telegram.telegrambots.longpolling.starter; import org.telegram.telegrambots.longpolling.interfaces.LongPollingUpdateConsumer; +import org.telegram.telegrambots.meta.generics.TelegramClient; public interface SpringLongPollingBot { - String getBotToken(); + TelegramClient getTelegramClient(); LongPollingUpdateConsumer getUpdatesConsumer(); } diff --git a/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/TelegramBotInitializer.java b/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/TelegramBotInitializer.java index 103cf860f..ef0b0f1fe 100644 --- a/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/TelegramBotInitializer.java +++ b/telegrambots-springboot-longpolling-starter/src/main/java/org/telegram/telegrambots/longpolling/starter/TelegramBotInitializer.java @@ -30,7 +30,7 @@ public TelegramBotInitializer(TelegramBotsLongPollingApplication telegramBotsApp public void afterPropertiesSet() { try { for (SpringLongPollingBot longPollingBot : longPollingBots) { - BotSession session = telegramBotsApplication.registerBot(longPollingBot.getBotToken(), longPollingBot.getUpdatesConsumer()); + BotSession session = telegramBotsApplication.registerBot(longPollingBot.getTelegramClient(), longPollingBot.getUpdatesConsumer()); handleAfterRegistrationHook(longPollingBot, session); } } catch (TelegramApiException e) { @@ -38,7 +38,6 @@ public void afterPropertiesSet() { } } - private void handleAfterRegistrationHook(Object bot, BotSession botSession) { Stream.of(bot.getClass().getMethods()) .filter(method -> method.getAnnotation(AfterBotRegistration.class) != null) diff --git a/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterConfiguration.java b/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterConfiguration.java index 6aef5d0c0..88a2f1e87 100644 --- a/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterConfiguration.java +++ b/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterConfiguration.java @@ -8,22 +8,18 @@ import org.telegram.telegrambots.longpolling.TelegramBotsLongPollingApplication; import org.telegram.telegrambots.longpolling.interfaces.LongPollingUpdateConsumer; import org.telegram.telegrambots.longpolling.util.LongPollingSingleThreadUpdateConsumer; +import org.telegram.telegrambots.meta.generics.TelegramClient; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.*; class TestTelegramBotStarterConfiguration { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withAllowBeanDefinitionOverriding(true) .withConfiguration(AutoConfigurations.of(MockTelegramBotsLongPollingApplication.class, - TelegramBotStarterConfiguration.class)); + TelegramBotStarterConfiguration.class)); @Test void createMockTelegramApplicationWithDefaultSettings() { @@ -43,7 +39,7 @@ void createOnlyLongPollingBot() { TelegramBotsLongPollingApplication telegramApplication = context.getBean(TelegramBotsLongPollingApplication.class); - verify(telegramApplication, times(1)).registerBot(anyString(), any(LongPollingUpdateConsumer.class)); + verify(telegramApplication, times(1)).registerBot(any(TelegramClient.class), any(LongPollingUpdateConsumer.class)); verifyNoMoreInteractions(telegramApplication); }); } @@ -62,8 +58,9 @@ static class LongPollingBotConfig { @Bean public SpringLongPollingBot longPollingBot() { SpringLongPollingBot springLongPollingBotMock = mock(SpringLongPollingBot.class); - doReturn("").when(springLongPollingBotMock).getBotToken(); - doReturn((LongPollingSingleThreadUpdateConsumer) update -> {}).when(springLongPollingBotMock).getUpdatesConsumer(); + doReturn(mock(TelegramClient.class)).when(springLongPollingBotMock).getTelegramClient(); + doReturn((LongPollingSingleThreadUpdateConsumer) update -> { + }).when(springLongPollingBotMock).getUpdatesConsumer(); return springLongPollingBotMock; } } diff --git a/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterRegistrationHooks.java b/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterRegistrationHooks.java index ef86ad824..2dc029431 100644 --- a/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterRegistrationHooks.java +++ b/telegrambots-springboot-longpolling-starter/src/test/java/org/telegram/telegrambots/longpolling/starter/TestTelegramBotStarterRegistrationHooks.java @@ -10,19 +10,11 @@ import org.telegram.telegrambots.longpolling.TelegramBotsLongPollingApplication; import org.telegram.telegrambots.longpolling.interfaces.LongPollingUpdateConsumer; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.meta.generics.TelegramClient; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; class TestTelegramBotStarterRegistrationHooks { @@ -30,14 +22,14 @@ class TestTelegramBotStarterRegistrationHooks { private static final TelegramBotsLongPollingApplication mockApplication = mock(TelegramBotsLongPollingApplication.class); private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() - .withAllowBeanDefinitionOverriding(true) + .withAllowBeanDefinitionOverriding(true) .withConfiguration(AutoConfigurations.of(MockTelegramBotsApi.class, - TelegramBotStarterConfiguration.class)); + TelegramBotStarterConfiguration.class)); @Test - void longPollingBotWithAnnotatedMethodshouldBeCalled() throws TelegramApiException { + void longPollingBotWithAnnotatedMethodShouldBeCalled() throws TelegramApiException { - when(mockApplication.registerBot(anyString(), any(LongPollingUpdateConsumer.class))).thenReturn(someBotSession); + when(mockApplication.registerBot(any(TelegramClient.class), any(LongPollingUpdateConsumer.class))).thenReturn(someBotSession); this.contextRunner.withUserConfiguration(LongPollingBotConfig.class) .run((context) -> { @@ -49,7 +41,8 @@ void longPollingBotWithAnnotatedMethodshouldBeCalled() throws TelegramApiExcepti assertInstanceOf(AnnotatedLongPollingBot.class, bot); assertTrue(((AnnotatedLongPollingBot) bot).isHookCalled()); assertEquals(someBotSession, ((AnnotatedLongPollingBot) bot).getHookCalledWithSession()); - verify(telegramBotsApi, times(1)).registerBot(eq(bot.getBotToken()), any(LongPollingUpdateConsumer.class)); + verify(telegramBotsApi, times(1)) + .registerBot(eq(bot.getTelegramClient()), any(LongPollingUpdateConsumer.class)); verifyNoMoreInteractions(telegramBotsApi); }); } @@ -75,8 +68,12 @@ public SpringLongPollingBot longPollingBot() { public static class AnnotatedLongPollingBot implements SpringLongPollingBot { private boolean hookCalled = false; private BotSession hookCalledWithSession = null; + private final TelegramClient telegramClient; public AnnotatedLongPollingBot() { + TelegramClient telegramClient = mock(TelegramClient.class); + when(telegramClient.getBotToken()).then(invocationOnMock -> ""); + this.telegramClient = telegramClient; } @AfterBotRegistration @@ -90,13 +87,14 @@ public void afterBotHookWithSession(BotSession session) { } @Override - public String getBotToken() { - return ""; + public TelegramClient getTelegramClient() { + return telegramClient; } @Override public LongPollingUpdateConsumer getUpdatesConsumer() { - return update -> { }; + return update -> { + }; } } } From 000c147d91ccf19142d2af13ac7234e0b3af0ae8 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sun, 17 Nov 2024 14:58:09 +0300 Subject: [PATCH 2/3] - bumped version to fix test issues related to TelegramBots dependencies --- pom.xml | 28 +++++++++---------- telegrambots-abilities/pom.xml | 6 ++-- telegrambots-client/pom.xml | 2 +- telegrambots-extensions/pom.xml | 6 ++-- telegrambots-longpolling/pom.xml | 2 +- telegrambots-meta/pom.xml | 2 +- .../pom.xml | 4 +-- .../pom.xml | 4 +-- telegrambots-test-reports/pom.xml | 2 +- telegrambots-webhook/pom.xml | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 1a4d59c6d..0623ea77c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 7.10.0 + 7.10.1 telegrambots-meta @@ -327,19 +327,19 @@ org.apache.maven.plugins maven-site-plugin - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - + + + + + + + + + + + + + org.jacoco jacoco-maven-plugin diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index 7b5f1b516..9b3d06e06 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-abilities @@ -104,12 +104,12 @@ org.telegram telegrambots-webhook - 7.10.0 + 7.10.1 org.telegram telegrambots-longpolling - 7.10.0 + 7.10.1 diff --git a/telegrambots-client/pom.xml b/telegrambots-client/pom.xml index 222c7aaaf..2490e50dd 100644 --- a/telegrambots-client/pom.xml +++ b/telegrambots-client/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 Telegram Bots Client diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index 10f8ccb66..00f602326 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-extensions @@ -89,12 +89,12 @@ org.telegram telegrambots-webhook - 7.10.0 + 7.10.1 org.telegram telegrambots-longpolling - 7.10.0 + 7.10.1 diff --git a/telegrambots-longpolling/pom.xml b/telegrambots-longpolling/pom.xml index 45139c17a..d7f6edac6 100644 --- a/telegrambots-longpolling/pom.xml +++ b/telegrambots-longpolling/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-longpolling diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index f317c1c90..7dcce6331 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-meta diff --git a/telegrambots-springboot-longpolling-starter/pom.xml b/telegrambots-springboot-longpolling-starter/pom.xml index 507a1ad80..2b5b2cd47 100644 --- a/telegrambots-springboot-longpolling-starter/pom.xml +++ b/telegrambots-springboot-longpolling-starter/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-springboot-longpolling-starter @@ -71,7 +71,7 @@ UTF-8 UTF-8 - 7.10.0 + 7.10.1 3.2.3 diff --git a/telegrambots-springboot-webhook-starter/pom.xml b/telegrambots-springboot-webhook-starter/pom.xml index 172df7297..cac2c0f0c 100644 --- a/telegrambots-springboot-webhook-starter/pom.xml +++ b/telegrambots-springboot-webhook-starter/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-springboot-webhook-starter @@ -71,7 +71,7 @@ UTF-8 UTF-8 - 7.10.0 + 7.10.1 3.2.3 2.17.2 diff --git a/telegrambots-test-reports/pom.xml b/telegrambots-test-reports/pom.xml index f8c38024a..37b554dbd 100644 --- a/telegrambots-test-reports/pom.xml +++ b/telegrambots-test-reports/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-test-reports diff --git a/telegrambots-webhook/pom.xml b/telegrambots-webhook/pom.xml index 1e9fa5d2e..c4524bb59 100644 --- a/telegrambots-webhook/pom.xml +++ b/telegrambots-webhook/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.10.0 + 7.10.1 telegrambots-webhook From 2df358dce80347b2ce62ff43e11e5081cde11156 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Tue, 26 Nov 2024 12:35:06 +0300 Subject: [PATCH 3/3] resolved version conflict --- pom.xml | 28 +++++++++---------- telegrambots-abilities/pom.xml | 6 ++-- telegrambots-client/pom.xml | 2 +- telegrambots-extensions/pom.xml | 6 ++-- telegrambots-longpolling/pom.xml | 2 +- telegrambots-meta/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- telegrambots-test-reports/pom.xml | 2 +- telegrambots-webhook/pom.xml | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 53d8bc069..d3f99152f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots pom - 7.11.0 + 7.11.1 telegrambots-meta @@ -327,19 +327,19 @@ org.apache.maven.plugins maven-site-plugin - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + org.jacoco jacoco-maven-plugin diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml index fda96b0e6..7487d3724 100644 --- a/telegrambots-abilities/pom.xml +++ b/telegrambots-abilities/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-abilities @@ -104,12 +104,12 @@ org.telegram telegrambots-webhook - 7.11.0 + 7.11.1 org.telegram telegrambots-longpolling - 7.11.0 + 7.11.1 diff --git a/telegrambots-client/pom.xml b/telegrambots-client/pom.xml index 6c4597b8c..5980c04b0 100644 --- a/telegrambots-client/pom.xml +++ b/telegrambots-client/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 Telegram Bots Client diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml index 99ec30c57..c3a7b13b2 100644 --- a/telegrambots-extensions/pom.xml +++ b/telegrambots-extensions/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-extensions @@ -89,12 +89,12 @@ org.telegram telegrambots-webhook - 7.11.0 + 7.11.1 org.telegram telegrambots-longpolling - 7.11.0 + 7.11.1 diff --git a/telegrambots-longpolling/pom.xml b/telegrambots-longpolling/pom.xml index d7628139c..dcbc5da63 100644 --- a/telegrambots-longpolling/pom.xml +++ b/telegrambots-longpolling/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-longpolling diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml index 3068b67d2..3e1103800 100644 --- a/telegrambots-meta/pom.xml +++ b/telegrambots-meta/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-meta diff --git a/telegrambots-springboot-longpolling-starter/pom.xml b/telegrambots-springboot-longpolling-starter/pom.xml index 2641fa7ee..6f908475a 100644 --- a/telegrambots-springboot-longpolling-starter/pom.xml +++ b/telegrambots-springboot-longpolling-starter/pom.xml @@ -7,7 +7,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-springboot-longpolling-starter diff --git a/telegrambots-springboot-webhook-starter/pom.xml b/telegrambots-springboot-webhook-starter/pom.xml index 6b98a12b5..bb0cc54ae 100644 --- a/telegrambots-springboot-webhook-starter/pom.xml +++ b/telegrambots-springboot-webhook-starter/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-springboot-webhook-starter diff --git a/telegrambots-test-reports/pom.xml b/telegrambots-test-reports/pom.xml index e59d65499..bdcb984c9 100644 --- a/telegrambots-test-reports/pom.xml +++ b/telegrambots-test-reports/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-test-reports diff --git a/telegrambots-webhook/pom.xml b/telegrambots-webhook/pom.xml index 1d386871f..781f2022c 100644 --- a/telegrambots-webhook/pom.xml +++ b/telegrambots-webhook/pom.xml @@ -6,7 +6,7 @@ org.telegram Bots - 7.11.0 + 7.11.1 telegrambots-webhook