diff --git a/buildConfig/assemblyDesc.xml b/buildConfig/assemblyDesc.xml index 308e339ef39f9eb1497cd310b2bc13af7a753841..ce4fc57e65d3388108362762fc7d07afd27099fd 100644 --- a/buildConfig/assemblyDesc.xml +++ b/buildConfig/assemblyDesc.xml @@ -1,4 +1,4 @@ - +<?xml version="1.0" encoding="UTF-8"?> <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> @@ -6,6 +6,12 @@ <formats> <format>zip</format> </formats> + <dependencySets> + <dependencySet> + <outputDirectory>/lib</outputDirectory> + <unpack>false</unpack> + </dependencySet> + </dependencySets> <fileSets> <fileSet> <directory>${project.basedir}/buildConfig</directory> diff --git a/pom.xml b/pom.xml index 0d014a89ccdecd3f570ecc2a348f07104b419903..e25be37d9728285644320c9f301100bc489fbdf2 100644 --- a/pom.xml +++ b/pom.xml @@ -49,24 +49,6 @@ </dependencies> <build> <plugins> - <!-- Is it really needed? --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <!-- Gets info from git, e.g. hash and datetime --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -91,27 +73,21 @@ <!-- Packs everything in a zip --> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - <mainClass>eu.simstadt.regionchooser.RegionChooserFX</mainClass> - </manifest> - </archive> - <descriptors> - <descriptor>${basedir}/buildConfig/assemblyDesc.xml</descriptor> - </descriptors> - <finalName>RegionChooser_${project.version}_${scmBranch}_${timestamp}_${buildNumber}</finalName> - <appendAssemblyId>false</appendAssemblyId> - </configuration> + <version>3.2.0</version> <executions> <execution> - <id>make-assembly</id> <!-- this is used for inheritance merges --> - <phase>package</phase> <!-- bind to the packaging phase --> + <id>regionchooser</id> + <phase>package</phase> <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor>${basedir}/buildConfig/assemblyDesc.xml</descriptor> + </descriptors> + <finalName>RegionChooser_${project.version}_${scmBranch}_${timestamp}_${buildNumber}</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> </execution> </executions> </plugin>