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

updating abstracto version

.env

@@ -0,0 +1,4 @@
+REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
+ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
+VERSION=1.6.18
+ABSTRACTO_VERSION=1.5.24

.github/workflows/release.yml

@@ -33,9 +33,8 @@ jobs:
         id: dotenv
         uses: falti/dotenv-action@v1.0.4
         with:
-          path: ./deployment/image-packaging/src/main/docker/.env
+          path: .env
       - name: Push container
-        working-directory: ./deployment/image-packaging/src/main/docker
         run: docker-compose build && docker-compose push
         env:
           REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}

.github/workflows/release_manual.yaml

@@ -0,0 +1,85 @@
+name: Publishes a new version of OnePlusBot
+on: workflow_dispatch
+permissions:
+  packages: write
+  contents: write
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+      - name: Load current version
+        id: version
+        run: echo "version=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec | cut -d- -f1)" >> $GITHUB_ENV
+      - name: Release maven packages
+        uses: qcastel/github-actions-maven-release@v1.12.41
+        env:
+          JAVA_HOME: /usr/lib/jvm/java-17-openjdk/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          abstractoUser: Sheldan
+          abstractoToken: ${{ secrets.ABSTRACTO_PAT }}
+        with:
+          git-release-bot-name: "release-bot"
+          git-release-bot-email: "release-bot@sheldan.dev"
+          release-branch-name: master
+          maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
+          access-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Harbor
+        uses: docker/login-action@v2
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Update Chart version file
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/oneplus-bot/Chart.yaml'
+          propertyPath: 'version'
+          value: ${{ env.version }}
+          commitChange: false
+      - name: Update value files version
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/oneplus-bot/values.yaml'
+          commitChange: false
+          changes: |
+            {
+              "bot.tag": "${{ env.version }}",
+              "templateDeploymentData.tag": "${{ env.version }}",
+              "dbConfigDeploymentData.tag": "${{ env.version }}",
+              "privateRestApi.tag": "${{ env.version }}"
+            }
+      - name: Update .env version
+        run:
+          sed -i '3s/.*/VERSION=${{ env.version }}/' .env
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Build and push Docker containers
+        run: docker-compose build && docker-compose push
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
+          helm package oneplus-bot
+          helm push oneplus-bot*.tgz oci://harbor.sheldan.dev/oneplus-bot
+      - name: Fix file permissions
+        run:
+          sudo chmod -R ugo+rwX . # https://github.com/actions/checkout/issues/164
+      - name: Commit updated versions
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: "release-bot"
+          author_email: "release-bot@sheldan.dev"

.gitignore

@@ -20,6 +20,7 @@ target/
 *.zip
 *.tar.gz
 *.rar
+*.tgz
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

Tiltfile

@@ -2,6 +2,7 @@ allow_k8s_contexts('k8s-cluster')
 
 load('ext://restart_process', 'docker_build_with_restart')
 registry = 'harbor.sheldan.dev/oneplus-bot/'
+abstracto_registry = 'harbor.sheldan.dev/abstracto/'
 
 local_resource(
   'oneplus-bot-java-compile',
@@ -29,6 +30,7 @@ docker_build_with_restart(
 
 docker_build(registry + 'oneplus-bot-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
 docker_build(registry + 'oneplus-bot-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
+docker_build(registry + 'oneplus-bot-private-rest-api', 'deployment/image-packaging/src/main/docker/private-rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
 
 
 k8s_yaml(helm('deployment/helm/oneplus-bot', values=

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
@@ -151,6 +151,16 @@
             <artifactId>experience-tracking-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>giveaway-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>image-generation-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>moderation-impl</artifactId>

application/executable/src/main/resources/application.properties

@@ -1,6 +1,7 @@
 spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
+spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
 spring.jpa.hibernate.default_schema=abstracto
 spring.jpa.properties.hibernate.default_schema=abstracto
 spring.quartz.jdbc.initialize-schema=never

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.12-SNAPSHOT</version>
+    <version>1.6.19</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>

deployment/helm/oneplus-bot/Chart.yaml

@@ -1,24 +1,5 @@
 apiVersion: v2
 name: oneplus-bot
 description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.11
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.6.11"
+version: 1.6.18

deployment/helm/oneplus-bot/templates/deployment.yaml

@@ -71,6 +71,14 @@ spec:
                 secretKeyRef:
                   name: api-keys
                   key: youtubeApiKey
+            - name: PRIVATE_REST_API_HOST
+              value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            - name: PRIVATE_REST_API_PORT
+              value: "{{ .Values.privateRestApi.service.targetPort }}"
+            {{- range $key, $value := .Values.bot.propertyConfig }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote}}
+            {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

deployment/helm/oneplus-bot/templates/private-rest-api-deployment.yaml

@@ -0,0 +1,65 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}-private-rest-api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: private-rest-api
+  template:
+    metadata:
+      {{- with .Values.privateRestApi.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: private-rest-api
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "oneplusBot.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.privateRestApi.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}-private-rest-api
+          securityContext:
+            {{- toYaml .Values.privateRestApi.securityContext | nindent 12 }}
+          image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }}
+          ports:
+            - name: {{ .Values.privateRestApi.service.name }}
+              containerPort: {{ .Values.privateRestApi.service.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.livenessProbe.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.readinessProbe.failureThreshold }}
+          resources:
+            {{- toYaml .Values.privateRestApi.resources | nindent 12 }}
+      {{- with .Values.privateRestApi.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/private-rest-api-service.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.privateRestApi.service.name }}
+spec:
+  selector:
+    app: private-rest-api
+  ports:
+    - port: {{ .Values.privateRestApi.service.targetPort }}
+      targetPort: {{ .Values.privateRestApi.service.port }}
+{{- end }}

deployment/helm/oneplus-bot/values.yaml

@@ -1,14 +1,9 @@
-# Default values for oneplus-bot.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 replicaCount: 1
-
 bot:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: IfNotPresent
   image: oneplus-bot-image
-  tag: 1.6.11
+  tag: 1.6.18
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -18,41 +13,68 @@ bot:
     periodSeconds: 5
     failureThreshold: 3
   config:
-    newsForumPostNotificationServerId:
-
+    newsForumPostNotificationServerId: null
+  propertyConfig:
+    hikariPoolSize: 10
 templateDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.12
-
+  tag: 1.5.24
 templateDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-template-data
-  tag: 1.6.11
-
+  tag: 1.6.18
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.12
-
+  tag: 1.5.24
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-db-data
-  tag: 1.6.11
-
+  tag: 1.6.18
 dbCredentials:
-  host:
-  port:
-  userName:
-  password:
-  name:
-
+  host: null
+  port: null
+  userName: null
+  password: null
+  name: null
+privateRestApi:
+  enabled: true
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-private-rest-api
+  tag: 1.6.18
+  podAnnotations: {}
+  podSecurityContext: {}
+  securityContext: {}
+  livenessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  service:
+    port: 8080
+    targetPort: 80
+    name: private-restapi
+  resources:
+    limits:
+      cpu: null
+      memory: null
+    requests:
+      cpu: null
+      memory: null
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
 grafanaDeployment:
   repository: harbor.sheldan.dev/grafana-tools
   pullPolicy: Always
@@ -60,68 +82,44 @@ grafanaDeployment:
   tag: 0.0.2
   enabled: true
   grafana:
-    host:
+    host: null
     basicAuth:
-      username:
-      password:
-
+      username: null
+      password: null
 apiKeys:
   discord:
-    token:
+    token: null
   youtube:
-    apiKey:
+    apiKey: null
   openWeatherMap:
-    apiKey:
+    apiKey: null
   twitch:
-    secret:
-    clientId:
-
-
-imagePullSecrets:
-nameOverride: ""
-fullnameOverride: ""
-
+    secret: null
+    clientId: null
+imagePullSecrets: null
+nameOverride: ''
+fullnameOverride: ''
 serviceAccount:
-  # Specifies whether a service account should be created
   create: true
-  # Annotations to add to the service account
   annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
+  name: ''
 podAnnotations: {}
-
 podSecurityContext: {}
-  # fsGroup: 2000
-
 securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
 service:
   type: ClusterIP
   port: 8080
   annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/path: "/actuator/prometheus"
-    prometheus.io/port: "8080"
-
+    prometheus.io/scrape: 'true'
+    prometheus.io/path: /actuator/prometheus
+    prometheus.io/port: '8080'
 resources:
   limits:
-    cpu:
-    memory:
+    cpu: null
+    memory: null
   requests:
-    cpu:
-    memory:
-
-
+    cpu: null
+    memory: null
 nodeSelector: {}
-
 tolerations: []
-
 affinity: {}

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -200,6 +200,26 @@
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                             <artifactId>logging</artifactId>
@@ -442,6 +462,26 @@
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
                             <artifactId>starboard-customization-translations</artifactId>
@@ -745,6 +785,28 @@
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>giveaway-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>image-generation-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <!-- customizations -->
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>

deployment/image-packaging/src/main/docker/.env

@@ -1,2 +0,0 @@
-REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
-VERSION=1.6.11

deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json

@@ -9,6 +9,8 @@
     { "zip": "starboard", "file": "starboard-changeLog.xml"},
     { "zip": "remind", "file": "remind-changeLog.xml"},
     { "zip": "logging", "file": "logging-changeLog.xml"},
+    { "zip": "giveaway", "file": "giveaway-changeLog.xml"},
+    { "zip": "image-generation", "file": "imageGeneration-changeLog.xml"},
     { "zip": "suggestion", "file": "suggestion-changeLog.xml"},
     { "zip": "invite-filter", "file": "inviteFilter-changeLog.xml"},
     { "zip": "profanity-filter", "file": "profanityFilter-changeLog.xml"},

deployment/image-packaging/src/main/docker/docker-compose.yml

@@ -1,15 +0,0 @@
-version: "3.7"
-
-services:
-  bot:
-    build:
-      context: oneplusbot
-    image: ${REGISTRY_PREFIX}oneplus-bot-image:${VERSION:-latest}
-  db-data:
-    build:
-      context: db-data
-    image: ${REGISTRY_PREFIX}oneplus-bot-db-data:${VERSION:-latest}
-  template-data:
-    build:
-      context: template-data
-    image: ${REGISTRY_PREFIX}oneplus-bot-template-data:${VERSION:-latest}

deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile

@@ -0,0 +1,6 @@
+ARG REGISTRY_PREFIX
+ARG ABSTRACTO_VERSION
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api
+
+FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
+COPY --from=image-gen-api /python /python

deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json

@@ -1,14 +1,14 @@
 {
   "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
     "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
+    "voice-channel-context", "anti-raid", "giveaway", "image-generation",
     "starboard-custom",
     "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
     "overrides-templates-modmail", "overrides-templates-moderation",
     "news", "referral", "faq"],
   "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
     "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
+    "voice-channel-context", "anti-raid", "giveaway", "image-generation",
     "starboard-custom", "dynamic-activity-custom-translations", "moderation-custom",
     "overrides-translation-moderation",
     "news", "setup", "referral", "faq", "seasonal"]

deployment/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplusbot</artifactId>
         <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

docker-compose.yml

@@ -0,0 +1,22 @@
+version: "3.7"
+
+services:
+  bot:
+    build:
+      context: deployment/image-packaging/src/main/docker/oneplusbot
+    image: ${REGISTRY_PREFIX}oneplus-bot-image:${VERSION:-latest}
+  db-data:
+    build:
+      context: deployment/image-packaging/src/main/docker/db-data
+    image: ${REGISTRY_PREFIX}oneplus-bot-db-data:${VERSION:-latest}
+  private-rest-api-packaging:
+    build:
+      context: deployment/image-packaging/src/main/docker/private-rest-api
+      args:
+        REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
+        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
+    image: ${REGISTRY_PREFIX}oneplus-bot-private-rest-api:${VERSION:-latest}
+  template-data:
+    build:
+      context: deployment/image-packaging/src/main/docker/template-data
+    image: ${REGISTRY_PREFIX}oneplus-bot-template-data:${VERSION:-latest}

pom.xml

@@ -12,15 +12,13 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.6.12-SNAPSHOT</version>
+    <version>1.6.19</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <!-- edit in release.yml as well -->
-        <!-- when releasing a new opbot version, update the .env as well-->
-        <abstracto.version>1.5.12</abstracto.version>
-        <abstracto.templates.version>1.4.23</abstracto.templates.version>
+        <abstracto.version>1.5.24</abstracto.version>
+        <abstracto.templates.version>1.4.32</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -36,8 +34,15 @@
             <url>https://jcenter.bintray.com</url>
         </repository>
         <repository>
-            <id>github</id>
-            <url>https://maven.pkg.github.com/Sheldan/*</url>
+            <id>github-abstracto</id>
+            <url>https://maven.pkg.github.com/Sheldan/abstracto*</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>github-oneplusbot</id>
+            <url>https://maven.pkg.github.com/Sheldan/OnePlusBot*</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -47,16 +52,16 @@
 
     <distributionManagement>
         <repository>
-            <id>github</id>
+            <id>github-oneplusbot</id>
             <name>GitHub Packages</name>
             <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
         </repository>
     </distributionManagement>
 
     <scm>
-        <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
-        <developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
-        <tag>HEAD</tag>
+        <connection>scm:git:${project.scm.url}</connection>
+        <developerConnection>scm:git:${project.scm.url}</developerConnection>
+        <url>https://github.com/Sheldan/OnePlusBot.git</url>
+        <tag>oneplusbot-1.6.19</tag>
     </scm>
-
 </project>

settings.xml

@@ -16,8 +16,15 @@
                     <url>https://repo1.maven.org/maven2</url>
                 </repository>
                 <repository>
-                    <id>github</id>
-                    <url>https://maven.pkg.github.com/Sheldan/*</url>
+                    <id>github-abstracto</id>
+                    <url>https://maven.pkg.github.com/Sheldan/abstracto*</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+                <repository>
+                    <id>github-oneplusbot</id>
+                    <url>https://maven.pkg.github.com/Sheldan/OnePlusBot*</url>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
@@ -28,9 +35,20 @@
 
     <servers>
         <server>
-            <id>github</id>
-            <username>${env.user}</username>
-            <password>${env.token}</password>
+            <id>github-abstracto</id>
+            <username>${env.abstractoUser}</username>
+            <password>${env.abstractoToken}</password>
+        </server>
+        <server>
+            <id>github-oneplusbot</id>
+            <configuration>
+                <httpHeaders>
+                    <property>
+                        <name>Authorization</name>
+                        <value>Bearer ${env.GITHUB_TOKEN}</value>
+                    </property>
+                </httpHeaders>
+            </configuration>
         </server>
     </servers>
 </settings>

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/oneplus-bot-templates/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>oneplus-bot-templates</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.12-SNAPSHOT</version>
+    <version>1.6.19</version>
     <modules>
         <module>module-templates</module>
         <module>customization-templates</module>

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
 
     <modules>
@@ -14,7 +14,7 @@
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.6.12-SNAPSHOT</version>
+    <version>1.6.19</version>
     <packaging>pom</packaging>
 
 </project>

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/customization-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/module-translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

templates/translations/translation-overrides/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
         <artifactId>translations</artifactId>
-        <version>1.6.12-SNAPSHOT</version>
+        <version>1.6.19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>