diff --git a/buildConfig/assemblyDesc.xml b/buildConfig/assemblyDesc.xml new file mode 100644 index 0000000000000000000000000000000000000000..c628176a5e1b9c4af6b69a7813a02dc0436118b4 --- /dev/null +++ b/buildConfig/assemblyDesc.xml @@ -0,0 +1,43 @@ + +<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"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}/buildConfig</directory> + <outputDirectory></outputDirectory> + <filtered>true</filtered> + <includes> + <include>start.bat</include> + <include>start.sh</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory></outputDirectory> + <includes> + <include>README*</include> + <include>LICENSE*</include> + <include>NOTICE*</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.directory}</directory> + <outputDirectory></outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/libs</directory> + <outputDirectory>./libs</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file diff --git a/buildConfig/start.bat b/buildConfig/start.bat new file mode 100644 index 0000000000000000000000000000000000000000..f3b813db08707f5b8e758e910c735e5cdabd1c92 --- /dev/null +++ b/buildConfig/start.bat @@ -0,0 +1 @@ +java -jar ${project.artifactId}-${project.version}.jar \ No newline at end of file diff --git a/buildConfig/start.sh b/buildConfig/start.sh new file mode 100644 index 0000000000000000000000000000000000000000..6d5986c50c16333f691d77fe7e48c5732e78d82c --- /dev/null +++ b/buildConfig/start.sh @@ -0,0 +1,2 @@ +#!/bin/bash +java -jar ${project.artifactId}-${project.version}.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index da25220c32ac38e1c071ce65f26b90705fac7651..a376caa527844fa4314c4e0cdf2a434c8351fbf6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,59 @@ </dependencies> <build> <plugins> + <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}/libs</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>libs/</classpathPrefix> + <mainClass>eu.simstadt.regionchooser.RegionChooserFX</mainClass> + </manifest> + </archive> + <descriptors> + <descriptor>${basedir}/buildConfig/assemblyDesc.xml</descriptor> + </descriptors> + </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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>libs/</classpathPrefix> + <mainClass>eu.simstadt.regionchooser.RegionChooserFX</mainClass> + </manifest> + </archive> + </configuration> + </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> @@ -85,12 +138,7 @@ <goal>report</goal> </goals> </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - </execution> + <!-- attached to Maven test phase --> <execution>