Merge branch 'v2_10_0'

.gitignore

@@ -5,12 +5,16 @@ certs/
 *.p12
 
 *.db
+!BudgetMasterDatabaseMigrator/src/test/resources/*.mv.db
 *.iml
 
-build/[0-9]*.[0-9]*.[0-9]*
+/data
+
+*/build/[0-9]*.[0-9]*.[0-9]*
 /error.log
 /application.properties
 
-src/main/WEB-INF
-src/main/META-INF
-/screenshots/
+**/main/WEB-INF
+**/main/META-INF
+BudgetMasterServer/screenshots/
+BudgetMasterServer/src/main/resources/BudgetMasterDatabaseMigrator.jar

BudgetMasterDatabaseMigrator/pom.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>BudgetMaster</artifactId>
+        <groupId>de.deadlocker8</groupId>
+        <version>2.10.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>BudgetMasterDatabaseMigrator</artifactId>
+
+    <properties>
+        <h2database.version>1.4.199</h2database.version>
+        <commons-cli.version>1.5.0</commons-cli.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-batch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.batch</groupId>
+            <artifactId>spring-batch-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2database.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons-cli.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${basedir}/../BudgetMasterServer/src/main/resources</outputDirectory>
+                    <finalName>${project.artifactId}</finalName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>