Skip to content

Commit

Permalink
create release 12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jwilk79 committed Jun 4, 2020
1 parent 3047d3a commit c2f0fb1
Show file tree
Hide file tree
Showing 80 changed files with 2,998 additions and 114 deletions.
6 changes: 3 additions & 3 deletions benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.matsim</groupId>
<artifactId>matsim-benchmark</artifactId>
<packaging>jar</packaging>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
<name>MATSim Benchmark</name>
<distributionManagement>
<repository>
Expand Down Expand Up @@ -62,12 +62,12 @@
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
87 changes: 87 additions & 0 deletions benchmark/pom.xml.versionsBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim</groupId>
<artifactId>matsim-benchmark</artifactId>
<packaging>jar</packaging>
<version>12.0-SNAPSHOT</version>
<name>MATSim Benchmark</name>
<distributionManagement>
<repository>
<id>bintray</id>
<url>https://api.bintray.com/maven/matsim/matsim/matsim</url>
</repository>
<snapshotRepository>
<id>oss-jfrog-artifactory</id>
<name>artifactory-snapshots</name>
<url>https://oss.jfrog.org/oss-snapshot-local</url>
</snapshotRepository>
</distributionManagement>
<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>libs/</classpathPrefix>
<mainClass>org.matsim.benchmark.Benchmark</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/benchmark.xml</descriptor>
</descriptors>
<attach>false</attach>
</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-javadoc-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

</project>
8 changes: 4 additions & 4 deletions contribs/accessibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand Down Expand Up @@ -42,12 +42,12 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>matrixbasedptrouter</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<dependency>
<groupId>net.sf.trove4j</groupId>
Expand Down Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.matsim.contrib</groupId>-->
Expand Down
97 changes: 97 additions & 0 deletions contribs/accessibility/pom.xml.versionsBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
<artifactId>accessibility</artifactId>
<name>accessibility</name>
<build>
<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>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>

<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>matrixbasedptrouter</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.trove4j</groupId>
<artifactId>trove4j</artifactId>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-core</artifactId>
<version>0.47</version>
<exclusions>
<!-- needed to compile in IntelliJ with Eclipse compiler -->
<!-- see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 -->
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.openstreetmap.osmosis</groupId>
<artifactId>osmosis-xml</artifactId>
<version>0.47</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.matsim.contrib</groupId>-->
<!-- <artifactId>dvrp</artifactId>-->
<!-- <version>12.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>2.2</version>
</dependency>
<!-- This dependency is required to be able to push to the GeoServer -->
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>21.5</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion contribs/accidents/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand Down
22 changes: 22 additions & 0 deletions contribs/accidents/pom.xml.versionsBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
<artifactId>accidents</artifactId>
<name>accidents</name>

<dependencies>
<!-- This dependency is required to be able to push to the GeoServer -->
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-postgis</artifactId>
<version>21.5</version>
</dependency>

</dependencies>

</project>
4 changes: 2 additions & 2 deletions contribs/analysis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</dependency>
<dependency>
<groupId>org.osgeo</groupId>
Expand Down
41 changes: 41 additions & 0 deletions contribs/analysis/pom.xml.versionsBackup
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<name>analysis</name>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgeo</groupId>
<artifactId>proj4j</artifactId>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions contribs/av/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -23,19 +23,19 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>taxi</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>12.0-SNAPSHOT</version>
<version>12.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Loading

0 comments on commit c2f0fb1

Please sign in to comment.