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

[OPB-x] updating to abstracto 1.2.4
[maven-release-plugin] prepare for next development iteration
2026-01-11 19:52:40 +00:00 · 2021-03-24 22:32:33 +01:00 · 2021-03-24 22:30:41 +01:00 · 2021-03-24 21:28:17 +01:00 · 2021-03-24 21:28:10 +01:00 · 2021-03-24 21:21:21 +01:00
18 changed files with 41 additions and 24 deletions
--- a/.github/workflows/release.yml
+++ b/.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/
--- 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.1</version>
+        <version>1.3.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
--- 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.1</version>
+        <version>1.3.4</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.1</version>
+        <version>1.3.4</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.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>
--- 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.1</version>
+        <version>1.3.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/docker-compose/src/main/resources/docker-compose.yml
+++ b/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:
--- 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.1</version>
+        <version>1.3.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/image-packaging/src/main/docker/deployment/Dockerfile
+++ b/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
--- a/deployment/image-packaging/src/main/docker/docker-compose.yml
+++ b/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
--- a/deployment/image-packaging/src/main/docker/oneplusbot/Dockerfile
+++ b/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"]
--- a/deployment/pom.xml
+++ b/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>

--- a/pom.xml
+++ b/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>
-        <abstracto.templates.version>1.2</abstracto.templates.version>
+        <!-- edit in release.yml as well -->
+        <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>
--- a/templates/oneplus-bot-modules/pom.xml
+++ b/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>
--- a/templates/oneplus-bot-modules/starboard-custom/pom.xml
+++ b/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>

--- a/templates/pom.xml
+++ b/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>
--- 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.1</version>
+        <version>1.3.4</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/translations/starboard-custom-translations/pom.xml
+++ b/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>
Author	SHA1	Message	Date
Sheldan	9190688f45	[maven-release-plugin] prepare release oneplusbot-1.3.4	2021-03-24 22:32:33 +01:00
Sheldan	b84177f062	[OPB-x] updating to abstracto 1.2.4	2021-03-24 22:30:41 +01:00
Sheldan	6985f329f8	[maven-release-plugin] prepare for next development iteration	2021-03-24 21:28:17 +01:00
Sheldan	a815f7239e	[maven-release-plugin] prepare release oneplusbot-1.3.3	2021-03-24 21:28:10 +01:00
Sheldan	085e53cebc	[OPB-x] updating to abstracto 1.2.3	2021-03-24 21:21:21 +01:00
Sheldan	b7a67c8a38	[maven-release-plugin] prepare for next development iteration	2021-03-24 14:54:38 +01:00
Sheldan	95abffdc1f	[maven-release-plugin] prepare release oneplusbot-1.3.2	2021-03-24 14:54:32 +01:00
Sheldan	c430bbaf61	[OPB-x] updating to newer abstracto version	2021-03-24 14:51:48 +01:00
Sheldan	6f9dfb1087	[OPB-6] adding ability to define folders for config and log in docker compose	2021-03-24 14:13:16 +01:00
Sheldan	1717954cb6	[maven-release-plugin] prepare for next development iteration	2021-03-23 22:49:34 +01:00
Sheldan	3c1facd1ab	[maven-release-plugin] prepare release oneplusbot-1.3.1	2021-03-23 22:49:28 +01:00
Sheldan	3237cf94bd	[OPB-3] updating abstracto version to 1.2.1	2021-03-23 22:47:34 +01:00
Sheldan	0167d863bf	[maven-release-plugin] prepare for next development iteration	2021-03-23 13:17:14 +01:00
Sheldan	42829faea7	[maven-release-plugin] prepare release oneplusbot-1.3	2021-03-23 13:17:08 +01:00
Sheldan	7e52731247	[OPB-3] hardcoding the abstracto version in the release job for now	2021-03-23 13:16:42 +01:00
Sheldan	38a03649bd	[OPB-3] disabling maven log for retrieving the abstracto version	2021-03-23 13:12:30 +01:00
Sheldan	54479ccfc6	[OPB-3] fixing substitution in release job	2021-03-23 13:00:55 +01:00
Sheldan	de2fa4d581	[maven-release-plugin] prepare for next development iteration	2021-03-23 12:54:42 +01:00
Sheldan	6097773e75	[maven-release-plugin] prepare release oneplusbot-1.2	2021-03-23 12:54:36 +01:00
Sheldan	6818e390be	[OPB-3] using arguments for deployment docker image build, in order to access the abstracto registry	2021-03-23 12:38:37 +01:00
Sheldan	070893fe6a	[maven-release-plugin] prepare for next development iteration	2021-03-23 11:22:47 +01:00