-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into trampa_synpop
# Conflicts: # siloCore/pom.xml # useCases/munich/src/main/java/de/tum/bgu/msm/io/JobWriterMuc.java
- Loading branch information
Showing
237 changed files
with
163,373 additions
and
149,614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: Cloudsmith Deployment | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '0 1 * * 1' | ||
|
|
||
|
|
||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| distribution: 'adopt' # See 'Supported distributions' for available options | ||
| java-version: '11' | ||
| - name: Cache Maven packages | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.m2 | ||
| key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: ${{ runner.os }}-m2 | ||
| - name: Build with Maven | ||
| run: mvn test -DforkMode=always --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true | ||
|
|
||
| - name: Set up Cloudsmith | ||
| uses: actions/setup-java@v2 | ||
| with: # running setup-java again overwrites the settings.xml | ||
| distribution: 'adopt' # See 'Supported distributions' for available options | ||
| java-version: '11' | ||
| server-id: msm # Value of the distributionManagement/repository/id field of the pom.xml | ||
| server-username: CLOUDSMITH_USERNAME # env variable for username in deploy | ||
| server-password: CLOUDSMITH_TOKEN # env variable for token in deploy | ||
|
|
||
| - name: Publish to Cloudsmith | ||
| run: mvn deploy -DskipTests=true --fail-at-end --batch-mode -Dmatsim.preferLocalDtds=true | ||
| env: | ||
| CLOUDSMITH_USERNAME: nico-kuhnel | ||
| CLOUDSMITH_TOKEN: ${{ secrets.cloudsmithToken }} | ||
|
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,184 +4,16 @@ | |
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <artifactId>silo-parent</artifactId> | ||
| <groupId>com.github.msmobility</groupId> | ||
| <groupId>de.tum.bgu.msm</groupId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>analysis</artifactId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
|
|
||
| <name>SILO analysis module</name> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| <description>SILO analysis module</description> | ||
| <url>silo.zone</url> | ||
| <inceptionYear>2018</inceptionYear> | ||
| <licenses> | ||
| <license> | ||
| <name>GNU General Public License</name> | ||
| <url>${basedir}/LICENSE</url> | ||
| </license> | ||
| </licenses> | ||
| <scm> | ||
| <url>https://github.com/moeckel/silo</url> | ||
| <connection>scm:git:git://github.com/msmobility/silo.git</connection> | ||
| <developerConnection>scm:git:[email protected]:msmobility/silo.git</developerConnection> | ||
| </scm> | ||
| <distributionManagement> | ||
| <snapshotRepository> | ||
| <id>oss-jfrog-artifactory</id> | ||
| <name>artifactory-snapshots</name> | ||
| <url>http://oss.jfrog.org/oss-snapshot-local</url> | ||
| </snapshotRepository> | ||
| </distributionManagement> | ||
| <build> | ||
| <defaultGoal>compiler:compile</defaultGoal> | ||
| <resources> | ||
| <resource> | ||
| <directory>src/main/resources</directory> | ||
| <excludes> | ||
| <exclude>revision.txt</exclude> | ||
| </excludes> | ||
| </resource> | ||
| <resource> | ||
| <directory>src/main/resources</directory> | ||
| <includes> | ||
| <include>revision.txt</include> | ||
| </includes> | ||
| <filtering>true</filtering> | ||
| </resource> | ||
| </resources> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>buildnumber-maven-plugin</artifactId> | ||
| <version>1.0</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>validate</phase> | ||
| <goals> | ||
| <goal>create</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <doCheck>false</doCheck> | ||
| <doUpdate>false</doUpdate> | ||
| <revisionOnScmFailure>unknown</revisionOnScmFailure> | ||
| <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.8.0</version> | ||
| <configuration> | ||
| <release>8</release> | ||
| <source>1.8</source> | ||
| <target>1.8</target> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.8</version> | ||
| <configuration> | ||
| <excludes> | ||
| <exclude>**/*$*</exclude> <!-- exclude all inner classes --> | ||
| </excludes> | ||
|
|
||
| <!--execute each test in separate JVM (slow, but otherwise it does not--> | ||
| <!--work, and no problem as long as there are only integration tests):--> | ||
| <forkMode>always</forkMode> | ||
|
|
||
| <!-- avoid out of memory errors: --> | ||
| <argLine>-Xmx2000m -Djava.awt.headless=true | ||
|
|
||
| -Dmatsim.preferLocalDtds=true -Dncsa.hdf.hdf5lib.H5.hdf5lib=${hdf5lib-absolute-path}</argLine> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>2.3.1</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>test-jar</goal> | ||
| </goals> | ||
| <configuration> | ||
| <skip>${skipTestJar}</skip> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <!-- <plugin> | ||
| <groupId>com.igormaznitsa</groupId> | ||
| <artifactId>jute</artifactId> | ||
| <version>1.1.1</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>jute</goal> | ||
| </goals> | ||
| <configuration> | ||
| <verbose>true</verbose> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| --> | ||
| <plugin> | ||
| <!-- Usage (change version numbers, of course) mvn release:prepare -Darguments="-DskipTests | ||
| -Pbintray" -DreleaseVersion=0.7.1 -DdevelopmentVersion=0.7.2-SNAPSHOT -B | ||
| mvn release:perform -Darguments="-DskipTests -Pbintray" -DreleaseVersion=0.7.1 | ||
| -DdevelopmentVersion=0.7.2-SNAPSHOT -B --> | ||
| <artifactId>maven-release-plugin</artifactId> | ||
| <version>2.5.1</version> | ||
| </plugin> | ||
| <plugin> <!-- plugin to generate sources, which are used when deploying via jitpack. kai, nov'16 --> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-source-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-sources</id> | ||
| <goals> | ||
| <goal>jar</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <version>2.10.1</version> | ||
| <configuration> | ||
| <quiet>true</quiet> | ||
| <header>SILO API</header> | ||
| <groups> | ||
| <group> | ||
| <title>all</title> | ||
| <packages>de.tum.bgu.msm:de.tum.bgu.msm.*</packages> | ||
| </group> | ||
| </groups> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| <reporting> | ||
| <!-- this plugin generates a html test report --> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-report-plugin</artifactId> | ||
| <version>2.8</version> | ||
| </plugin> | ||
| </plugins> | ||
| </reporting> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
|
|
@@ -192,30 +24,22 @@ | |
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.msmobility</groupId> | ||
| <groupId>de.tum.bgu.msm</groupId> | ||
| <artifactId>siloCore</artifactId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.msmobility</groupId> | ||
| <groupId>de.tum.bgu.msm</groupId> | ||
| <artifactId>munich</artifactId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.github.msmobility</groupId> | ||
| <groupId>de.tum.bgu.msm</groupId> | ||
| <artifactId>kagawa</artifactId> | ||
| <version>0.1.0-SNAPSHOT</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| <svnRevision>${buildNumber}</svnRevision> | ||
| <geotools.version>21.5</geotools.version> | ||
| <skipTestJar>false</skipTestJar> <!--Overridden in the bintray profile--> | ||
| <matsimVersion>13.0-2020w37-SNAPSHOT</matsimVersion> | ||
| <jackson.version>2.9.5</jackson.version> | ||
| </properties> | ||
| </project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/SiloMatsimUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.