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

overriding urban define template
updating to abstracto 1.2.7

.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.7
+          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.0</version>
+        <version>1.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
@@ -80,6 +80,11 @@
             <artifactId>link-embed-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>webservices-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>starboard-impl</artifactId>

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

@@ -16,4 +16,6 @@ log4j.logger.org.hibernate.type=trace
 management.metrics.tags.application=oneplus-bot
 spring.security.user.name=abstracto
 spring.security.user.password=password
-spring.security.user.roles=USER
+spring.security.user.roles=USER
+
+spring.application.name=OnePlusBot

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

@@ -6,4 +6,6 @@ spring.quartz.jdbc.initialize-schema=never
 management.metrics.tags.application=oneplus-bot
 spring.security.user.name= ${REST_USER_NAME}
 spring.security.user.password= ${REST_PASSWORD}
-spring.security.user.roles=USER
+spring.security.user.roles=USER
+
+spring.application.name=OnePlusBot

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.0</version>
+        <version>1.3.7</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.0</version>
+        <version>1.3.7</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.0</version>
+        <version>1.3.7</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.0</version>
+    <version>1.3.7</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.0</version>
+        <version>1.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -24,4 +24,6 @@ PGADMIN_PORT=5050
 # default authentication for pg admin
 PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
 PGADMIN_DEFAULT_PASSWORD=admin
-TOKEN=<INSERT TOKEN>
+TOKEN=<INSERT TOKEN>
+YOUTUBE_API_KEY=<INSERT KEY>
+ONEPLUS_BOT_VERSION=1.3.7

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
@@ -50,45 +50,50 @@ services:
       DB_NAME: ${DATABASE_NAME}
       REST_USER_NAME: ${REST_USER_NAME}
       REST_PASSWORD: ${REST_PASSWORD}
+      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:
+      - bot-logs:/logs
+      - ./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
     volumes:
       - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
+      - 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
@@ -102,4 +107,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.0</version>
+        <version>1.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -89,6 +89,16 @@
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
+ f                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>webservices</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>webservices.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
                             <artifactId>starboard-custom-templates</artifactId>
@@ -145,6 +155,7 @@
                             <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>utility</artifactId>
@@ -155,6 +166,16 @@
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>webservices</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <destFileName>webservices.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
                             <artifactId>starboard-custom</artifactId>
@@ -244,6 +265,17 @@
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>webservices-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <destFileName>webservices.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
                             <artifactId>starboard-custom</artifactId>
@@ -255,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>

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

@@ -1,4 +1,6 @@
-FROM abstracto_deployment:latest
+ARG ABSTRACTO_REGISTRY_PREFIX
+ARG ABSTRACTO_VERSION=latest
+FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest}
 MAINTAINER Sheldan
 ADD template-artifacts /templates
 ADD translation-artifacts /translations

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

@@ -1,12 +1,13 @@
 {
-  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
-  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "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" },
     { "zip": "core", "file": "core-changeLog.xml" },
     { "zip": "utility", "file": "utility-changeLog.xml"},
     { "zip": "entertainment", "file": "entertainment-changeLog.xml"},
     { "zip": "link-embed", "file": "link-embed-changeLog.xml"},
+    { "zip": "webservices", "file": "webservices-changeLog.xml"},
     { "zip": "starboard", "file": "starboard-changeLog.xml"},
     { "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}
   ]

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/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

deployment/pom.xml

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

pom.xml

@@ -12,13 +12,15 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.0</version>
+    <version>1.3.7</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 -->
+        <!-- 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>
@@ -54,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.0</tag>
+        <tag>oneplusbot-1.3.7</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.0</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.0</version>
+    <version>1.3.7</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.0</version>
+        <version>1.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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>

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>

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>

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>

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
+}

templates/pom.xml

@@ -4,17 +4,18 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.0</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.0</version>
+    <version>1.3.7</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.0</version>
+        <version>1.3.7</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.0</version>
+        <version>1.3.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>