[SIS-xxx] prepare for release

upgrading to java 17 upgrading to abstracto 1.5.0
2026-01-01 23:35:21 +00:00 · 2023-07-09 23:37:49 +02:00
parent b810c25613
commit 2960173517
18 changed files with 76 additions and 28 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,11 +17,14 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
        with:
-          java-version: 1.8
+          persist-credentials: false
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
      - name: Build with Maven
        run: mvn -s settings.xml -B install --file pom.xml
        env:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,13 +6,14 @@ jobs:
  publish:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          persist-credentials: false
      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
        with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 17
      - 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
@@ -34,5 +35,5 @@ jobs:
        env:
          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/
          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.4.26
+          ABSTRACTO_VERSION: 1.5.0
          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -75,6 +75,11 @@
            <artifactId>webservices-impl</artifactId>
        </dependency>

+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>twitch-impl</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>dev.sheldan.abstracto.modules</groupId>
            <artifactId>utility-impl</artifactId>
--- a/application/executable/src/main/resources/application-local.properties
+++ b/application/executable/src/main/resources/application-local.properties
@@ -18,4 +18,6 @@ spring.security.user.name=abstracto
 spring.security.user.password=password
 spring.security.user.roles=USER

-spring.application.name=Sissi
+spring.application.name=Sissi
+
+spring.main.allow-circular-references=true
--- a/application/executable/src/main/resources/application.properties
+++ b/application/executable/src/main/resources/application.properties
@@ -8,4 +8,6 @@ spring.security.user.name= ${REST_USER_NAME}
 spring.security.user.password= ${REST_PASSWORD}
 spring.security.user.roles=USER

-spring.application.name=Sissi
+spring.application.name=Sissi
+
+spring.main.allow-circular-references=true
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/Meetup.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/Meetup.java
@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;

-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/MeetupComponent.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/MeetupComponent.java
@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.ComponentPayload;
 import dev.sheldan.sissi.module.meetup.model.database.embed.MeetupComponentId;
 import lombok.*;

-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;

@Builder
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/MeetupParticipant.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/MeetupParticipant.java
@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.sissi.module.meetup.model.database.embed.MeetupParticipationId;
 import lombok.*;

-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;

@Builder
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/embed/MeetupComponentId.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/embed/MeetupComponentId.java
@@ -2,8 +2,8 @@ package dev.sheldan.sissi.module.meetup.model.database.embed;

 import lombok.*;

-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;

@Embeddable
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/embed/MeetupParticipationId.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/database/embed/MeetupParticipationId.java
@@ -2,8 +2,8 @@ package dev.sheldan.sissi.module.meetup.model.database.embed;

 import lombok.*;

-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;

@Embeddable
--- a/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/Quote.java
+++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/Quote.java
@@ -6,7 +6,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;

-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
--- a/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java
+++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java
@@ -2,7 +2,7 @@ package dev.sheldan.sissi.module.quotes.model.database;

 import lombok.*;

-import javax.persistence.*;
+import jakarta.persistence.*;

@Builder
@Entity
--- a/deployment/docker-compose/src/main/resources/.env
+++ b/deployment/docker-compose/src/main/resources/.env
@@ -32,4 +32,6 @@ PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT_TOKEN>
 YOUTUBE_API_KEY=<INSERT_KEY>
 OPEN_WEATHER_MAP_API_KEY=<INSERT_KEY>
-SISSI_VERSION=1.3.29
+TWITCH_CLIENT_ID=<INSERT_CLIENT_ID>
+TWITCH_SECRET=<INSERT_SECRET>
+SISSI_VERSION=1.4.0
--- a/deployment/docker-compose/src/main/resources/docker-compose.yml
+++ b/deployment/docker-compose/src/main/resources/docker-compose.yml
@@ -52,6 +52,7 @@ services:
      DB_USER: ${DATABASE_USER}
      DB_NAME: ${DATABASE_NAME}
      REST_USER_NAME: ${REST_USER_NAME}
+      TZ: "UTC"
      REST_PASSWORD: ${REST_PASSWORD}
      YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
      OPEN_WEATHER_MAP_API_KEY: ${OPEN_WEATHER_MAP_API_KEY}
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -63,6 +63,16 @@
                            <destFileName>assignable-roles.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>twitch</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <destFileName>twitch.zip</destFileName>
+                        </artifactItem>
+
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                            <artifactId>experience-tracking</artifactId>
@@ -268,6 +278,16 @@
                            <destFileName>experience-tracking.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>twitch</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <destFileName>twitch.zip</destFileName>
+                        </artifactItem>
+
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                            <artifactId>modmail</artifactId>
@@ -456,6 +476,17 @@
                            <destFileName>link-embed.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>twitch-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <destFileName>twitch.zip</destFileName>
+                        </artifactItem>
+
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto.modules</groupId>
                            <artifactId>experience-tracking-impl</artifactId>
--- 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,13 +1,13 @@
 {
  "template_artifacts": [
-    "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic",
+    "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind", "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
    "quotes", "meetup", "debra",
    "moderation-custom",
    "moderation-template-overrides", "experience-template-overrides", "logging-template-overrides"
  ],
  "translation_artifacts": [
    "core",
-    "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic",
+    "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch",
    "quotes", "meetup", "debra",
    "moderation-custom",
    "moderation-translation-overrides", "experience-translation-overrides", "logging-translation-overrides"
@@ -31,6 +31,7 @@
    { "zip": "remind", "file": "remind-changeLog.xml"},
    { "zip": "suggestion", "file": "suggestion-changeLog.xml"},
    { "zip": "modmail", "file": "modMail-changeLog.xml"},
+    { "zip": "twitch", "file": "twitch-changeLog.xml"},
    { "zip": "assignable-roles", "file": "assignableRoles-changeLog.xml"},
    { "zip": "moderation-custom", "file": "moderation-custom-changeLog.xml"}
  ]
--- a/deployment/image-packaging/src/main/docker/sissi/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/sissi/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-alpine
 MAINTAINER Sheldan
 VOLUME /tmp
 ADD bot/app.jar /app.jar
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.1.RELEASE</version>
+        <version>3.1.1</version>
        <relativePath />
    </parent>

@@ -16,12 +16,12 @@
    <version>1.3.30-SNAPSHOT</version>

    <properties>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
        <!-- edit in release.yml as well -->
        <!-- when releasing a new bot version, update the .env as well-->
-        <abstracto.version>1.4.26</abstracto.version>
-        <abstracto.templates.version>1.4.17</abstracto.templates.version>
+        <abstracto.version>1.5.0</abstracto.version>
+        <abstracto.templates.version>1.4.18</abstracto.templates.version>
    </properties>

    <modules>