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

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
           java-version: 1.8
       - name: Load current version
         id: version
-        run: echo "version=$(mvn --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
+        run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       - name: Publish to GitHub Packages
         run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
         env:
@@ -33,4 +33,6 @@ jobs:
         run: docker-compose build && docker-compose push
         env:
           REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
-          VERSION: ${{ env.version }}
+          VERSION: ${{ env.version }}
+          ABSTRACTO_VERSION: 1.2.4
+          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</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.1</version>
+        <version>1.3.4</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.1</version>
+        <version>1.3.4</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.1</version>
+    <version>1.3.4</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>

deployment/docker-compose/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/docker-compose/src/main/resources/docker-compose.yml

@@ -56,6 +56,9 @@ services:
       - "${TOMCAT_PORT}:8080"
     networks:
       - oneplusbot
+    volumes:
+      - bot-logs:/logs
+      - ./config:/config
   pgadmin:
     container_name: pgadmin
     image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
@@ -81,6 +84,7 @@ services:
       - oneplusbot
     volumes:
       - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
+      - prometheus-data:/prometheus
   grafana:
     container_name: grafana
     image: ${REGISTRY_PREFIX}oneplus_bot_grafana
@@ -102,4 +106,6 @@ networks:
 
 volumes:
   db-data:
-  grafana-user-data:
+  grafana-user-data:
+  prometheus-data:
+  bot-logs:

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

deployment/image-packaging/src/main/docker/deployment/Dockerfile

@@ -1,4 +1,6 @@
-FROM docker.pkg.github.com/sheldan/abstracto/abstracto_deployment:latest
+ARG ABSTRACTO_REGISTRY_PREFIX=
+ARG ABSTRACTO_VERSION=latest
+FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION}
 MAINTAINER Sheldan
 ADD template-artifacts /templates
 ADD translation-artifacts /translations

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

@@ -11,7 +11,11 @@ services:
     build: pgAdmin
     image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
   deployment_container:
-    build: deployment
+    build:
+      context: deployment
+      args:
+        ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
+        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
     image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
   prometheus:
     build: prometheus

deployment/image-packaging/src/main/docker/oneplusbot/Dockerfile

@@ -3,6 +3,8 @@ MAINTAINER Sheldan
 VOLUME /tmp
 ADD bot/app.jar /app.jar
 ADD config/* /config/
+VOLUME ["/config"]
+VOLUME ["/logs"]
 ADD wrapper/*.sh /
 RUN chmod +x /start.sh
 CMD ["/start.sh"]

deployment/pom.xml

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

pom.xml

@@ -12,13 +12,14 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.1</version>
+    <version>1.3.4</version>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <abstracto.version>1.2</abstracto.version>
+        <!-- edit in release.yml as well -->
-        <abstracto.templates.version>1.2</abstracto.templates.version>
+        <abstracto.version>1.2.4</abstracto.version>
+        <abstracto.templates.version>1.2.1</abstracto.templates.version>
     </properties>
 
     <modules>
@@ -54,7 +55,7 @@
     <scm>
         <url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
         <developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
-        <tag>oneplusbot-1.1</tag>
+        <tag>oneplusbot-1.3.4</tag>
     </scm>
 
 </project>

templates/oneplus-bot-modules/pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
     <artifactId>oneplus-bot-modules</artifactId>
     <packaging>pom</packaging>
-    <version>1.1</version>
+    <version>1.3.4</version>
     <modules>
         <module>starboard-custom</module>
     </modules>

templates/oneplus-bot-modules/starboard-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.1</version>
+        <version>1.3.4</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.1</version>
+        <version>1.3.4</version>
     </parent>
 
     <modules>
@@ -14,7 +14,7 @@
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.1</version>
+    <version>1.3.4</version>
     <packaging>pom</packaging>
 
 </project>

templates/translations/pom.xml

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

templates/translations/starboard-custom-translations/pom.xml

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