From 5eba4ac46f294de7336b5877951d09bb549d3b14 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 7 Oct 2017 17:42:43 +0200
Subject: [PATCH] adjusted pom and version codes
---
BudgetMasterClient/pom.xml | 52 +++++++++----------
.../budgetmaster/languages/_de.properties | 4 +-
.../budgetmaster/languages/_en.properties | 4 +-
BudgetMasterServer/pom.xml | 2 +-
.../budgetmasterserver/_en.properties | 4 +-
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml
index 0fd1b201a..b0fdd5209 100644
--- a/BudgetMasterClient/pom.xml
+++ b/BudgetMasterClient/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.deadlocker8</groupId>
<artifactId>BudgetMasterClient</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0_alpha</version>
<name>BudgetMasterClient</name>
<build>
<plugins>
@@ -15,6 +15,31 @@
<source>1.8</source>
<target>1.8</target>
</configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../build/${project.version}</outputDirectory>
+ <finalName>BudgetMasterClient-v${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!-- LAUNCH4J -->
<plugin>
@@ -48,31 +73,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>../build/${project.version}</outputDirectory>
- <finalName>BudgetMasterClient-v${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <archive>
- <manifest>
- <mainClass>de.deadlocker8.budgetmasterclient.main.Main</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id> <!-- this is used for inheritance merges -->
- <phase>package</phase> <!-- bind to the packaging phase -->
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
index 2fe54cb38..0760336d2 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -1,7 +1,7 @@
# DEFAULT
app.name=BudgetMaster
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
version.date=03.10.17
author=Robert Goldmann
credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
index 6938be4de..778db0500 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -1,7 +1,7 @@
# DEFAULT
app.name=BudgetMaster
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
version.date=03.10.17
author=Robert Goldmann
credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index f0aff38da..b9d7f0dba 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>de.deadlocker8</groupId>
<artifactId>BudgetMasterServer</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0_alpha</version>
<name>BudgetMasterServer</name>
<build>
<plugins>
diff --git a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
index 8de2a69fb..df6e79da5 100644
--- a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
+++ b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties
@@ -1,6 +1,6 @@
app.name=BudgetMasterServer
-version.code=10
-version.name=1.6.0
+version.code=11
+version.name=1.7.0_alpha
version.date=03.10.17
author=Robert Goldmann
--
GitLab