Commit 5e40ef3b authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

In POM files, configured "maven-assembly-plugin" to avoid build warnings and...

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".
parent 2479b1be
Pipeline #94786 failed with stages
in 122 minutes and 55 seconds
...@@ -79,7 +79,7 @@ stages: ...@@ -79,7 +79,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - 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} - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES}
only: only:
refs: refs:
...@@ -91,7 +91,7 @@ stages: ...@@ -91,7 +91,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - 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} - 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. # 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 # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/27818
...@@ -104,7 +104,7 @@ stages: ...@@ -104,7 +104,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - 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} - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES}
when: manual when: manual
......
...@@ -34,8 +34,8 @@ Stable releases and selected branch-builds are located on [www.vadere.org/releas ...@@ -34,8 +34,8 @@ Stable releases and selected branch-builds are located on [www.vadere.org/releas
The ZIP file contains: The ZIP file contains:
* **README.md** - this README file. * **README.md** - this README file.
* **vadere.jar** - provides Vadere with a GUI. * **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. * **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). * **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). To execute the `.jar` files it is highly recommended to use Java 11 (OpenJDK).
......
...@@ -69,15 +69,13 @@ ...@@ -69,15 +69,13 @@
</plugin> </plugin>
<plugin> <plugin>
<!-- NOTE: We don't need a groupId specification because the group is <!-- Use default groupId "org.apache.maven.plugins" -->
org.apache.maven.plugins ...which is assumed by default.
-->
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>build-vadere</id> <!-- this is used for inheritance merges --> <id>build-vadere-gui</id>
<phase>package</phase> <!-- bind to the packaging phase --> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
...@@ -90,13 +88,14 @@ ...@@ -90,13 +88,14 @@
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs> </descriptorRefs>
<finalName>vadere</finalName> <finalName>vadere-gui</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
<id>build-postVis</id> <!-- this is used for inheritance merges --> <id>build-vadere-postvis</id>
<phase>package</phase> <!-- bind to the packaging phase --> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
...@@ -109,8 +108,9 @@ ...@@ -109,8 +108,9 @@
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs> </descriptorRefs>
<finalName>postvis</finalName> <finalName>vadere-postvis</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<version>1.6.0</version> <version>1.6.0</version>
<executions> <executions>
<execution> <execution>
<id>write_version_control_info_to_file</id> <id>write-version-control-info-to-file</id>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
...@@ -88,9 +88,7 @@ ...@@ -88,9 +88,7 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<!-- NOTE: We don't need a groupId specification because the group is <!-- Use default groupId "org.apache.maven.plugins" -->
org.apache.maven.plugins ...which is assumed by default.
-->
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version> <version>2.4</version>
<executions> <executions>
...@@ -111,6 +109,7 @@ ...@@ -111,6 +109,7 @@
</descriptorRefs> </descriptorRefs>
<finalName>vadere-console</finalName> <finalName>vadere-console</finalName>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment