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

[OPB-9] adding overrides module
overriding urban define template updating to abstracto 1.2.7
2026-01-11 11:44:30 +00:00 · 2021-04-05 02:21:02 +02:00 · 2021-04-05 01:32:18 +02:00 · 2021-04-05 01:24:21 +02:00 · 2021-04-05 01:20:56 +02:00 · 2021-03-29 03:35:39 +02:00
24 changed files with 700 additions and 478 deletions
--- 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.4
+          ABSTRACTO_VERSION: 1.2.7
          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.3.5</version>
+        <version>1.3.7</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.3.5</version>
+        <version>1.3.7</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.3.5</version>
+        <version>1.3.7</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.3.5</version>
+        <version>1.3.7</version>
    </parent>

    <groupId>dev.sheldan.oneplus.bot.application</groupId>
    <artifactId>application</artifactId>
    <packaging>pom</packaging>
-    <version>1.3.5</version>
+    <version>1.3.7</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.3.5</version>
+        <version>1.3.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/docker-compose/src/main/resources/.env
+++ b/deployment/docker-compose/src/main/resources/.env
@@ -25,4 +25,5 @@ PGADMIN_PORT=5050
 PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
 PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT TOKEN>
-YOUTUBE_API_KEY=<INSERT KEY>
+YOUTUBE_API_KEY=<INSERT KEY>
+ONEPLUS_BOT_VERSION=1.3.7
--- a/deployment/docker-compose/src/main/resources/docker-compose.yml
+++ b/deployment/docker-compose/src/main/resources/docker-compose.yml
@@ -2,21 +2,21 @@ version: '3.7'

 services:
  db:
-    image: ${REGISTRY_PREFIX}oneplus_bot_database
+    image: ${REGISTRY_PREFIX}oneplus_bot_database:${ONEPLUS_BOT_VERSION}
    container_name: database
    restart: always
    environment:
      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
      POSTGRES_USER: ${DATABASE_USER}
    ports:
-      - "${DATABASE_PORT}:5432"
+      - "127.0.0.1:${DATABASE_PORT}:5432"
    networks:
      - oneplusbot
    volumes:
      - db-data:/var/lib/postgresql/data
  deployment_container:
    container_name: deployment
-    image: ${REGISTRY_PREFIX}oneplus_bot_deployment
+    image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${ONEPLUS_BOT_VERSION}
    depends_on:
      - db
    environment:
@@ -34,7 +34,7 @@ services:
    networks:
      - oneplusbot
  bot:
-    image: ${REGISTRY_PREFIX}oneplus_bot
+    image: ${REGISTRY_PREFIX}oneplus_bot:${ONEPLUS_BOT_VERSION}
    depends_on:
      - db
      - deployment_container
@@ -53,8 +53,8 @@ services:
      YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
    command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
    ports:
-      - "${DEBUG_PORT}:5005"
-      - "${TOMCAT_PORT}:8080"
+      - "127.0.0.1:${DEBUG_PORT}:5005"
+      - "127.0.0.1:${TOMCAT_PORT}:8080"
    networks:
      - oneplusbot
    volumes:
@@ -62,24 +62,24 @@ services:
      - ./config:/config
  pgadmin:
    container_name: pgadmin
-    image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
+    image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${ONEPLUS_BOT_VERSION}
    depends_on:
      - db
    environment:
      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
    ports:
-      - "${PGADMIN_PORT}:80"
+      - "127.0.0.1:${PGADMIN_PORT}:80"
    restart: unless-stopped
    networks:
      - oneplusbot
  prometheus:
    container_name: prometheus
-    image: ${REGISTRY_PREFIX}oneplus_bot_prometheus
+    image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${ONEPLUS_BOT_VERSION}
    depends_on:
      - bot
    ports:
-      - "${PROMETHEUS_PORT}:9090"
+      - "127.0.0.1:${PROMETHEUS_PORT}:9090"
    restart: unless-stopped
    networks:
      - oneplusbot
@@ -88,12 +88,12 @@ services:
      - prometheus-data:/prometheus
  grafana:
    container_name: grafana
-    image: ${REGISTRY_PREFIX}oneplus_bot_grafana
+    image: ${REGISTRY_PREFIX}oneplus_bot_grafana:${ONEPLUS_BOT_VERSION}
    depends_on:
      - prometheus
      - bot
    ports:
-      - "${GRAFANA_PORT}:3000"
+      - "127.0.0.1:${GRAFANA_PORT}:3000"
    restart: unless-stopped
    volumes:
      - grafana-user-data:/var/lib/grafana
--- 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.3.5</version>
+        <version>1.3.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -287,6 +287,17 @@
                            <destFileName>starboard-custom.zip</destFileName>
                        </artifactItem>

+                        <!-- overrides -->
+                        <artifactItem>
+                            <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+                            <artifactId>webservices</artifactId>
+                            <version>${project.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>overrides-templates-webservices.zip</destFileName>
+                        </artifactItem>
+
                    </artifactItems>
                </configuration>
            </plugin>
--- 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,5 +1,5 @@
 {
-  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"],
+  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom", "overrides-templates-webservices"],
  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"],
  "liquibase_artifacts": [
    { "zip": "scheduling", "file": "scheduling-changeLog.xml" },
--- a/deployment/image-packaging/src/main/docker/grafana/dashboards/crimson-status-dashboard.json
+++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/crimson-status-dashboard.json
--- a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml
+++ b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml
@@ -11,7 +11,7 @@ scrape_configs:
    scheme: http
    static_configs:
      - targets:
-          - 172.17.0.1:8080
+          - oneplusbot:8080
    basic_auth:
      username: "abstracto"
      password_file: /etc/prometheus/micrometer_password
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>oneplusbot</artifactId>
        <groupId>dev.sheldan.oneplus.bot</groupId>
-        <version>1.3.5</version>
+        <version>1.3.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

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

    <groupId>dev.sheldan.oneplus.bot</groupId>
    <artifactId>oneplusbot</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.7</version>

    <properties>
        <maven.compiler.target>1.8</maven.compiler.target>
        <maven.compiler.source>1.8</maven.compiler.source>
        <!-- edit in release.yml as well -->
-        <abstracto.version>1.2.5</abstracto.version>
-        <abstracto.templates.version>1.2.2</abstracto.templates.version>
+        <!-- when releasing a new opbot version, update the docker-compose as well-->
+        <abstracto.version>1.2.7</abstracto.version>
+        <abstracto.templates.version>1.2.3</abstracto.templates.version>
    </properties>

    <modules>
@@ -55,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.3.5</tag>
+        <tag>oneplusbot-1.3.7</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.3.5</version>
+        <version>1.3.7</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.3.5</version>
+    <version>1.3.7</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.3.5</version>
+        <version>1.3.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/overrides/pom.xml
+++ b/templates/overrides/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates</groupId>
+        <artifactId>templates</artifactId>
+        <version>1.3.7</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+    <artifactId>overrides</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>template-overrides</module>
+    </modules>
+
+</project>
--- a/templates/overrides/template-overrides/pom.xml
+++ b/templates/overrides/template-overrides/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
+        <artifactId>overrides</artifactId>
+        <version>1.3.7</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+    <artifactId>template-overrides</artifactId>
+    <packaging>pom</packaging>
+
+
+    <modules>
+        <module>webservices</module>
+    </modules>
+
+
+
+</project>
--- a/templates/overrides/template-overrides/webservices/pom.xml
+++ b/templates/overrides/template-overrides/webservices/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
+        <artifactId>template-overrides</artifactId>
+        <version>1.3.7</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>webservices</artifactId>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>template-overrides-webservices-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml
+++ b/templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>zip</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>.</outputDirectory>
+            <directory>${project.basedir}/src/main/resources</directory>
+        </fileSet>
+    </fileSets>
+</assembly>
--- a/templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl
+++ b/templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl
@@ -0,0 +1,17 @@
+{
+  <#include "abstracto_color">,
+  "fields": [
+      {
+            "name": "<@safe_include "urban_search_command_response_embed_field_title_link"/>",
+            "value": "[<@safe_include "urban_search_command_response_embed_field_value_jump"/>](${definition.url?json_string})",
+            "inline": "true"
+      },
+      {
+            "name": "<@safe_include "urban_search_command_response_embed_field_title_example"/>",
+            "value": "${definition.example?json_string}"
+      }
+  ],
+  "timeStamp": "${definition.creationDate}",
+  "additionalMessage": "${definition.definition?json_string}",
+  "messageLimit": 1
+}
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -4,17 +4,18 @@
    <parent>
        <groupId>dev.sheldan.oneplus.bot</groupId>
        <artifactId>oneplusbot</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.7</version>
    </parent>

    <modules>
        <module>oneplus-bot-modules</module>
        <module>translations</module>
+        <module>overrides</module>
    </modules>

    <groupId>dev.sheldan.oneplus.bot.templates</groupId>
    <artifactId>templates</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.7</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.3.5</version>
+        <version>1.3.7</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.3.5</version>
+        <version>1.3.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Sheldan	0de0bdd64b	[maven-release-plugin] prepare release oneplusbot-1.3.7	2021-04-05 02:21:02 +02:00
Sheldan	e75322cda7	[OPB-9] adding overrides module overriding urban define template updating to abstracto 1.2.7	2021-04-05 01:32:18 +02:00
Sheldan	698d34c0e0	[OPB-8] adding oneplus bot version to docker compose changing port forwards to be local forwards	2021-04-05 01:24:21 +02:00
Sheldan	b3fafac81f	[OPB-7] adding cache stats to grafana dashboard	2021-04-05 01:20:56 +02:00
Sheldan	8de5e543c8	[maven-release-plugin] prepare for next development iteration	2021-03-29 03:35:39 +02:00
Sheldan	eb620f5309	[maven-release-plugin] prepare release oneplusbot-1.3.6	2021-03-29 03:35:33 +02:00
Sheldan	694e33da93	[OPB-x] update to abstracto release 1.2.6	2021-03-29 03:33:45 +02:00
Sheldan	af27472b09	[OPB-x] updating release pipeline	2021-03-29 01:59:23 +02:00
Sheldan	89c810c346	[maven-release-plugin] prepare for next development iteration	2021-03-29 01:56:31 +02:00