Skip to content
Snippets Groups Projects
Commit 5eba4ac4 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

adjusted pom and version codes

parent 0e1a46a8
No related branches found
No related tags found
1 merge request!222merge v1_7_0 into master
......@@ -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>
......@@ -16,6 +16,31 @@
<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>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
......@@ -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>
......
# 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
......
# 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
......
......@@ -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>
......
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment