Sheldan/OnePlusBot
1
0
Fork 0
mirror of https://github.com/Sheldan/OnePlusBot.git synced 2026-01-01 15:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPB-9] adding overrides module

Browse Source 
overriding urban define template
updating to abstracto 1.2.7
This commit is contained in:
Sheldan
2021-04-05 01:31:50 +02:00
parent 698d34c0e0
commit e75322cda7
10 changed files with 131 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@@ -34,5 +34,5 @@ jobs:
env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
VERSION: ${{ env.version }}
ABSTRACTO_VERSION: 1.2.6
ABSTRACTO_VERSION: 1.2.7
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

11
deployment/image-packaging/pom.xml
View File

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

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

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

5
pom.xml
View File

@@ -18,8 +18,9 @@
<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.6</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>

20
templates/overrides/pom.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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-SNAPSHOT</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>

23
templates/overrides/template-overrides/pom.xml Normal file
View File

@@ -0,0 +1,23 @@
<?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-SNAPSHOT</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>

39
templates/overrides/template-overrides/webservices/pom.xml Normal file
View File

@@ -0,0 +1,39 @@
<?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-SNAPSHOT</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>

15
templates/overrides/template-overrides/webservices/src/main/assembly/assembly.xml Normal file
View File

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

17
templates/overrides/template-overrides/webservices/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl Normal file
View File

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

1
templates/pom.xml
View File

@@ -10,6 +10,7 @@
<modules>
<module>oneplus-bot-modules</module>
<module>translations</module>
<module>overrides</module>
</modules>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>