Configuration changes

Author: stranck

Dockerfile

@@ -7,7 +7,7 @@ COPY application-*.jar $APP_HOME/application.jar
 COPY prodkeys/*-key-autocart.rsa $APP_HOME/
 COPY hotel-names.json $APP_HOME/
 
-RUN apk --no-cache -s upgrade && apk --no-cache upgrade
+RUN apk --no-cache -s upgrade && apk --no-cache upgrade && apk add musl-locales && apk add lang
 
 WORKDIR $APP_HOME
 

application/pom.xml

@@ -75,42 +75,42 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>3.1.8</version>
+            <version>${com.github.ben-manes.caffeine.version}</version>
         </dependency>
         <dependency>
             <groupId>org.zalando</groupId>
             <artifactId>logbook-spring-boot-starter</artifactId>
-            <version>3.9.0</version>
+            <version>${org.zalando.version}</version>
         </dependency>
         <dependency>
             <groupId>org.zalando</groupId>
             <artifactId>logbook-httpclient5</artifactId>
-            <version>3.9.0</version>
+            <version>${org.zalando.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.5.0</version>
+            <version>${org.springdoc.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>com.j256.two-factor-auth</groupId>
             <artifactId>two-factor-auth</artifactId>
             <version>1.3</version>
-        </dependency>
-        <dependency>
+        </dependency-->
+        <!--dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
             <version>3.5.2</version>
-        </dependency>
+        </dependency-->
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
-            <version>1.79</version>
+            <version>${org.bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
-            <version>1.79</version>
+            <version>${org.bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>gg.jte</groupId>
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>com.sksamuel.scrimage</groupId>
             <artifactId>scrimage-webp</artifactId>
-            <version>4.3.0</version>
+            <version>${com.sksamuel.scrimage.version}</version>
         </dependency>
 
     </dependencies>

application/src/main/resources/application.yml

@@ -146,5 +146,5 @@ badge:
 reminders:
   cronjobs:
     order-linking: ${REMINDERS_CRONJOB_ORDER_LINKING:0 40 18 * * *}
-    user-badge-upload: ${REMINDERS_CRONJOB_ORDER_LINKING:0 0 18 1 * *}
-    fursuit-badge-upload: ${REMINDERS_CRONJOB_ORDER_LINKING:0 0 18 2 * *}
+    user-badge-upload: ${REMINDERS_CRONJOB_USER_BADGE_UPLOAD:0 0 18 1 * *}
+    fursuit-badge-upload: ${REMINDERS_CRONJOB_FURSUIT_BADGE_UPLOAD:0 0 18 2 * *}

build.sh

@@ -2,7 +2,7 @@
 set -e #crashes the script on errors
 
 echo "pulling from git"
-#git pull origin master
+git pull origin master
 echo "stopping service"
 service fz-backend stop
 echo "building docker"

jooq-common/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.1</version>
+            <version>${org.jetbrains.version}</version>
         </dependency>
     </dependencies>
     <build>

pom.xml

@@ -31,14 +31,20 @@
         <java.version>23</java.version>
         <lombok.version>1.18.34</lombok.version>
         <checkstyle.version>10.18.2</checkstyle.version>
-        <spring.boot.version>3.3.4</spring.boot.version>
+        <spring.boot.version>3.4.2</spring.boot.version>
         <postgresql.version>42.7.4</postgresql.version>
         <jooq.version>3.19.13</jooq.version>
         <commons.lang.version>3.17.0</commons.lang.version>
         <guava.version>33.3.1-jre</guava.version>
         <uuid.creator.version>6.0.0</uuid.creator.version>
         <paseto4j.version>2024.3</paseto4j.version>
         <jte.version>3.1.15</jte.version>
+        <com.sksamuel.scrimage.version>4.3.0</com.sksamuel.scrimage.version>
+        <org.bouncycastle.version>1.79</org.bouncycastle.version>
+        <org.jetbrains.version>26.0.1</org.jetbrains.version>
+        <com.github.ben-manes.caffeine.version>3.1.8</com.github.ben-manes.caffeine.version>
+        <org.zalando.version>3.9.0</org.zalando.version>
+        <org.springdoc.version>2.5.0</org.springdoc.version>
     </properties>
     <dependencies>
         <dependency>