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

adding webservices dependency

.github/workflows/release.yml

@@ -16,11 +16,6 @@ jobs:
       - name: Load current version
         id: version
         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: Load abstracto version
-        id: abstracto_version
-        run: echo "abstracto_version=$(mvn help:evaluate -s settings.xml --file pom.xml -Dexpression=abstracto.version -q -DforceStdout)" >> $GITHUB_ENV
-        env:
-          MAVEN_OPTS: -Dorg.slf4j.simpleLogger.defaultLogLevel=OFF
       - name: Publish to GitHub Packages
         run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
         env:
@@ -39,5 +34,5 @@ jobs:
         env:
           REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
           VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: ${{ env.abstracto_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.3-SNAPSHOT</version>
+        <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -24,4 +24,5 @@ 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>

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

@@ -50,12 +50,16 @@ 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"
     networks:
       - oneplusbot
+    volumes:
+      - bot-logs:/logs
+      - ./config:/config
   pgadmin:
     container_name: pgadmin
     image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
@@ -81,6 +85,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 +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.3-SNAPSHOT</version>
+        <version>1.3.5</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>

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

@@ -1,6 +1,6 @@
-ARG ABSTRACTO_REGISTRY_PREFIX=
+ARG ABSTRACTO_REGISTRY_PREFIX
 ARG ABSTRACTO_VERSION=latest
-FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION}
+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"],
+  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"],
-  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
+  "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/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.3-SNAPSHOT</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -12,13 +12,14 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.5</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.5</abstracto.version>
+        <abstracto.templates.version>1.2.2</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>HEAD</tag>
+        <tag>oneplusbot-1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</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-SNAPSHOT</version>
+    <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</version>
     </parent>
 
     <modules>
@@ -14,7 +14,7 @@
 
     <groupId>dev.sheldan.oneplus.bot.templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</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.3-SNAPSHOT</version>
+        <version>1.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>