Skip to content

Commit c2f0fb1

Browse files
author
jwilk79
committed
create release 12.0
1 parent 3047d3a commit c2f0fb1

File tree

80 files changed

+2998
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2998
-114
lines changed

‎benchmark/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.matsim</groupId>
55
<artifactId>matsim-benchmark</artifactId>
66
<packaging>jar</packaging>
7-
<version>12.0-SNAPSHOT</version>
7+
<version>12.0</version>
88
<name>MATSim Benchmark</name>
99
<distributionManagement>
1010
<repository>
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>org.matsim</groupId>
6464
<artifactId>matsim</artifactId>
65-
<version>12.0-SNAPSHOT</version>
65+
<version>12.0</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.matsim</groupId>
6969
<artifactId>matsim-examples</artifactId>
70-
<version>12.0-SNAPSHOT</version>
70+
<version>12.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>junit</groupId>

‎benchmark/pom.xml.versionsBackup

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.matsim</groupId>
5+
<artifactId>matsim-benchmark</artifactId>
6+
<packaging>jar</packaging>
7+
<version>12.0-SNAPSHOT</version>
8+
<name>MATSim Benchmark</name>
9+
<distributionManagement>
10+
<repository>
11+
<id>bintray</id>
12+
<url>https://api.bintray.com/maven/matsim/matsim/matsim</url>
13+
</repository>
14+
<snapshotRepository>
15+
<id>oss-jfrog-artifactory</id>
16+
<name>artifactory-snapshots</name>
17+
<url>https://oss.jfrog.org/oss-snapshot-local</url>
18+
</snapshotRepository>
19+
</distributionManagement>
20+
<build>
21+
<plugins>
22+
<plugin>
23+
<artifactId>maven-jar-plugin</artifactId>
24+
<version>3.2.0</version>
25+
<configuration>
26+
<archive>
27+
<manifest>
28+
<addClasspath>true</addClasspath>
29+
<classpathPrefix>libs/</classpathPrefix>
30+
<mainClass>org.matsim.benchmark.Benchmark</mainClass>
31+
</manifest>
32+
</archive>
33+
</configuration>
34+
</plugin>
35+
<plugin>
36+
<artifactId>maven-assembly-plugin</artifactId>
37+
<configuration>
38+
<descriptors>
39+
<descriptor>src/main/assembly/benchmark.xml</descriptor>
40+
</descriptors>
41+
<attach>false</attach>
42+
</configuration>
43+
<executions>
44+
<execution>
45+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
46+
<phase>package</phase> <!-- bind to the packaging phase -->
47+
<goals>
48+
<goal>single</goal>
49+
</goals>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-javadoc-plugin</artifactId>
56+
<version>3.1.1</version>
57+
</plugin>
58+
</plugins>
59+
</build>
60+
61+
<dependencies>
62+
<dependency>
63+
<groupId>org.matsim</groupId>
64+
<artifactId>matsim</artifactId>
65+
<version>12.0-SNAPSHOT</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.matsim</groupId>
69+
<artifactId>matsim-examples</artifactId>
70+
<version>12.0-SNAPSHOT</version>
71+
</dependency>
72+
<dependency>
73+
<groupId>junit</groupId>
74+
<artifactId>junit</artifactId>
75+
<version>4.13</version>
76+
<scope>test</scope>
77+
</dependency>
78+
</dependencies>
79+
80+
<properties>
81+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
82+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
83+
<maven.compiler.source>11</maven.compiler.source>
84+
<maven.compiler.target>11</maven.compiler.target>
85+
</properties>
86+
87+
</project>

‎contribs/accessibility/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.matsim</groupId>
44
<artifactId>contrib</artifactId>
5-
<version>12.0-SNAPSHOT</version>
5+
<version>12.0</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>org.matsim.contrib</groupId>
@@ -42,12 +42,12 @@
4242
<dependency>
4343
<groupId>org.matsim.contrib</groupId>
4444
<artifactId>matrixbasedptrouter</artifactId>
45-
<version>12.0-SNAPSHOT</version>
45+
<version>12.0</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.matsim.contrib</groupId>
4949
<artifactId>roadpricing</artifactId>
50-
<version>12.0-SNAPSHOT</version>
50+
<version>12.0</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>net.sf.trove4j</groupId>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>org.matsim.contrib</groupId>
7777
<artifactId>analysis</artifactId>
78-
<version>12.0-SNAPSHOT</version>
78+
<version>12.0</version>
7979
</dependency>
8080
<!-- <dependency>-->
8181
<!-- <groupId>org.matsim.contrib</groupId>-->

‎contribs/accessibility/pom.xml.versionsBackup

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<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">
2+
<parent>
3+
<groupId>org.matsim</groupId>
4+
<artifactId>contrib</artifactId>
5+
<version>12.0-SNAPSHOT</version>
6+
</parent>
7+
<modelVersion>4.0.0</modelVersion>
8+
<groupId>org.matsim.contrib</groupId>
9+
<artifactId>accessibility</artifactId>
10+
<name>accessibility</name>
11+
<build>
12+
<resources>
13+
<resource>
14+
<directory>src/main/resources</directory>
15+
<excludes>
16+
<exclude>**/revision.txt</exclude>
17+
</excludes>
18+
</resource>
19+
<resource>
20+
<directory>src/main/resources</directory>
21+
<includes>
22+
<include>**/revision.txt</include>
23+
</includes>
24+
<filtering>true</filtering>
25+
</resource>
26+
</resources>
27+
<plugins>
28+
<plugin>
29+
<artifactId>maven-assembly-plugin</artifactId>
30+
</plugin>
31+
</plugins>
32+
</build>
33+
34+
<repositories>
35+
<repository>
36+
<id>jitpack.io</id>
37+
<url>https://jitpack.io</url>
38+
</repository>
39+
</repositories>
40+
41+
<dependencies>
42+
<dependency>
43+
<groupId>org.matsim.contrib</groupId>
44+
<artifactId>matrixbasedptrouter</artifactId>
45+
<version>12.0-SNAPSHOT</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.matsim.contrib</groupId>
49+
<artifactId>roadpricing</artifactId>
50+
<version>12.0-SNAPSHOT</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>net.sf.trove4j</groupId>
54+
<artifactId>trove4j</artifactId>
55+
<version>3.0.3</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.openstreetmap.osmosis</groupId>
59+
<artifactId>osmosis-core</artifactId>
60+
<version>0.47</version>
61+
<exclusions>
62+
<!-- needed to compile in IntelliJ with Eclipse compiler -->
63+
<!-- see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 -->
64+
<exclusion>
65+
<artifactId>xml-apis</artifactId>
66+
<groupId>xml-apis</groupId>
67+
</exclusion>
68+
</exclusions>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.openstreetmap.osmosis</groupId>
72+
<artifactId>osmosis-xml</artifactId>
73+
<version>0.47</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.matsim.contrib</groupId>
77+
<artifactId>analysis</artifactId>
78+
<version>12.0-SNAPSHOT</version>
79+
</dependency>
80+
<!-- <dependency>-->
81+
<!-- <groupId>org.matsim.contrib</groupId>-->
82+
<!-- <artifactId>dvrp</artifactId>-->
83+
<!-- <version>12.0-SNAPSHOT</version>-->
84+
<!-- </dependency>-->
85+
<dependency>
86+
<groupId>org.apache.commons</groupId>
87+
<artifactId>commons-math</artifactId>
88+
<version>2.2</version>
89+
</dependency>
90+
<!-- This dependency is required to be able to push to the GeoServer -->
91+
<dependency>
92+
<groupId>org.geotools.jdbc</groupId>
93+
<artifactId>gt-jdbc-postgis</artifactId>
94+
<version>21.5</version>
95+
</dependency>
96+
</dependencies>
97+
</project>

‎contribs/accidents/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<groupId>org.matsim</groupId>
44
<artifactId>contrib</artifactId>
5-
<version>12.0-SNAPSHOT</version>
5+
<version>12.0</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88
<groupId>org.matsim.contrib</groupId>

‎contribs/accidents/pom.xml.versionsBackup

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<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">
2+
<parent>
3+
<groupId>org.matsim</groupId>
4+
<artifactId>contrib</artifactId>
5+
<version>12.0-SNAPSHOT</version>
6+
</parent>
7+
<modelVersion>4.0.0</modelVersion>
8+
<groupId>org.matsim.contrib</groupId>
9+
<artifactId>accidents</artifactId>
10+
<name>accidents</name>
11+
12+
<dependencies>
13+
<!-- This dependency is required to be able to push to the GeoServer -->
14+
<dependency>
15+
<groupId>org.geotools.jdbc</groupId>
16+
<artifactId>gt-jdbc-postgis</artifactId>
17+
<version>21.5</version>
18+
</dependency>
19+
20+
</dependencies>
21+
22+
</project>

‎contribs/analysis/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.matsim</groupId>
55
<artifactId>contrib</artifactId>
6-
<version>12.0-SNAPSHOT</version>
6+
<version>12.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>org.matsim.contrib</groupId>
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.matsim.contrib</groupId>
2222
<artifactId>roadpricing</artifactId>
23-
<version>12.0-SNAPSHOT</version>
23+
<version>12.0</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>org.osgeo</groupId>

‎contribs/analysis/pom.xml.versionsBackup

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<groupId>org.matsim</groupId>
5+
<artifactId>contrib</artifactId>
6+
<version>12.0-SNAPSHOT</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<groupId>org.matsim.contrib</groupId>
10+
<artifactId>analysis</artifactId>
11+
<name>analysis</name>
12+
<build>
13+
<plugins>
14+
<plugin>
15+
<artifactId>maven-assembly-plugin</artifactId>
16+
</plugin>
17+
</plugins>
18+
</build>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.matsim.contrib</groupId>
22+
<artifactId>roadpricing</artifactId>
23+
<version>12.0-SNAPSHOT</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>org.osgeo</groupId>
27+
<artifactId>proj4j</artifactId>
28+
<version>0.1.0</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.googlecode.json-simple</groupId>
32+
<artifactId>json-simple</artifactId>
33+
<version>1.1.1</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>org.apache.commons</groupId>
37+
<artifactId>commons-math3</artifactId>
38+
<version>3.6.1</version>
39+
</dependency>
40+
</dependencies>
41+
</project>

‎contribs/av/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.matsim</groupId>
55
<artifactId>contrib</artifactId>
6-
<version>12.0-SNAPSHOT</version>
6+
<version>12.0</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>org.matsim.contrib</groupId>
@@ -23,19 +23,19 @@
2323
<dependency>
2424
<groupId>org.matsim.contrib</groupId>
2525
<artifactId>dvrp</artifactId>
26-
<version>12.0-SNAPSHOT</version>
26+
<version>12.0</version>
2727
<scope>compile</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.matsim.contrib</groupId>
3131
<artifactId>taxi</artifactId>
32-
<version>12.0-SNAPSHOT</version>
32+
<version>12.0</version>
3333
<scope>compile</scope>
3434
</dependency>
3535
<dependency>
3636
<groupId>org.matsim.contrib</groupId>
3737
<artifactId>drt</artifactId>
38-
<version>12.0-SNAPSHOT</version>
38+
<version>12.0</version>
3939
<scope>compile</scope>
4040
</dependency>
4141
</dependencies>

0 commit comments

Comments
 (0)