Merge branch 'v2_5_0'

Dockerfile

@@ -1,7 +1,7 @@
-FROM tomcat:9-jre8
+FROM tomcat:9-jdk11
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY build/2.4.5/BudgetMaster-v2.4.5.war $CATALINA_HOME/webapps/ROOT.war
+COPY build/2.5.0/BudgetMaster-v2.5.0.war $CATALINA_HOME/webapps/ROOT.war
 COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 
 EXPOSE 8080

README.md

@@ -2,7 +2,7 @@
 Manage your monthly budget easily with BudgetMaster
 
 - __start:__ 17.12.16
-- __current release:__ v2.4.5 (28) from 19.08.20
+- __current release:__ v2.5.0 (29) from 03.12.20
 
 ## Key Features
 - Keep your data private - Host your own BudgetMaster server or use it in standalone mode. All data remains on your machines.
@@ -16,7 +16,7 @@ Manage your monthly budget easily with BudgetMaster
 - Password protected website - Your data can only be accessed by entering the correct password. (Note: The database is not encrypted)
 - Localization - English and German supported.
 - Search and Filter - Search for individual transactions or filter your view.
-- Visualize your data - Use on of the pre-defined charts or create your one by using the chart framework to visualize and analyze your data.
+- Visualize your data - Use one of the pre-defined charts or create your one by using the chart framework to visualize and analyze your data.
 - Auto Backup - Schedule an automatic export of your database content.
 
 ## Available Languages

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.deadlocker8</groupId>
     <artifactId>BudgetMaster</artifactId>
-    <version>2.4.5</version>
+    <version>2.5.0</version>
     <name>BudgetMaster</name>
 
     <repositories>
@@ -35,7 +35,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.5.RELEASE</version>
+        <version>2.2.11.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -54,23 +54,23 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
 
-        <jlibs.version>2.0.6</jlibs.version>
-        <versionizer.version>1.2.1</versionizer.version>
-        <webjars-locator.version>0.39</webjars-locator.version>
-        <jquery.version>3.4.1</jquery.version>
+        <jlibs.version>3.2.0</jlibs.version>
+        <versionizer.version>3.0.1</versionizer.version>
+        <webjars-locator.version>0.40</webjars-locator.version>
+        <jquery.version>3.5.1</jquery.version>
         <materializecss.version>1.0.0</materializecss.version>
-        <fontawesome.version>5.12.0</fontawesome.version>
-        <sortablejs.version>1.8.3</sortablejs.version>
-        <mousetrap.version>1.6.1</mousetrap.version>
+        <fontawesome.version>5.15.1</fontawesome.version>
+        <sortablejs.version>1.10.2</sortablejs.version>
+        <mousetrap.version>1.6.5</mousetrap.version>
         <codemirror.version>5.50.0</codemirror.version>
         <selenium.version>3.141.59</selenium.version>
-        <assertj-core.version>3.15.0</assertj-core.version>
+        <assertj-core.version>3.17.1</assertj-core.version>
 
         <app.versionDate>${maven.build.timestamp}</app.versionDate>
         <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
-        <app.versionCode>28</app.versionCode>
+        <app.versionCode>29</app.versionCode>
         <app.author>Robert Goldmann</app.author>
 
         <project.outputDirectory>build/${project.version}</project.outputDirectory>
@@ -245,7 +245,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.3.1</version>
                 <configuration>
                     <webappDirectory>${basedir}/src/main</webappDirectory>
                     <outputDirectory>${project.outputDirectory}</outputDirectory>
@@ -264,7 +264,7 @@
             <plugin>
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
                 <artifactId>launch4j-maven-plugin</artifactId>
-                <version>1.7.21</version>
+                <version>1.7.25</version>
                 <executions>
                     <execution>
                         <id>l4j-clui</id>
@@ -283,7 +283,7 @@
                             <jre>
                                 <bundledJre64Bit>false</bundledJre64Bit>
                                 <bundledJreAsFallback>false</bundledJreAsFallback>
-                                <minVersion>1.8.0</minVersion>
+                                <minVersion>11</minVersion>
                                 <jdkPreference>preferJre</jdkPreference>
                                 <runtimeBits>64/32</runtimeBits>
                             </jre>
@@ -296,7 +296,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
+                <version>2.22.1</version>
                 <configuration>
                     <junitArtifactName>junit:junit</junitArtifactName>
                     <argLine>-Dfile.encoding=UTF-8</argLine>
@@ -311,7 +311,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
+                <version>1.12</version>
                 <executions>
                     <execution>
                         <id>attach-artifacts</id>

src/main/java/de/deadlocker8/budgetmaster/Main.java

@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.text.MessageFormat;
 import java.util.*;
 
 
@@ -47,20 +48,27 @@ public Locale getLocale()
 			}
 
 			@Override
-			public String getBaseResource()
+			public String[] getBaseResources()
 			{
-				return "languages/";
+				return new String[]{"languages/base", "languages/news"};
 			}
 
 			@Override
 			public LocalizationMessageFormatter messageFormatter()
 			{
 				return new JavaMessageFormatter();
 			}
+
+			@Override
+			public boolean useMultipleResourceBundles()
+			{
+				return true;
+			}
 		});
 		Localization.load();
 
 		ProgramArgs.setArgs(Arrays.asList(args));
+		LOGGER.debug(MessageFormat.format("Starting with ProgramArgs: {0}", ProgramArgs.getArgs()));
 
 		Path applicationSupportFolder = getApplicationSupportFolder();
 		PathUtils.createDirectoriesIfNotExists(applicationSupportFolder);
@@ -106,12 +114,12 @@ else if(ProgramArgs.isDebug())
 			}
 			else
 			{
-				LOGGER.error("Ignoring option --customFolder: provided path '" + customFolder.toString() + "' is not absolute");
+				LOGGER.error(MessageFormat.format("Ignoring option --customFolder: provided path ''{0}'' is not absolute", customFolder.toString()));
 			}
 		}
 
 		savePath = determineFolder(savePath);
-		LOGGER.info("Used save path: " + savePath.toString());
+		LOGGER.info(MessageFormat.format("Used save path: {0}", savePath.toString()));
 		return savePath;
 	}
 
@@ -180,6 +188,6 @@ public void run(ApplicationArguments args)
 
 	private static void logAppInfo(String appName, String versionName, String versionCode, String versionDate)
 	{
-		LOGGER.info(appName + " - v" + versionName + " - (versioncode: " + versionCode + ") from " + versionDate + ")");
+		LOGGER.info(MessageFormat.format("{0} - v{1} - (versioncode: {2}) from {3})", appName, versionName, versionCode, versionDate));
 	}
 }

src/main/java/de/deadlocker8/budgetmaster/ProgramArgs.java

@@ -13,6 +13,10 @@ public class ProgramArgs
 
 	private static List<String> args = new ArrayList<>();
 
+	private ProgramArgs()
+	{
+	}
+
 	public static void setArgs(List<String> args)
 	{
 		ProgramArgs.args = args;

src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java

@@ -28,6 +28,7 @@ public class Account
 
 	private Boolean isSelected = false;
 	private Boolean isDefault = false;
+	private Boolean isReadOnly = false;
 
 	@Expose
 	private AccountType type;
@@ -39,6 +40,7 @@ public Account(String name, AccountType type)
 		this.type = type;
 		this.isSelected = false;
 		this.isDefault = false;
+		this.isReadOnly = false;
 	}
 
 	public Account()
@@ -95,6 +97,16 @@ public void setDefault(Boolean aDefault)
 		isDefault = aDefault;
 	}
 
+	public Boolean isReadOnly()
+	{
+		return isReadOnly;
+	}
+
+	public void setReadOnly(Boolean readOnly)
+	{
+		isReadOnly = readOnly;
+	}
+
 	public AccountType getType()
 	{
 		return type;
@@ -114,6 +126,7 @@ public String toString()
 				", referringTransactions=" + referringTransactions +
 				", isSelected=" + isSelected +
 				", isDefault=" + isDefault +
+				", isReadOnly=" + isReadOnly +
 				", type=" + type +
 				'}';
 	}
@@ -126,6 +139,7 @@ public boolean equals(Object o)
 		Account account = (Account) o;
 		return isSelected == account.isSelected &&
 				isDefault == account.isDefault &&
+				isReadOnly == account.isReadOnly &&
 				Objects.equals(ID, account.ID) &&
 				Objects.equals(name, account.name) &&
 				type == account.type;
@@ -134,6 +148,6 @@ public boolean equals(Object o)
 	@Override
 	public int hashCode()
 	{
-		return Objects.hash(ID, name, isSelected, isDefault, type);
+		return Objects.hash(ID, name, isSelected, isDefault, isReadOnly, type);
 	}
 }