From 5e40ef3b286050756ed2bba63b850e60175f0de3 Mon Sep 17 00:00:00 2001 From: Benedikt Kleinmeier Date: Fri, 1 Mar 2019 15:26:28 +0100 Subject: [PATCH] In POM files, configured "maven-assembly-plugin" to avoid build warnings and renamed final JAR files. .gitlab-ci.yml: - Use new JAR names when packaging via "python3 -m zipfile". VadereGui/pom.xml: - Renamed JAR from "vadere" to "vadere-gu". - Renamed JAR from "postvis" to "vadere-postvis". --- .gitlab-ci.yml | 6 +++--- README.md | 4 ++-- VadereGui/pom.xml | 18 +++++++++--------- VadereSimulator/pom.xml | 7 +++---- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5806f9440..f7cc6db66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ stages: script: - mvn clean - mvn -Dmaven.test.skip=true package - - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar + - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES} only: refs: @@ -91,7 +91,7 @@ stages: script: - mvn clean - mvn -Dmaven.test.skip=true package - - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} README.md VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar + - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - scp ${VADERE_PACKAGE_NAME_RELEASES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/stable/${VADERE_PACKAGE_NAME_RELEASES} # Run job only for "tags" (usually on the "stable" branch). Watch out: Multiple "only" tags are ORed together. # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/27818 @@ -104,7 +104,7 @@ stages: script: - mvn clean - mvn -Dmaven.test.skip=true package - - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere.jar VadereSimulator/target/vadere-console.jar + - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES} when: manual diff --git a/README.md b/README.md index daa83074b..8c46856fd 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ Stable releases and selected branch-builds are located on [www.vadere.org/releas The ZIP file contains: * **README.md** - this README file. -* **vadere.jar** - provides Vadere with a GUI. -* **vadere_console.jar** - provides the command line version of Vadere and allows easy integration into other applications. +* **vadere-gui.jar** - provides the GUI version of Vadere. +* **vadere-console.jar** - provides the command line version of Vadere and allows easy integration into other applications. * **VadereModelTests** - contains test scenarios for pedestrian locomotion models. Note: The tests are also useful for a "getting started" (see below "Run Built-In Examples" for details). To execute the `.jar` files it is highly recommended to use Java 11 (OpenJDK). diff --git a/VadereGui/pom.xml b/VadereGui/pom.xml index 46275bd17..528938e32 100644 --- a/VadereGui/pom.xml +++ b/VadereGui/pom.xml @@ -69,15 +69,13 @@ - + maven-assembly-plugin 2.4 - build-vadere - package + build-vadere-gui + package single @@ -90,13 +88,14 @@ jar-with-dependencies - vadere + vadere-gui false + false - build-postVis - package + build-vadere-postvis + package single @@ -109,8 +108,9 @@ jar-with-dependencies - postvis + vadere-postvis false + false diff --git a/VadereSimulator/pom.xml b/VadereSimulator/pom.xml index 4e44ad8ea..96276fdd9 100644 --- a/VadereSimulator/pom.xml +++ b/VadereSimulator/pom.xml @@ -54,7 +54,7 @@ 1.6.0 - write_version_control_info_to_file + write-version-control-info-to-file generate-resources exec @@ -88,9 +88,7 @@ - + maven-assembly-plugin 2.4 @@ -111,6 +109,7 @@ vadere-console false + false -- GitLab