From 50f10cb6dd5c1e768b6dcb860fa045f5511d3002 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:46:59 +0000 Subject: [PATCH 1/8] Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/build_java_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 8d3d787..2212574 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4.1.7 with: name: java.telegrambots.jar path: target/ From 1da55c46a9e06ffdbd892a62eac2e57202b61def Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Mon, 18 Aug 2025 13:15:44 +0200 Subject: [PATCH 2/8] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 46c7abb..047e08a 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.18.0 org.mockito @@ -119,4 +119,4 @@ - \ No newline at end of file + From a5290ae9d6adf0732f875eba3a6ec76597667ee2 Mon Sep 17 00:00:00 2001 From: AMeierDev <79163657+AMeierDev@users.noreply.github.com> Date: Mon, 18 Aug 2025 13:21:13 +0200 Subject: [PATCH 3/8] Update build_java_docker.yml --- .github/workflows/build_java_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 2212574..81d3f6b 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -34,7 +34,7 @@ jobs: - name: Build with Maven run: mvn clean package - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: java.telegrambots.jar path: target/ From ac3918cc44e890b03768c035b8a1dee91fb8fc1a Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 20 Aug 2025 11:13:10 +0200 Subject: [PATCH 4/8] version + main robuster --- pom.xml | 6 +++--- .../java/telegrambots/hertlhendl/HertlHendlBot.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 047e08a..e540258 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,10 @@ UTF-8 - 17 - 17 + 21 + 21 6.4.0 - 1.3.1 + 2.1.3 08.01.01-MS-GA diff --git a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java index be44bc4..ef71275 100644 --- a/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java +++ b/src/main/java/de/bigamgamen/java/telegrambots/hertlhendl/HertlHendlBot.java @@ -115,15 +115,15 @@ public class HertlHendlBot extends AbilityBot private final PaypalLinkGenerator payPalGenerator = new PaypalLinkGenerator(); - public static void main(final String[] args) + public static void main( String[] args) throws ParserConfigurationException, SAXException, IOException, URISyntaxException, TelegramApiException { LOG.info("HertlHendlBot starting"); - final String token = args[0] != null ? args[0] : BOT_TOKEN; - final String username = args[1] != null ? args[1] : BOT_USERNAME; - final Long creatorId = args[2] != null ? Long.valueOf(args[2]) : CREATOR_ID; - final String creatorPayPalEmail = args[3] != null ? args[3] : ""; + final String token = args.length >= 1 && args[0] != null ? args[0] : BOT_TOKEN; + final String username = args.length >= 2 && args[1] != null ? args[1] : BOT_USERNAME; + final Long creatorId = args.length >= 3 && args[2] != null ? Long.valueOf(args[2]) : CREATOR_ID; + final String creatorPayPalEmail = args.length >= 4 && args[3] != null ? args[3] : ""; final HertlHendlBot bot = new HertlHendlBot(token, username, creatorId, creatorPayPalEmail); final TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class); api.registerBot(bot); From 015f117ff29d983076d23449e06cf8f43b256c60 Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 20 Aug 2025 11:18:32 +0200 Subject: [PATCH 5/8] develop auto build --- .github/workflows/build_java_docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 81d3f6b..2309b75 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -9,6 +9,7 @@ on: branches: - main - staging + - develop # Allows you to run this workflow manually from the Actions tab From a91d4b84bc5a3bb12d396b1050201a35b21359c1 Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 20 Aug 2025 11:22:01 +0200 Subject: [PATCH 6/8] build 21 update --- .github/workflows/build_java_docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 2309b75..e759f0c 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -27,11 +27,11 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' - name: Build with Maven run: mvn clean package From a566d6fb200b05cbe21864c8d8bade81336407fa Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 20 Aug 2025 11:33:58 +0200 Subject: [PATCH 7/8] docker angepasst --- .github/workflows/build_java_docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index e759f0c..cc47cb4 100644 --- a/.github/workflows/build_java_docker.yml +++ b/.github/workflows/build_java_docker.yml @@ -106,4 +106,4 @@ jobs: SSH_PRIVATE_KEY: ${{secrets.SSH_PRIVATE_KEY}} SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}} - name: start docker with ssh - run: ssh -i ~/private.key -p 19999 bigmama@bigamgamen.de 'docker remove -f bot-${{ env.GIT_BRANCH_NAME }} && docker image pull amgamen/chatbot:${{ env.GIT_BRANCH_NAME }} && docker run -d -v chatbotvol-${{ env.GIT_BRANCH_NAME }}:/opt/telegrambot/data --env-file ~/chatbot/env_${{ env.GIT_BRANCH_NAME }} --restart unless-stopped --name bot-${{ env.GIT_BRANCH_NAME }} amgamen/chatbot:${{ env.GIT_BRANCH_NAME }}' + run: ssh -i ~/private.key -p 19999 bigmama@bigamgamen.de 'docker rm -f bot-${{ env.GIT_BRANCH_NAME }} && docker image pull amgamen/chatbot:${{ env.GIT_BRANCH_NAME }} && docker run -d -v chatbotvol-${{ env.GIT_BRANCH_NAME }}:/opt/telegrambot/data --env-file ~/chatbot/env_${{ env.GIT_BRANCH_NAME }} --restart unless-stopped --name bot-${{ env.GIT_BRANCH_NAME }} amgamen/chatbot:${{ env.GIT_BRANCH_NAME }}' From 3ecc03ff0cfc73ac7888a5e881dc99a0953fe9c8 Mon Sep 17 00:00:00 2001 From: AM Date: Wed, 20 Aug 2025 12:28:02 +0200 Subject: [PATCH 8/8] build only gefixt --- .github/workflows/build_java.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_java.yml b/.github/workflows/build_java.yml index ae5aac8..13b8a62 100644 --- a/.github/workflows/build_java.yml +++ b/.github/workflows/build_java.yml @@ -23,10 +23,10 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' - distribution: 'adopt' + java-version: '21' + distribution: 'temurin' - name: Build with Maven run: mvn clean package \ No newline at end of file