From f304b20fe76714be92061d687e747d5b3780a398 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Tue, 1 Jun 2021 21:49:03 +0200
Subject: [PATCH] [OPB-26] enabling moderation module updating versions
---
.github/workflows/release.yml | 2 +-
application/executable/pom.xml | 5 ++
.../docker-compose/src/main/resources/.env | 2 +-
deployment/image-packaging/pom.xml | 50 +++++++++++++++----
.../deployment/config/artifact_versions.json | 7 +--
pom.xml | 4 +-
6 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a9f9e5..8b9f10e 100644
--- 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.2.14
+ ABSTRACTO_VERSION: 1.2.15
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
\ No newline at end of file
diff --git a/application/executable/pom.xml b/application/executable/pom.xml
index 10c48c2..5816155 100644
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -125,6 +125,11 @@
experience-tracking-impl
+
+ dev.sheldan.abstracto.modules
+ moderation-impl
+
+
dev.sheldan.oneplus.bot.application.custom
starboard-custom
diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env
index f7535f6..52e26e2 100644
--- a/deployment/docker-compose/src/main/resources/.env
+++ b/deployment/docker-compose/src/main/resources/.env
@@ -26,4 +26,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
PGADMIN_DEFAULT_PASSWORD=admin
TOKEN=
YOUTUBE_API_KEY=
-ONEPLUS_BOT_VERSION=1.4.1
\ No newline at end of file
+ONEPLUS_BOT_VERSION=1.4.2
\ No newline at end of file
diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml
index 4fc1750..21a9f53 100644
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -63,6 +63,16 @@
experience-tracking.zip
+
+ dev.sheldan.abstracto-templates.templates
+ moderation
+ ${abstracto.templates.version}
+ zip
+ true
+ ${file.basedir}/deployment/template-artifacts/
+ moderation.zip
+
+
dev.sheldan.abstracto-templates.templates
entertainment
@@ -201,6 +211,17 @@
+
+
+ dev.sheldan.abstracto-templates.translations
+ core
+ ${abstracto.templates.version}
+ zip
+ true
+ ${file.basedir}/deployment/translation-artifacts/
+ core.zip
+
+
dev.sheldan.abstracto-templates.translations
utility
@@ -219,15 +240,6 @@
${file.basedir}/deployment/translation-artifacts/
experience-tracking.zip
-
- dev.sheldan.abstracto-templates.translations
- core
- ${abstracto.templates.version}
- zip
- true
- ${file.basedir}/deployment/translation-artifacts/
- core.zip
-
dev.sheldan.abstracto-templates.translations
entertainment
@@ -237,6 +249,15 @@
${file.basedir}/deployment/translation-artifacts/
entertainment.zip
+
+ dev.sheldan.abstracto-templates.translations
+ moderation
+ ${abstracto.templates.version}
+ zip
+ true
+ ${file.basedir}/deployment/translation-artifacts/
+ moderation.zip
+
dev.sheldan.abstracto-templates.translations
link-embed
@@ -411,6 +432,17 @@
utility.zip
+
+ dev.sheldan.abstracto.modules
+ moderation-impl
+ ${abstracto.version}
+ liquibase
+ zip
+ true
+ ${file.basedir}/deployment/liquibase-artifacts/
+ moderation.zip
+
+
dev.sheldan.abstracto.modules
experience-tracking-impl
diff --git a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json
index 3cc998c..f673d2f 100644
--- a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json
+++ b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json
@@ -1,11 +1,11 @@
{
"template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
- "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking",
+ "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation",
"starboard-custom",
"overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
"news", "referral"],
"translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
- "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking",
+ "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation",
"starboard-custom",
"news", "setup", "referral"],
"liquibase_artifacts": [
@@ -22,9 +22,10 @@
{ "zip": "invite-filter", "file": "inviteFilter-changeLog.xml"},
{ "zip": "profanity-filter", "file": "profanityFilter-changeLog.xml"},
{ "zip": "statistic", "file": "statistic-changeLog.xml"},
+ { "zip": "experience-tracking", "file": "experience-changeLog.xml"},
+ { "zip": "moderation", "file": "moderation-changeLog.xml"},
{ "zip": "setup", "file": "setup-changeLog.xml"},
{ "zip": "referral", "file": "referral-changeLog.xml"},
- { "zip": "experience-tracking", "file": "experience-changeLog.xml"},
{ "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"},
{ "zip": "news", "file": "news-changeLog.xml"}
]
diff --git a/pom.xml b/pom.xml
index 3951acd..46691e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
1.8
- 1.2.14
- 1.2.10
+ 1.2.15
+ 1.2.11