[OPB-x] updating to abstracto 1.2.5

adding webservices dependency

application/executable/pom.xml

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

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,6 +50,7 @@ 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"

deployment/image-packaging/pom.xml

@@ -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"}
   ]

pom.xml

@@ -18,8 +18,8 @@
         <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.4</abstracto.version>
+        <abstracto.version>1.2.5</abstracto.version>
-        <abstracto.templates.version>1.2.1</abstracto.templates.version>
+        <abstracto.templates.version>1.2.2</abstracto.templates.version>
     </properties>
 
     <modules>