Merge branch 'v2_16_1'

deadlocker8 · Dec 3, 2023 · 3072fd3 · 3072fd3
2 parents f8a15a0 + af9975b
commit 3072fd3
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 64 deletions.
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BudgetMaster</artifactId>
         <groupId>de.deadlocker8</groupId>
-        <version>2.16.0</version>
+        <version>2.16.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,23 +26,23 @@
     <properties>
         <jlibs.version>3.2.0</jlibs.version>
         <versionizer.version>3.0.1</versionizer.version>
-        <webjars-locator.version>0.47</webjars-locator.version>
+        <webjars-locator.version>0.50</webjars-locator.version>
         <jquery.version>3.7.1</jquery.version>
         <materializecss.version>1.0.0</materializecss.version>
         <fontawesome.version>6.4.2</fontawesome.version>
-        <sortablejs.version>1.15.0</sortablejs.version>
+        <sortablejs.version>1.15.1</sortablejs.version>
         <mousetrap.version>1.6.5</mousetrap.version>
         <codemirror.version>5.62.2</codemirror.version>
-        <selenium.version>4.13.0</selenium.version>
+        <selenium.version>4.15.0</selenium.version>
         <jgit.version>6.7.0.202309050840-r</jgit.version>
         <natorder.version>1.1.3</natorder.version>
         <itextpdf.version>5.5.13.3</itextpdf.version>
         <vanilla-picker.version>2.12.1</vanilla-picker.version>
         <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
-        <opencsv.version>5.8</opencsv.version>
+        <opencsv.version>5.9</opencsv.version>
         <datatables.version>1.13.5</datatables.version>
         <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
-        <junit-jupiter-engine.version>5.10.0</junit-jupiter-engine.version>
+        <junit-jupiter-engine.version>5.10.1</junit-jupiter-engine.version>
 
         <project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory>
         <project.artifactName>${project.artifactId}-v${project.version}</project.artifactName>
@@ -235,7 +235,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>

diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java
@@ -47,8 +47,7 @@ public String index(Model model)
 	public String whatsNewModal(Model model)
 	{
 		final List<NewsEntry> newsEntries = new ArrayList<>();
-		newsEntries.add(NewsEntry.createWithLocalizationKey("accountBalances"));
-		newsEntries.add(NewsEntry.createWithLocalizationKey("transferTooltip"));
+		newsEntries.add(NewsEntry.createWithLocalizationKey("mariaDB"));
 
 		model.addAttribute(ModelAttributes.NEWS_ENTRIES, newsEntries);
 		return ReturnValues.WHATS_NEW;

diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/images/Image.java
@@ -22,6 +22,7 @@ public class Image implements ProvidesID
 
 	@NotNull
 	@Expose
+	@Column(length = 16777215)
 	@Lob
 	private Byte[] image;
 

diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -1,7 +1,7 @@
 locale=de
 
 # DEFAULT
-credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>spring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.8<br>datatables 1.13.5<br>
+credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>spring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.1<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.50<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.9<br>datatables 1.13.5<br>
 folder=Deadlocker/BudgetMaster
 roadmap.url=https://roadmaps.thecodelabs.de/roadmap/1
 github.url=https://github.com/deadlocker8/BudgetMaster

diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -1,7 +1,7 @@
 locale=en
 
 # DEFAULT
-credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>pring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.8<br>datatables 1.13.5<br>
+credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>pring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.1<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.50<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.9<br>datatables 1.13.5<br>
 folder=Deadlocker/BudgetMaster
 roadmap.url=https://roadmaps.thecodelabs.de/roadmap/2
 github.url=https://github.com/deadlocker8/BudgetMaster

diff --git a/BudgetMasterServer/src/main/resources/languages/news_de.properties b/BudgetMasterServer/src/main/resources/languages/news_de.properties
@@ -2,8 +2,5 @@ news.further.information=Weitere Informationen
 news.all.releases=Alle veröffentlichten und geplanten Versionen:
 news.detailed=Ausführliches Changelog (nur auf Englisch):
 
-news.accountBalances.headline=Kontostände
-news.accountBalances.description=Die Kontenauswahl zeigt für jedes Konto den aktuellen Saldo an.
-
-news.transferTooltip.headline=Umbuchungsrichtun
-news.transferTooltip.description=Added tooltip for transfers in transaction overview to show source and destination account.
+news.mariaDB.headline=Bugfix: MariaDB
+news.mariaDB.description=Fehler beim Upload von Bildern bei der Verwendung von MariaDB behoben.
diff --git a/BudgetMasterServer/src/main/resources/languages/news_en.properties b/BudgetMasterServer/src/main/resources/languages/news_en.properties
@@ -2,8 +2,5 @@ news.further.information=Further information
 news.all.releases=All published and planned releases:
 news.detailed=Detailed changelog (english only):
 
-news.accountBalances.headline=Account balances
-news.accountBalances.description=Show the current balance for each account in the account select.
-
-news.transferTooltip.headline=Konten für Umbuchungen anzeigen
-news.transferTooltip.description=Umbuchungen zeigen in einem Tooltip das Quel- und Zielkonto.
+news.mariaDB.headline=Bugfix: MariaDB
+news.mariaDB.description=Fixed an error when uploading images when using MariaDB.
diff --git a/BudgetMasterServer/src/main/resources/static/js/libs/plotly.min.js b/BudgetMasterServer/src/main/resources/static/js/libs/plotly.min.js
diff --git a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl
@@ -109,7 +109,7 @@
         <!--  Scripts-->
         <#import "../helpers/scripts.ftl" as scripts>
         <@scripts.scripts/>
-        <script src="<@s.url '/webjars/sortablejs/1.15.0/Sortable.min.js'/>"></script>
+        <script src="<@s.url '/webjars/sortablejs/1.15.1/Sortable.min.js'/>"></script>
         <script src="<@s.url '/js/reports.js'/>"></script>
         <script src="<@s.url '/js/globalDatePicker.js'/>"></script>
         <script src="<@s.url '/js/filter.js'/>"></script>

diff --git a/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl b/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl
@@ -53,7 +53,7 @@
 
         <#import "../helpers/scripts.ftl" as scripts>
         <@scripts.scripts/>
-        <script src="<@s.url '/webjars/sortablejs/1.15.0/Sortable.min.js'/>"></script>
+        <script src="<@s.url '/webjars/sortablejs/1.15.1/Sortable.min.js'/>"></script>
         <script src="<@s.url '/js/templates.js'/>"></script>
     </@header.body>
 </html>
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/TestConstants.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/TestConstants.java
@@ -7,5 +7,5 @@ private TestConstants()
 		// empty
 	}
 
-	public static final String POSTGRES_VERSION = "postgres:16.0";
+	public static final String POSTGRES_VERSION = "postgres:16.1";
 }
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ ARG APP_DIR=/BudgetMaster
 RUN mkdir -p $APP_DIR
 RUN mkdir -p /root/.Deadlocker/BudgetMaster
 
-COPY BudgetMasterServer/build/2.16.0/BudgetMasterServer-v2.16.0.jar /BudgetMaster/BudgetMaster.jar
+COPY BudgetMasterServer/build/2.16.1/BudgetMasterServer-v2.16.1.jar /BudgetMaster/BudgetMaster.jar
 COPY BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 RUN echo "server.port=9000" > ~/.Deadlocker/BudgetMaster/settings.properties
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Manage your monthly budget easily with BudgetMaster
 
 - __start:__ 17.12.16
-- __current release:__ v2.16.0 (45) from 29.10.23
+- __current release:__ v2.16.1 (46) from 03.12.23
 
 ## Key Features
 - Keep your data private - Host your own BudgetMaster server or use it in standalone mode. All data remains on your machines.

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>de.deadlocker8</groupId>
     <artifactId>BudgetMaster</artifactId>
     <packaging>pom</packaging>
-    <version>2.16.0</version>
+    <version>2.16.1</version>
     <name>BudgetMaster</name>
 
     <modules>
@@ -40,7 +40,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0</version>
         <relativePath/>
     </parent>
 
@@ -51,13 +51,11 @@
 
         <app.versionDate>${maven.build.timestamp}</app.versionDate>
         <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
-        <app.versionCode>45</app.versionCode>
+        <app.versionCode>46</app.versionCode>
         <app.author>Robert Goldmann</app.author>
 
-        <testcontainer.version>1.19.1</testcontainer.version>
+        <testcontainer.version>1.19.3</testcontainer.version>
         <assertj-core.version>3.24.2</assertj-core.version>
-
-        <dependency-check-maven.version>8.4.2</dependency-check-maven.version>
     </properties>
 
     <dependencies>
@@ -89,36 +87,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.owasp</groupId>
-                <artifactId>dependency-check-maven</artifactId>
-                <version>${dependency-check-maven.version}</version>
-                <inherited>false</inherited>
-                <configuration>
-                    <skip>false</skip>
-                    <cveValidForHours>48</cveValidForHours>
-                    <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
-                    <failOnError>false</failOnError>
-                    <formats>
-                        <format>HTML</format>
-                        <format>XML</format>
-                    </formats>
-                    <suppressionFile>dependency-check-maven-suppression.xml</suppressionFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>aggregate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
     <distributionManagement>
         <repository>
             <id>release</id>