From 29601735177a87aa533e2c0661fb276637928a59 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:37:49 +0200 Subject: [PATCH] [SIS-xxx] prepare for release upgrading to java 17 upgrading to abstracto 1.5.0 --- .github/workflows/build.yml | 11 ++++--- .github/workflows/release.yml | 9 +++--- application/executable/pom.xml | 5 +++ .../resources/application-local.properties | 4 ++- .../src/main/resources/application.properties | 4 ++- .../module/meetup/model/database/Meetup.java | 2 +- .../model/database/MeetupComponent.java | 2 +- .../model/database/MeetupParticipant.java | 2 +- .../database/embed/MeetupComponentId.java | 4 +-- .../database/embed/MeetupParticipationId.java | 4 +-- .../module/quotes/model/database/Quote.java | 2 +- .../model/database/QuoteAttachment.java | 2 +- .../docker-compose/src/main/resources/.env | 4 ++- .../src/main/resources/docker-compose.yml | 1 + deployment/image-packaging/pom.xml | 31 +++++++++++++++++++ .../deployment/config/artifact_versions.json | 5 +-- .../src/main/docker/sissi/Dockerfile | 2 +- pom.xml | 10 +++--- 18 files changed, 76 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d8f5114..0034274f 100644 --- 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: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52343678..de3a478c 100644 --- 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/ \ No newline at end of file diff --git a/application/executable/pom.xml b/application/executable/pom.xml index dcc63310..b0cc5f8a 100644 --- a/application/executable/pom.xml +++ b/application/executable/pom.xml @@ -75,6 +75,11 @@ webservices-impl + + dev.sheldan.abstracto.modules + twitch-impl + + dev.sheldan.abstracto.modules utility-impl diff --git a/application/executable/src/main/resources/application-local.properties b/application/executable/src/main/resources/application-local.properties index 01183ff8..4b4c81cc 100644 --- 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 \ No newline at end of file +spring.application.name=Sissi + +spring.main.allow-circular-references=true \ No newline at end of file diff --git a/application/executable/src/main/resources/application.properties b/application/executable/src/main/resources/application.properties index b6340bd5..a15be0c1 100644 --- 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 \ No newline at end of file +spring.application.name=Sissi + +spring.main.allow-circular-references=true \ No newline at end of file diff --git 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 index 6261b540..8bfa1c95 100644 --- 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; diff --git 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 index 39c1be95..69ec3184 100644 --- 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 diff --git 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 index c8be8301..6b9aafd3 100644 --- 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 diff --git 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 index 179af3bc..18b28c48 100644 --- 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 diff --git 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 index 5e34f4d2..93e6cb3a 100644 --- 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 diff --git 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 index 47cae54d..22398a73 100644 --- 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; diff --git 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 index ac5f7c9d..40ba4b6c 100644 --- 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 diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index 679c7f7d..2594b235 100644 --- 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= YOUTUBE_API_KEY= OPEN_WEATHER_MAP_API_KEY= -SISSI_VERSION=1.3.29 \ No newline at end of file +TWITCH_CLIENT_ID= +TWITCH_SECRET= +SISSI_VERSION=1.4.0 \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml index b51c0f75..6cc0a194 100644 --- 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} diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index eab072fb..5ccaa393 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -63,6 +63,16 @@ assignable-roles.zip + + dev.sheldan.abstracto-templates.templates + twitch + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/template-artifacts/ + twitch.zip + + dev.sheldan.abstracto-templates.templates experience-tracking @@ -268,6 +278,16 @@ experience-tracking.zip + + dev.sheldan.abstracto-templates.translations + twitch + ${abstracto.templates.version} + zip + true + ${file.basedir}/deployment/translation-artifacts/ + twitch.zip + + dev.sheldan.abstracto-templates.translations modmail @@ -456,6 +476,17 @@ link-embed.zip + + dev.sheldan.abstracto.modules + twitch-impl + ${abstracto.version} + liquibase + zip + true + ${file.basedir}/deployment/liquibase-artifacts/ + twitch.zip + + dev.sheldan.abstracto.modules experience-tracking-impl diff --git a/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json b/deployment/image-packaging/src/main/docker/deployment/config/artifact_versions.json index 0081cece..52adf6e1 100644 --- 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"} ] diff --git a/deployment/image-packaging/src/main/docker/sissi/Dockerfile b/deployment/image-packaging/src/main/docker/sissi/Dockerfile index b2475c99..fc987f8b 100644 --- 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 diff --git a/pom.xml b/pom.xml index 85029e9a..2f33b9d8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 3.1.1 @@ -16,12 +16,12 @@ 1.3.30-SNAPSHOT - 1.8 - 1.8 + 17 + 17 - 1.4.26 - 1.4.17 + 1.5.0 + 1.4.18