From 13de307d94fac1f2497fdb95dfba75142d8eeb9b Mon Sep 17 00:00:00 2001
From: MK13 <marius@kleberonline.de>
Date: Tue, 17 Nov 2020 21:47:14 +0100
Subject: [PATCH] Fix POMs, build vanilla .wars instead of Spring Boot ones

---
 financer-common/pom.xml                       |  2 +-
 financer-server/pom.xml                       | 32 +++++++++++++++++--
 .../service/AccountStatisticService.java      | 11 +++++--
 financer-web-client/pom.xml                   | 31 ++++++++++++++++--
 .../src/main/resources/static/changelog.txt   |  3 ++
 5 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/financer-common/pom.xml b/financer-common/pom.xml
index 24b16e8..ee861a8 100644
--- a/financer-common/pom.xml
+++ b/financer-common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>financer-parent</artifactId>
         <groupId>de.77zzcx7.financer</groupId>
-        <version>38-SNAPSHOT<</version>
+        <version>38-SNAPSHOT</version>
     </parent>
 
     <artifactId>financer-common</artifactId>
diff --git a/financer-server/pom.xml b/financer-server/pom.xml
index ccfdab3..225f36e 100644
--- a/financer-server/pom.xml
+++ b/financer-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.77zzcx7.financer</groupId>
         <artifactId>financer-parent</artifactId>
-        <version>38-SNAPSHOT<</version>
+        <version>38-SNAPSHOT</version>
     </parent>
 
     <artifactId>financer-server</artifactId>
@@ -141,7 +141,35 @@
                 <activeProfiles>postgres,${deploymentProfile}</activeProfiles>
             </properties>
             <build>
-                <finalName>${project.artifactId}-${deploymentProfile}##${parallelDeploymentVersion}</finalName>
+                <plugins>
+                    <!--
+                        Skip this as we do not need an executable .war file as we are running it in a standalone Tomcat
+                    -->
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <!--
+                        Instead, package it as regular .war file but with a classifier so we can have multiple artifacts
+                        of the same version matching the deployment profiles (77zzcx7 Nexus does not allow redeploy of
+                        releases for example)
+                    -->
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <classifier>${deploymentProfile}</classifier>
+                            <archive>
+                                <manifest>
+                                    <mainClass>${start-class}</mainClass>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
             </build>
             <dependencies>
                 <dependency>
diff --git a/financer-server/src/main/java/de/financer/service/AccountStatisticService.java b/financer-server/src/main/java/de/financer/service/AccountStatisticService.java
index e0b4622..2b87b97 100644
--- a/financer-server/src/main/java/de/financer/service/AccountStatisticService.java
+++ b/financer-server/src/main/java/de/financer/service/AccountStatisticService.java
@@ -39,8 +39,8 @@ public class AccountStatisticService {
         final List<AccountStatistic> resultList = new ArrayList<>();
         long amount = transaction.getAmount();
 
-        // Special case: START bookings should not increase 'spendings current period'
-        if (AccountType.START.equals(fromAccount.getType())) {
+        // Special case: expense neutral bookings should not increase 'spendings current period'
+        if (transaction.isExpenseNeutral()) {
             amount = 0;
         }
 
@@ -56,8 +56,13 @@ public class AccountStatisticService {
     public void revertStatistics(Transaction transaction) {
         final Account fromAccount = transaction.getFromAccount();
         final Account toAccount = transaction.getToAccount();
-        final long amount = transaction.getAmount();
         final List<AccountStatistic> resultList = new ArrayList<>();
+        long amount = transaction.getAmount();
+
+        // Special case: expense neutral bookings should not decrease 'spendings current period'
+        if (transaction.isExpenseNeutral()) {
+            amount = 0;
+        }
 
         for (final Period period : transaction.getPeriods()) {
             resultList.add(calculateInternal(fromAccount, period, amount, true, -1));
diff --git a/financer-web-client/pom.xml b/financer-web-client/pom.xml
index 71ef179..7fee54a 100644
--- a/financer-web-client/pom.xml
+++ b/financer-web-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.77zzcx7.financer</groupId>
         <artifactId>financer-parent</artifactId>
-        <version>38-SNAPSHOT<</version>
+        <version>38-SNAPSHOT</version>
     </parent>
 
     <artifactId>financer-web-client</artifactId>
@@ -99,7 +99,34 @@
                 <finalName>financer</finalName>
             </properties>
             <build>
-                <finalName>${finalName}-${deploymentProfile}##${parallelDeploymentVersion}</finalName>
+                <plugins>
+                    <!--
+                        Skip this as we do not need an executable .war file as we are running it in a standalone Tomcat
+                    -->
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+                    <!--
+                        Instead, package it as regular .war file but with a classifier so we can have multiple artifacts
+                        of the same version matching the deployment profiles (77zzcx7 Nexus does not allow redeploy of
+                        releases for example)
+                    -->
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <configuration>
+                            <classifier>${deploymentProfile}</classifier>
+                            <archive>
+                                <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                </plugins>
             </build>
             <dependencies>
                 <dependency>
diff --git a/financer-web-client/src/main/resources/static/changelog.txt b/financer-web-client/src/main/resources/static/changelog.txt
index 3cb523c..046a1d4 100644
--- a/financer-web-client/src/main/resources/static/changelog.txt
+++ b/financer-web-client/src/main/resources/static/changelog.txt
@@ -1,3 +1,6 @@
+v37 -> v38:
+- Non-functional build changes
+
 v36 -> v37:
 - START bookings are now expense neutral, so they do not increase the 'Expenses current period' counter
 - START bookings now do not increase 'Spendings current period' as this distorts this counter