Commit eb781bf0 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Merge branch 'master' into event_handling

parents 4e897cbb f19ebb38
Pipeline #94816 failed with stages
in 126 minutes and 26 seconds
......@@ -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
......
......@@ -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).
......
......@@ -16,7 +16,7 @@ import javax.lang.model.element.TypeElement;
@SupportedAnnotationTypes("org.vadere.annotation.factories.attributes.ModelAttributeClass")
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@AutoService(Processor.class)
public class BaseAttributeFactoryProcessor extends BaseFactoryProcessor {
......
......@@ -14,7 +14,7 @@ import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
@SupportedAnnotationTypes("org.vadere.annotation.factories.dataprocessors.DataProcessorClass")
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@AutoService(Processor.class)
public class DataProcessorFactoryProcessor extends BaseFactoryProcessor {
......
......@@ -15,7 +15,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.type.MirroredTypeException;
@SupportedAnnotationTypes("org.vadere.annotation.factories.migrationassistant.MigrationTransformation")
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@AutoService(Processor.class)
public class JoltTransformationFactoryProcessor extends BaseFactoryProcessor {
@Override
......
......@@ -21,7 +21,7 @@ import javax.lang.model.element.TypeElement;
import javax.tools.JavaFileObject;
@SupportedAnnotationTypes({"org.vadere.annotation.factories.models.ModelClass"})
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@AutoService(Processor.class)
public class ModelFactoryProcessor extends AbstractFactoryProcessor {
......
......@@ -15,7 +15,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.type.MirroredTypeException;
@SupportedAnnotationTypes("org.vadere.annotation.factories.outputfiles.OutputFileClass")
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@SupportedSourceVersion(SourceVersion.RELEASE_11)
@AutoService(Processor.class)
public class OutputFileFactoryProcessor extends BaseFactoryProcessor {
......
......@@ -69,15 +69,13 @@
</plugin>
<plugin>
<!-- NOTE: We don't need a groupId specification because the group is
org.apache.maven.plugins ...which is assumed by default.
-->
<!-- Use default groupId "org.apache.maven.plugins" -->
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>build-vadere</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<id>build-vadere-gui</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
......@@ -90,13 +88,14 @@
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>vadere</finalName>
<finalName>vadere-gui</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration>
</execution>
<execution>
<id>build-postVis</id> <!-- this is used for inheritance merges -->
<phase>package</phase> <!-- bind to the packaging phase -->
<id>build-vadere-postvis</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
......@@ -109,8 +108,9 @@
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>postvis</finalName>
<finalName>vadere-postvis</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration>
</execution>
</executions>
......
......@@ -54,7 +54,7 @@
<version>1.6.0</version>
<executions>
<execution>
<id>write_version_control_info_to_file</id>
<id>write-version-control-info-to-file</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
......@@ -88,9 +88,7 @@
</configuration>
</plugin>
<plugin>
<!-- NOTE: We don't need a groupId specification because the group is
org.apache.maven.plugins ...which is assumed by default.
-->
<!-- Use default groupId "org.apache.maven.plugins" -->
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<executions>
......@@ -111,6 +109,7 @@
</descriptorRefs>
<finalName>vadere-console</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
</configuration>
</execution>
</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