[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release sissi-1.4.23
[SIS-xxx] preparing for release
2026-01-01 15:28:25 +00:00 · 2023-11-23 01:04:11 +01:00 · 2023-11-23 01:04:07 +01:00 · 2023-11-23 01:02:35 +01:00 · 2023-11-23 01:01:40 +01:00
43 changed files with 60 additions and 63 deletions
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/moderation-custom/pom.xml
+++ b/application/sissi-customizations/moderation-custom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application.module.custom</groupId>
        <artifactId>sissi-customizations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/pom.xml
+++ b/application/sissi-customizations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>application</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/debra/pom.xml
+++ b/application/sissi-modules/debra/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/api/DebraDonationStatusController.java
+++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/api/DebraDonationStatusController.java
@@ -1,15 +1,12 @@
 package dev.sheldan.sissi.module.debra.api;

 import dev.sheldan.sissi.module.debra.model.api.*;
-import dev.sheldan.sissi.module.debra.model.commands.DonationItemModel;
-import dev.sheldan.sissi.module.debra.model.commands.DonationsModel;
 import dev.sheldan.sissi.module.debra.service.DonationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

-import java.util.ArrayList;
 import java.util.List;

 import static dev.sheldan.sissi.module.debra.config.DebraFeatureConfig.DEBRA_DONATION_NOTIFICATION_SERVER_ID_ENV_NAME;
--- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/CacheConfig.java
+++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/config/CacheConfig.java
@@ -1,33 +1,33 @@
 package dev.sheldan.sissi.module.debra.config;

+import lombok.extern.slf4j.Slf4j;
 import org.ehcache.config.builders.CacheManagerBuilder;
-import org.ehcache.jsr107.EhcacheCachingProvider;
+import org.ehcache.jsr107.Eh107Configuration;
 import org.ehcache.xml.XmlConfiguration;
-import org.springframework.cache.jcache.JCacheCacheManager;
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-import javax.cache.CacheManager;
-import javax.cache.Caching;
 import java.net.URL;

@Configuration
+@Slf4j
+@EnableCaching
 public class CacheConfig {

-    @Bean("donationCacheManager")
-    public JCacheCacheManager jCacheCacheManager() {
-        return new JCacheCacheManager(getDonationCacheManager());
-    }
-
    @Bean
-    public CacheManager getDonationCacheManager() {
+    public JCacheManagerCustomizer cacheManagerCustomizer() {
        URL myUrl = getClass().getResource("/donation-cache-config.xml");
        XmlConfiguration xmlConfig = new XmlConfiguration(myUrl);
        org.ehcache.CacheManager myCacheManager = CacheManagerBuilder.newCacheManager(xmlConfig);
-        EhcacheCachingProvider provider = (EhcacheCachingProvider) Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
-
-        return  provider.getCacheManager(provider.getDefaultURI(), myCacheManager.getRuntimeConfiguration());
+        return cm -> {
+            myCacheManager.getRuntimeConfiguration().getCacheConfigurations().entrySet().forEach(cacheConfiguration -> {
+                javax.cache.configuration.Configuration<?, ?> jConfiguration = Eh107Configuration.fromEhcacheCacheConfiguration(cacheConfiguration.getValue());
+                log.info("Creating custom cache: " + cacheConfiguration.getKey());
+                cm.createCache(cacheConfiguration.getKey(), jConfiguration);
+            });
+        };
    }
-
-
 }
+
--- a/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java
+++ b/application/sissi-modules/debra/src/main/java/dev/sheldan/sissi/module/debra/service/DonationService.java
@@ -134,7 +134,7 @@ public class DonationService {
                .collect(Collectors.toList());
    }

-    @Cacheable(value = "donation-cache", cacheManager = "donationCacheManager")
+    @Cacheable(value = "donation-cache")
    public DonationsResponse getCachedDonationAmount(Long serverId) {
        return fetchCurrentDonationAmount(serverId);
    }
--- a/application/sissi-modules/meetup/pom.xml
+++ b/application/sissi-modules/meetup/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/pom.xml
+++ b/application/sissi-modules/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/quotes/pom.xml
+++ b/application/sissi-modules/quotes/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/rss-news/pom.xml
+++ b/application/sissi-modules/rss-news/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-modules</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/helm/sissi/Chart.yaml
+++ b/deployment/helm/sissi/Chart.yaml
@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.22
+version: 1.4.23

 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.4.22"
+appVersion: "1.4.23"
--- a/deployment/helm/sissi/values.yaml
+++ b/deployment/helm/sissi/values.yaml
@@ -8,7 +8,7 @@ bot:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: IfNotPresent
  image: sissi-bot
-  tag: 1.4.22
+  tag: 1.4.23
  livenessProbe:
    initialDelaySeconds: 60
    periodSeconds: 5
@@ -25,7 +25,7 @@ restApi:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: IfNotPresent
  image: sissi-rest-api
-  tag: 1.4.22
+  tag: 1.4.23
  podAnnotations: {}
  podSecurityContext: {}
  securityContext: {}
@@ -74,7 +74,7 @@ templateDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-template-data
-  tag: 1.4.22
+  tag: 1.4.23

 dbConfigDeployment:
  enabled: true
@@ -87,7 +87,7 @@ dbConfigDeploymentData:
  repository: harbor.sheldan.dev/sissi
  pullPolicy: Always
  image: sissi-db-data
-  tag: 1.4.22
+  tag: 1.4.23

 dbCredentials:
  host:
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/image-packaging/src/main/docker/.env
+++ b/deployment/image-packaging/src/main/docker/.env
@@ -1,2 +1,2 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
-VERSION=1.4.22
+VERSION=1.4.23
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
    <groupId>dev.sheldan.sissi</groupId>
    <artifactId>sissi</artifactId>
    <name>Sissi</name>
-    <version>1.4.23-SNAPSHOT</version>
+    <version>1.4.24-SNAPSHOT</version>

    <properties>
        <maven.compiler.target>17</maven.compiler.target>
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>customization-templates</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/debra-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/debra-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/meetup-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/meetup-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>sissi-templates</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/quotes-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/quotes-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>module-templates</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/rss-news-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/rss-news-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/pom.xml
+++ b/templates/sissi-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/debra-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/debra-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/meetup-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/meetup-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/quote-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/quote-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/rss-news-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/rss-news-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/pom.xml
+++ b/templates/sissi-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.4.23-SNAPSHOT</version>
+        <version>1.4.24-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Sheldan	0390d7c8ca	[maven-release-plugin] prepare for next development iteration	2023-11-23 01:04:11 +01:00
Sheldan	61412f434c	[maven-release-plugin] prepare release sissi-1.4.23	2023-11-23 01:04:07 +01:00
Sheldan	12e69a18fb	[SIS-xxx] preparing for release	2023-11-23 01:02:35 +01:00
Sheldan	170ddd9c33	[SIS-xxx] fixing cache setup to add additional caches instead of overwriting the provided configuration	2023-11-23 01:01:40 +01:00