From 1055fe9988bfb757e1aebd9ba3dd71dc3692cda1 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 17 Apr 2022 21:07:16 +0200 Subject: [PATCH] #663 - build BudgetMasterMigrator.jar into BudgetMasterServer resources --- .gitignore | 1 + BudgetMasterDatabaseMigrator/pom.xml | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bcf095bea..1437f500c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ certs/ **/main/WEB-INF **/main/META-INF BudgetMasterServer/screenshots/ +BudgetMasterServer/src/main/resources/BudgetMasterDatabaseMigrator*.jar diff --git a/BudgetMasterDatabaseMigrator/pom.xml b/BudgetMasterDatabaseMigrator/pom.xml index a6d60dfd0..5e98177fa 100644 --- a/BudgetMasterDatabaseMigrator/pom.xml +++ b/BudgetMasterDatabaseMigrator/pom.xml @@ -14,8 +14,6 @@ <properties> <h2database.version>1.4.199</h2database.version> <commons-cli.version>1.5.0</commons-cli.version> - - <project.artifactName>${project.artifactId}-v${project.version}</project.artifactName> </properties> <dependencies> @@ -62,8 +60,8 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <configuration> - <outputDirectory>${project.outputDirectory}</outputDirectory> - <finalName>${project.artifactName}</finalName> + <outputDirectory>${basedir}/../BudgetMasterServer/src/main/resources</outputDirectory> + <finalName>${project.artifactId}</finalName> </configuration> <executions> <execution> -- GitLab