[maven-release-plugin] prepare release oneplusbot-1.6.0

Merge branch 'master' into feature/JDA-5
# Conflicts: # pom.xml
2026-01-07 18:03:46 +00:00 · 2022-08-01 23:32:34 +02:00 · 2022-08-01 23:27:48 +02:00 · 2022-08-01 23:26:50 +02:00 · 2022-08-01 21:41:37 +02:00 · 2022-08-01 21:39:25 +02:00
61 changed files with 224 additions and 94 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,42 @@
+name: Bug Report
+description: Found a bug that needs fixing?
+body:
+  - type: checkboxes
+    attributes:
+      label: General Troubleshooting
+      description: You confirm to have made the following checks first.
+      options:
+        - label: I have checked for similar issues on the Issue-tracker.
+          required: true
+        - label: I have updated to the latest version
+          required: true
+        - label: I have checked the branches or the maintainers' PRs for upcoming bug fixes.
+          required: true
+  - type: textarea
+    attributes:
+      label: "Description"
+      description: "General information about the bug"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Steps to reproduce"
+      description: "What happened when the bug occurred?"
+      placeholder: "1. ..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Expected behaviour"
+      description: "What should happen?"
+      placeholder: "It should..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Actual behaviour"
+      description: "What did happen instead?"
+      placeholder: "It actually ..."
+    validations:
+      required: true
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,36 @@
+name: Feature request
+description: Want some functionality added?
+body:
+  - type: checkboxes
+    attributes:
+      label: General Information
+      description: You confirm to have made the following checks first.
+      options:
+        - label: I have checked for similar issues on the Issue-tracker.
+          required: true
+        - label: I have updated to the latest version
+          required: true
+        - label: I have checked the branches or the maintainers' PRs for upcoming features fixes.
+          required: true
+  - type: textarea
+    attributes:
+      label: "Description"
+      description: "General description of the feature"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Feature worth and general use"
+      description: "Why should this exist?"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Suggestions for implementation"
+      description: "Any ideas about what the feature should behave/look like? Commands?"
+      placeholder: "It should..."
+    validations:
+      required: false
+
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,5 +34,5 @@ jobs:
        env:
          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.3.12
+          ABSTRACTO_VERSION: 1.4.1
          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2021 Sheldan
+Copyright (c) 2022 Sheldan

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/application/database/pom.xml
+++ b/application/database/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
--- a/application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml
+++ b/application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
        <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-customizations/moderation-custom/pom.xml
+++ b/application/oneplus-bot-customizations/moderation-custom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>oneplus-bot-customizations</artifactId>
        <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java
+++ b/application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java
@@ -19,7 +19,7 @@ import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeatureD
 import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomPostTarget;
 import dev.sheldan.oneplus.bot.custom.moderation.model.template.WarningThresholdNotificationModel;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

@@ -71,7 +71,7 @@ public class WarningAddedListener implements WarningCreatedListener {

            Long channelId = model.getWarningChannelId();
            Long warnedUserId = model.getWarnedUserId();
-            TextChannel channel = channelService.getTextChannelFromServer(serverId, channelId);
+            GuildMessageChannel channel = channelService.getMessageChannelFromServer(serverId, channelId);
            WarningThresholdNotificationModel notificationModel = WarningThresholdNotificationModel
                    .builder()
                    .channelDisplay(ChannelDisplay.fromChannel(channel))
--- a/application/oneplus-bot-customizations/pom.xml
+++ b/application/oneplus-bot-customizations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-customizations/starboard-custom/pom.xml
+++ b/application/oneplus-bot-customizations/starboard-custom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
        <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-modules/faq/pom.xml
+++ b/application/oneplus-bot-modules/faq/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>oneplus-bot-modules</artifactId>
        <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java
+++ b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java
@@ -17,6 +17,7 @@ import dev.sheldan.oneplus.bot.modules.faq.config.FAQFeatureDefinition;
 import dev.sheldan.oneplus.bot.modules.faq.config.FAQModuleDefinition;
 import dev.sheldan.oneplus.bot.modules.faq.models.command.faq.FAQResponseModel;
 import dev.sheldan.oneplus.bot.modules.faq.service.FAQResponseServiceBean;
+import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -50,7 +51,7 @@ public class FAQ extends AbstractConditionableCommand {
        String commandName;
        if(!parameters.isEmpty()) {
            commandName = (String) parameters.get(0);
-            TextChannel channel;
+            GuildMessageChannel channel;
            if (parameters.size() == 2) {
                channel = (TextChannel) parameters.get(1);
            } else {
--- a/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/service/FAQResponseServiceBean.java
+++ b/application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/service/FAQResponseServiceBean.java
@@ -22,10 +22,7 @@ import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQChannelGroupCom
 import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQCommandAliasManagementService;
 import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQCommandManagementServiceBean;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.ISnowflake;
-import net.dv8tion.jda.api.entities.SelfUser;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,7 +64,7 @@ public class FAQResponseServiceBean {
    @Autowired
    private FAQResponseServiceBean self;

-    public CompletableFuture<FAQResponseModel> loadFAQResponse(String commandName, TextChannel textChannel) {
+    public CompletableFuture<FAQResponseModel> loadFAQResponse(String commandName, GuildMessageChannel textChannel) {
        AServer server = serverManagementService.loadServer(textChannel.getGuild().getIdLong());
        Optional<FAQCommand> faqCommandOptional = faqCommandManagementServiceBean.findByNameAndServer(commandName, server);
        if(!faqCommandOptional.isPresent()) {
--- a/application/oneplus-bot-modules/news/pom.xml
+++ b/application/oneplus-bot-modules/news/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
        <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -14,6 +14,13 @@
        <maven.compiler.target>8</maven.compiler.target>
    </properties>

+    <dependencies>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.scheduling</groupId>
+            <artifactId>scheduling-int</artifactId>
+        </dependency>
+    </dependencies>
+
    <build>
        <plugins>
            <plugin>
--- a/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/NewsServiceBean.java
+++ b/application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/NewsServiceBean.java
@@ -11,8 +11,8 @@ import dev.sheldan.oneplus.bot.modules.news.model.NewsMessageModel;
 import dev.sheldan.oneplus.bot.modules.news.model.database.NewsPost;
 import dev.sheldan.oneplus.bot.modules.news.service.management.NewsPostManagementServiceBean;
 import lombok.extern.slf4j.Slf4j;
+import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.TextChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -113,7 +113,7 @@ public class NewsServiceBean {
        log.info("Updating news post {} with new content based on message from user {} in server {}.",
                newsPost.getSourceMessageId(), updatedMessage.getIdLong(), updatedMessage.getGuild().getId());
        MessageToSend messageToSend = templateService.renderEmbedTemplate(MESSAGE_TEMPLATE_KEY, model, serverId);
-        TextChannel newsChannel = channelService.getTextChannelFromServer(serverId, newsPost.getNewsChannel().getId());
+        GuildMessageChannel newsChannel = channelService.getMessageChannelFromServer(serverId, newsPost.getNewsChannel().getId());
        return channelService.editMessageInAChannelFuture(messageToSend, newsChannel, newsPost.getNewsMessageId())
                .thenApply(message -> null);
    }
--- a/application/oneplus-bot-modules/pom.xml
+++ b/application/oneplus-bot-modules/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-modules/referral/pom.xml
+++ b/application/oneplus-bot-modules/referral/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
        <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-modules/seasonal/pom.xml
+++ b/application/oneplus-bot-modules/seasonal/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
        <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/oneplus-bot-modules/setup/pom.xml
+++ b/application/oneplus-bot-modules/setup/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>oneplus-bot-modules</artifactId>
        <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/pom.xml
+++ b/application/pom.xml
@@ -5,13 +5,13 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot</groupId>
        <artifactId>oneplusbot</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>

    <groupId>dev.sheldan.oneplus.bot.application</groupId>
    <artifactId>application</artifactId>
    <packaging>pom</packaging>
-    <version>1.5.10</version>
+    <version>1.6.0</version>
    <modules>
        <module>executable</module>
        <module>oneplus-bot-customizations</module>
@@ -38,15 +38,7 @@
            <artifactId>core-int</artifactId>
        </dependency>

-        <dependency>
-            <groupId>dev.sheldan.abstracto.modules</groupId>
-            <artifactId>utility-int</artifactId>
-        </dependency>

-        <dependency>
-            <groupId>dev.sheldan.abstracto.scheduling</groupId>
-            <artifactId>scheduling-int</artifactId>
-        </dependency>
    </dependencies>

 </project>
--- a/deployment/docker-compose/pom.xml
+++ b/deployment/docker-compose/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/docker-compose/src/main/resources/.env
+++ b/deployment/docker-compose/src/main/resources/.env
@@ -29,4 +29,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
 PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT TOKEN>
 YOUTUBE_API_KEY=<INSERT KEY>
-ONEPLUS_BOT_VERSION=1.5.10
+ONEPLUS_BOT_VERSION=1.6.0
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -372,16 +372,6 @@
                            <destFileName>starboard.zip</destFileName>
                        </artifactItem>

-                        <artifactItem>
-                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-                            <artifactId>utility</artifactId>
-                            <version>${abstracto.templates.version}</version>
-                            <type>zip</type>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
-                            <destFileName>utility.zip</destFileName>
-                        </artifactItem>
-
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                            <artifactId>webservices</artifactId>
@@ -600,17 +590,6 @@
                            <destFileName>dynamic-activity.zip</destFileName>
                        </artifactItem>

-                        <artifactItem>
-                            <groupId>dev.sheldan.abstracto.modules</groupId>
-                            <artifactId>utility-impl</artifactId>
-                            <version>${abstracto.version}</version>
-                            <classifier>liquibase</classifier>
-                            <type>zip</type>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
-                            <destFileName>utility.zip</destFileName>
-                        </artifactItem>
-
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto.modules</groupId>
                            <artifactId>modmail-impl</artifactId>
--- a/deployment/infrastructure/terraform/.gitignore
+++ b/deployment/infrastructure/terraform/.gitignore
@@ -0,0 +1,29 @@
+# Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+#
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
--- a/deployment/infrastructure/terraform/.terraform.lock.hcl
+++ b/deployment/infrastructure/terraform/.terraform.lock.hcl
@@ -0,0 +1,23 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hetznercloud/hcloud" {
+  version = "1.34.3"
+  hashes = [
+    "h1:ZAFEiotL15xHI957CrTJEm3z83/lFMQdNWiMqN7Dyu4=",
+    "zh:08e4aea3c4e895d941c24d76f373977e5fae112c531b56cb2fcdaa8b5086ebec",
+    "zh:09f1255aad8f790c86a14522c7fff2fcb6529bb18f1e49a7423ca79db07f5a47",
+    "zh:0b2bcab12aa913adaf89228a250eb41e827c64723a741f2b74b318833f77c9df",
+    "zh:0c6947f73dc5779b2425e231b22643741b1877705fb4135df06f7a201f10d094",
+    "zh:26513bdefecae83411997a5c4e11dffd886b4594cb8663f4b0c36a064b1a650e",
+    "zh:42790576142fb7d0ce851923f58a642e7e4c9e6df9a02b531703131d836daade",
+    "zh:5095ea6c8b31dfebd52a03f9ba4e2a8a7ecb0c0442f68c98cab76b677c343e81",
+    "zh:6b80223b2831f9f2adf72c7ed37692cef67c8f43de62c405c7162bf524896bc3",
+    "zh:6b90164e839ad0977b3feb4dbec153ab76a4f7ee8451ee2d202992ff5a4157b1",
+    "zh:72d88705afb9d0a9d90a5ad342c605cb119b678e76f45c5e4c516da5d591f907",
+    "zh:881889a9e974a15c616cd7648f1c415a4fb3e9a08c166bcb17e488bfcbb67985",
+    "zh:967286f7ef73bb15c2412b9ae8853d1176a039374c5ea39cbfd75e7ebe13bcfd",
+    "zh:967a6cc506a019c1720f0207068097a06eb006e940ecc63060373b4b4b6181cc",
+    "zh:a68e5e2e2f03656e427045e32ca999422e00be299fc6ecedbd41bef48871b7c5",
+  ]
+}
--- a/deployment/infrastructure/terraform/cloud.tf
+++ b/deployment/infrastructure/terraform/cloud.tf
@@ -0,0 +1,10 @@
+terraform {
+  cloud {
+    hostname = "app.terraform.io"
+    organization = "OnePlusBot"
+
+    workspaces {
+      name = "main"
+    }
+  }
+}
--- a/deployment/infrastructure/terraform/main.tf
+++ b/deployment/infrastructure/terraform/main.tf
@@ -0,0 +1,7 @@
+module "hetzner" {
+  source            = "git@github.com:Sheldan/discord-bot-terraform-module.git//hetzner-bot?ref=v1.0.1"
+  ssh_key_key       = "Sheldan"
+  project_name      = "OnePlusBot"
+  user_name         = "sheldan"
+  hcloud_token      = var.hcloud_token
+}
--- a/deployment/infrastructure/terraform/output.tf
+++ b/deployment/infrastructure/terraform/output.tf
@@ -0,0 +1,4 @@
+output "instance_ipv4" {
+  description = "IPv4 address of the instance"
+  value = module.hetzner.instance_ipv4
+}
--- a/deployment/infrastructure/terraform/variables.tf
+++ b/deployment/infrastructure/terraform/variables.tf
@@ -0,0 +1,3 @@
+variable "hcloud_token" {
+  type = string
+}
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>oneplusbot</artifactId>
        <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@@ -12,15 +12,15 @@

    <groupId>dev.sheldan.oneplus.bot</groupId>
    <artifactId>oneplusbot</artifactId>
-    <version>1.5.10</version>
+    <version>1.6.0</version>

    <properties>
        <maven.compiler.target>1.8</maven.compiler.target>
        <maven.compiler.source>1.8</maven.compiler.source>
        <!-- edit in release.yml as well -->
        <!-- when releasing a new opbot version, update the .env as well-->
-        <abstracto.version>1.3.12</abstracto.version>
-        <abstracto.templates.version>1.3.0</abstracto.templates.version>
+        <abstracto.version>1.4.2</abstracto.version>
+        <abstracto.templates.version>1.4.2</abstracto.templates.version>
    </properties>

    <modules>
@@ -56,7 +56,7 @@
    <scm>
        <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
        <developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
-        <tag>oneplusbot-1.5.10</tag>
+        <tag>oneplusbot-1.6.0</tag>
    </scm>

 </project>
--- a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml
+++ b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
        <artifactId>customization-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/customization-templates/pom.xml
+++ b/templates/oneplus-bot-templates/customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
        <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml
+++ b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
        <artifactId>customization-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml
+++ b/templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
        <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/module-templates/news-templates/pom.xml
+++ b/templates/oneplus-bot-templates/module-templates/news-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
        <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/module-templates/pom.xml
+++ b/templates/oneplus-bot-templates/module-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
        <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml
+++ b/templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
        <artifactId>oneplus-bot-module-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/pom.xml
+++ b/templates/oneplus-bot-templates/pom.xml
@@ -3,13 +3,13 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>oneplus-bot-templates</artifactId>
    <packaging>pom</packaging>
-    <version>1.5.10</version>
+    <version>1.6.0</version>
    <modules>
        <module>module-templates</module>
        <module>customization-templates</module>
--- a/templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
        <artifactId>oneplus-bot-templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml
+++ b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot</groupId>
        <artifactId>oneplusbot</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>

    <modules>
@@ -14,7 +14,7 @@

    <groupId>dev.sheldan.oneplus.bot.templates</groupId>
    <artifactId>templates</artifactId>
-    <version>1.5.10</version>
+    <version>1.6.0</version>
    <packaging>pom</packaging>

 </project>
--- a/templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml
+++ b/templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/customization-translations/moderation-customization-translations/pom.xml
+++ b/templates/translations/customization-translations/moderation-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/customization-translations/pom.xml
+++ b/templates/translations/customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/customization-translations/starboard-customization-translations/pom.xml
+++ b/templates/translations/customization-translations/starboard-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/faq-translations/pom.xml
+++ b/templates/translations/module-translations/faq-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/news-translations/pom.xml
+++ b/templates/translations/module-translations/news-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/pom.xml
+++ b/templates/translations/module-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/referral-translations/pom.xml
+++ b/templates/translations/module-translations/referral-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/seasonal-translations/pom.xml
+++ b/templates/translations/module-translations/seasonal-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/module-translations/setup-translations/pom.xml
+++ b/templates/translations/module-translations/setup-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/pom.xml
+++ b/templates/translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/translation-overrides/moderation-translation-overrides/pom.xml
+++ b/templates/translations/translation-overrides/moderation-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/translation-overrides/pom.xml
+++ b/templates/translations/translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
        <artifactId>translations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Sheldan	bcfaf1c928	[maven-release-plugin] prepare release oneplusbot-1.6.0	2022-08-01 23:32:34 +02:00
Sheldan	124d45ba5b	Merge branch 'master' into feature/JDA-5 # Conflicts: # pom.xml	2022-08-01 23:27:48 +02:00
Sheldan	4cdaf87412	[OPB-xxx] updating versions and classes	2022-08-01 23:26:50 +02:00
Sheldan	13cf06e1dc	[OPB-xxx] preparing new release	2022-08-01 21:41:37 +02:00
Sheldan	e8ae0f430d	[OPB-xxx] preparing new release	2022-08-01 21:39:25 +02:00
Sheldan	cda9d1a2b8	[OPB-xxx] updating terraform module version	2022-07-14 20:02:39 +02:00
Sheldan	653246f3ee	[OPB-xxx] adding terraform config	2022-07-14 01:59:45 +02:00
Sheldan	0879c7cc93	[OPB-xxx] creating issue templates	2022-05-31 00:22:13 +02:00
Sheldan	4ea878dd42	[maven-release-plugin] prepare for next development iteration	2022-04-07 23:25:07 +02:00