Merge tag 'refs/tags/dev-98.4.0'

# Conflicts: # pom.xml
scireum · Feb 23, 2024 · a7dddce · a7dddce
2 parents 266264c + 40de016
commit a7dddce
Show file tree

Hide file tree

Showing 245 changed files with 6,060 additions and 3,720 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -17,7 +17,7 @@ clone:
 
 steps:
   - name: compile
-    image: scireum/sirius-build-jdk18
+    image: scireum/sirius-build-jdk21
     commands:
       - mvn clean compile
     volumes: *scireum_volumes
@@ -28,7 +28,7 @@ steps:
         - push
 
   - name: cron_unit_tests
-    image: scireum/sirius-build-jdk18
+    image: scireum/sirius-build-jdk21
     commands:
       - mvn clean test
     volumes: *scireum_volumes
@@ -48,7 +48,7 @@ steps:
         - cron
 
   - name: test
-    image: scireum/sirius-build-jdk18
+    image: scireum/sirius-build-jdk21
     commands:
       - mvn clean test -Dtest.excluded.groups=nightly
     volumes: *scireum_volumes
@@ -57,7 +57,7 @@ steps:
         - pull_request
 
   - name: deploy
-    image: scireum/sirius-build-jdk18
+    image: scireum/sirius-build-jdk21
     commands:
       - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml
       - mvn clean deploy -DskipTests
@@ -77,7 +77,7 @@ steps:
         - tag
 
   - name: sonar
-    image: scireum/sirius-build-jdk18
+    image: scireum/sirius-build-jdk21
     commands:
       - sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml
       - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test org.jacoco:jacoco-maven-plugin:report sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+### Description
+
+<!--  Describe your changes in detail. Also mention how to handle breaking changes if there are any -->
+
+### Additional Notes
+
+- This PR fixes or works on following ticket(s): [SIRI-](https://scireum.myjetbrains.com/youtrack/issue/SIRI-)
+- This PR is related to PR: <!-- URL of PR if applicable, remove otherwise -->
+
+### Checklist
+
+- [ ] Code change has been tested and works locally
+- [ ] Code was formatted via IntelliJ and follows SonarLint & [best practices](https://scireum.myjetbrains.com/youtrack/articles/MISC-A-16/CodeStyle-JavaDoc)
+- [ ] Patch Tasks: Is local execution of Patch Tasks necessary? If so, please also mark the PR with the tag.
diff --git a/develop.conf b/develop.conf
@@ -113,3 +113,108 @@ s3 {
     }
 
 }
+
+lookup-tables {
+    languages {
+        table = null
+        data {
+            de {
+                name = "$Language.de"
+            },
+            en {
+                name = "$Language.en"
+            },
+            fr {
+                name = "$Language.fr"
+            },
+            nl {
+                name = "$Language.nl"
+            },
+            it {
+                name = "$Language.it"
+            },
+            es {
+                name = "$Language.es"
+            },
+            pt {
+                name = "$Language.pt"
+            },
+            pl {
+                name = "$Language.pl"
+            },
+            cs {
+                name = "$Language.cs"
+            },
+            hu {
+                name = "$Language.hu"
+            },
+            da {
+                name = "$Language.da"
+            },
+            sv {
+                name = "$Language.sv"
+            },
+            fi {
+                name = "$Language.fi"
+            },
+            ro {
+                name = "$Language.ro"
+            },
+            ru {
+                name = "$Language.ru"
+            },
+            sk {
+                name = "$Language.sk"
+            },
+            bg {
+                name = "$Language.bg"
+            },
+            hr {
+                name = "$Language.hr"
+            },
+            no {
+                name = "$Language.no"
+            },
+            sr {
+                name = "$Language.sr"
+            },
+            sl {
+                name = "$Language.sl"
+            },
+            uk {
+                name = "$Language.uk"
+            },
+            lt {
+                name = "$Language.lt"
+            },
+            lv {
+                name = "$Language.lv"
+            }
+        }
+    }
+
+    active-languages {
+        codeList = null
+        data = ${lookup-tables.languages.data}
+    }
+
+    countries {
+        table = null
+        data {
+            de {
+                name = "$Country.de"
+            },
+            at {
+                name = "$Country.at"
+            },
+            ch {
+                name = "$Country.ch"
+            }
+        }
+    }
+
+    active-countries {
+        codeList = null
+        data = ${lookup-tables.countries.data}
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     hostname: mongo
 
   mariadb:
-    image: mariadb:10.11.4-jammy
+    image: mariadb:10.11.5-jammy
     ports:
       - "3306"
     environment:
@@ -33,7 +33,7 @@ services:
       - "9000"
     hostname: clickhouse
   elasticsearch:
-    image: elasticsearch:8.7.1
+    image: elasticsearch:8.9.2
     ports:
       - "9200"
     environment:

diff --git a/pom.xml b/pom.xml
@@ -6,20 +6,20 @@
     <parent>
         <groupId>com.scireum</groupId>
         <artifactId>sirius-parent</artifactId>
-        <version>10.2.0</version>
+        <version>11.5.1</version>
     </parent>
     <artifactId>sirius-biz</artifactId>
     <version>DEVELOPMENT-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SIRIUS biz</name>
-    <description>Provides a framework for building web based business applications</description>
-    <url>http://www.sirius-lib.net</url>
+    <description>Provides a framework for building web-based business applications</description>
+    <url>https://www.sirius-lib.net</url>
 
     <properties>
-        <sirius.kernel>ga-9.0.0</sirius.kernel>
-        <sirius.web>ga-10.0.0</sirius.web>
-        <sirius.db>ga-10.0.0</sirius.db>
+        <sirius.kernel>ga-10.0.0</sirius.kernel>
+        <sirius.web>ga-11.0.0</sirius.web>
+        <sirius.db>ga-11.0.0</sirius.db>
     </properties>
 
     <repositories>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.0.6</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.clickhouse</groupId>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.13</version>
+            <version>1.16.0</version>
         </dependency>
 
         <!-- Required as the version brought by clickhouse-jdbc contains security issues -->
@@ -82,29 +82,29 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>2.9.2</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
-            <version>2.9.2</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-scp</artifactId>
-            <version>2.9.2</version>
+            <version>2.11.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.codelibs</groupId>
             <artifactId>jcifs</artifactId>
-            <version>2.1.32</version>
+            <version>2.1.37</version>
         </dependency>
         <!-- Required as the version provided by jcifs has security issues -->
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.70</version>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.77</version>
         </dependency>
 
         <dependency>
@@ -131,27 +131,27 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
-            <version>1.12.272</version>
+            <version>1.12.610</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
-        </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.9.0</version>
+            <version>3.10.0</version>
         </dependency>
         <dependency>
             <groupId>com.rometools</groupId>
             <artifactId>rome</artifactId>
-            <version>1.18.0</version>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/sirius/biz/analytics/events/PageImpressionEvent.java b/src/main/java/sirius/biz/analytics/events/PageImpressionEvent.java
@@ -11,7 +11,6 @@
 import sirius.db.mixing.Mapping;
 import sirius.db.mixing.annotations.BeforeSave;
 import sirius.db.mixing.annotations.NullAllowed;
-import sirius.kernel.async.CallContext;
 import sirius.kernel.commons.Strings;
 import sirius.web.controller.ControllerDispatcher;
 import sirius.web.http.WebContext;
@@ -95,7 +94,7 @@ public class PageImpressionEvent extends Event<PageImpressionEvent> {
     @BeforeSave
     protected void fillAndCheck() {
         if (Strings.isEmpty(uri) || Strings.isEmpty(aggregationUri)) {
-            WebContext webContext = CallContext.getCurrent().get(WebContext.class);
+            WebContext webContext = WebContext.getCurrent();
             if (webContext.isValid()) {
                 if (Strings.isEmpty(uri)) {
                     uri = webContext.getRequestedURI();

diff --git a/src/main/java/sirius/biz/analytics/events/UserData.java b/src/main/java/sirius/biz/analytics/events/UserData.java
@@ -12,7 +12,6 @@
 import sirius.db.mixing.Mapping;
 import sirius.db.mixing.annotations.BeforeSave;
 import sirius.db.mixing.annotations.NullAllowed;
-import sirius.kernel.async.CallContext;
 import sirius.kernel.commons.Strings;
 import sirius.web.security.ScopeInfo;
 import sirius.web.security.UserContext;
@@ -45,13 +44,13 @@ public class UserData extends Composite {
 
     @BeforeSave
     protected void fill() {
-        UserContext ctx = CallContext.getCurrent().get(UserContext.class);
-        if (ctx.getScope() != ScopeInfo.DEFAULT_SCOPE && Strings.isEmpty(scopeId)) {
-            scopeId = ctx.getScope().getScopeId();
+        UserContext userContext = UserContext.get();
+        if (userContext.getScope() != ScopeInfo.DEFAULT_SCOPE && Strings.isEmpty(scopeId)) {
+            scopeId = userContext.getScope().getScopeId();
         }
-        if (ctx.isUserPresent() && ctx.getUser().isLoggedIn() && Strings.isEmpty(userId)) {
-            userId = ctx.getUser().getUserId();
-            tenantId = ctx.getUser().getTenantId();
+        if (userContext.isUserPresent() && userContext.getUser().isLoggedIn() && Strings.isEmpty(userId)) {
+            userId = userContext.getUser().getUserId();
+            tenantId = userContext.getUser().getTenantId();
         }
     }
 

diff --git a/src/main/java/sirius/biz/analytics/events/WebData.java b/src/main/java/sirius/biz/analytics/events/WebData.java
@@ -13,7 +13,6 @@
 import sirius.db.mixing.annotations.BeforeSave;
 import sirius.db.mixing.annotations.Length;
 import sirius.db.mixing.annotations.NullAllowed;
-import sirius.kernel.async.CallContext;
 import sirius.kernel.commons.Strings;
 import sirius.web.http.UserAgent;
 import sirius.web.http.WebContext;
@@ -84,16 +83,16 @@ public class WebData extends Composite {
 
     @BeforeSave
     protected void fill() {
-        WebContext ctx = CallContext.getCurrent().get(WebContext.class);
-        if (ctx.isValid()) {
+        WebContext webContext = WebContext.getCurrent();
+        if (webContext.isValid()) {
             if (Strings.isEmpty(url)) {
-                url = ctx.getRequestedURL();
+                url = webContext.getRequestedURL();
             }
             if (Strings.isEmpty(userAgent)) {
-                persistUserAgent(ctx.getUserAgent());
+                persistUserAgent(webContext.getUserAgent());
             }
-            if (ctx.getTTFBMillis() > 0 && responseTime == null) {
-                responseTime = ctx.getTTFBMillis();
+            if (webContext.getTTFBMillis() > 0 && responseTime == null) {
+                responseTime = webContext.getTTFBMillis();
             }
         }
     }

diff --git a/src/main/java/sirius/biz/analytics/explorer/TimeSeries.java b/src/main/java/sirius/biz/analytics/explorer/TimeSeries.java
@@ -120,7 +120,7 @@ public LocalDate getRequestedStart() {
      * @return the start of the period to query
      */
     public LocalDate getStart() {
-        return ranges.get(0).getFirst();
+        return ranges.getFirst().getFirst();
     }
 
     /**
@@ -141,7 +141,7 @@ public LocalDate getRequestedEnd() {
      * @return the end of the last range to query
      */
     public LocalDate getEnd() {
-        return ranges.get(ranges.size() - 1).getSecond();
+        return ranges.getLast().getSecond();
     }
 
     public Granularity getGranularity() {