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 diff --git a/.github/workflows/build_java_docker.yml b/.github/workflows/build_java_docker.yml index 8d3d787..cc47cb4 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 @@ -26,15 +27,15 @@ 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 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: java.telegrambots.jar path: target/ @@ -54,7 +55,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/ @@ -105,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 }}' diff --git a/pom.xml b/pom.xml index 46c7abb..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 @@ -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 + 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);