From 82a7c3da16c9409907f1c21496a495ea866473e9 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 26 Oct 2018 22:40:33 +0200
Subject: [PATCH] Fixed wrong resource providing

---
 pom.xml                                       | 31 +++++--------------
 .../de/deadlocker8/budgetmaster/Build.java    |  2 +-
 src/main/resources/application.properties     |  9 +++++-
 src/main/resources/build.properties           |  5 ---
 4 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 src/main/resources/build.properties

diff --git a/pom.xml b/pom.xml
index d2cd73102..60999f84b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,15 +32,15 @@
         </repository>
     </repositories>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.13.RELEASE</version>
+        <relativePath/>
+    </parent>
+
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>de.thecodelabs</groupId>
                 <artifactId>jlibs</artifactId>
@@ -56,7 +56,6 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <spring-boot-dependencies.version>1.5.13.RELEASE</spring-boot-dependencies.version>
         <jlibs.version>2.0.1</jlibs.version>
 
         <app.versionDate>${maven.build.timestamp}</app.versionDate>
@@ -125,23 +124,7 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/Build.java b/src/main/java/de/deadlocker8/budgetmaster/Build.java
index 379986553..47e2748f7 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/Build.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/Build.java
@@ -28,7 +28,7 @@ public class Build
 	{
 		if(instance == null)
 		{
-			instance = Storage.load(Build.class.getClassLoader().getResourceAsStream("build.properties"), StorageTypes.PROPERTIES, Build.class);
+			instance = Storage.load(Build.class.getClassLoader().getResourceAsStream("application.properties"), StorageTypes.PROPERTIES, Build.class);
 		}
 		return instance;
 	}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6a3c3f340..b8447f52b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,4 +5,11 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.jadira.usertype.autoRegisterUserTypes = true
 
 spring.http.multipart.max-file-size=100MB
-spring.http.multipart.max-request-size=100MB
\ No newline at end of file
+spring.http.multipart.max-request-size=100MB
+
+
+app.name=@project.artifactId@
+app.version.code=@app.versionCode@
+app.version.name=@project.version@
+app.version.date=@app.versionDate@
+app.author=@app.author@
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
deleted file mode 100644
index 6f0fcb711..000000000
--- a/src/main/resources/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-app.name=${pom.artifactId}
-app.version.code=${app.versionCode}
-app.version.name=${pom.version}
-app.version.date=${app.versionDate}
-app.author=${app.author}
\ No newline at end of file
-- 
GitLab