diff --git a/benchmark/pom.xml b/benchmark/pom.xml index b83d82eea5c..dd32576d58d 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -4,7 +4,7 @@ org.matsim matsim-benchmark jar - 12.0-SNAPSHOT + 12.0 MATSim Benchmark @@ -62,12 +62,12 @@ org.matsim matsim - 12.0-SNAPSHOT + 12.0 org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 junit diff --git a/benchmark/pom.xml.versionsBackup b/benchmark/pom.xml.versionsBackup new file mode 100644 index 00000000000..b83d82eea5c --- /dev/null +++ b/benchmark/pom.xml.versionsBackup @@ -0,0 +1,87 @@ + + + 4.0.0 + org.matsim + matsim-benchmark + jar + 12.0-SNAPSHOT + MATSim Benchmark + + + bintray + https://api.bintray.com/maven/matsim/matsim/matsim + + + oss-jfrog-artifactory + artifactory-snapshots + https://oss.jfrog.org/oss-snapshot-local + + + + + + maven-jar-plugin + 3.2.0 + + + + true + libs/ + org.matsim.benchmark.Benchmark + + + + + + maven-assembly-plugin + + + src/main/assembly/benchmark.xml + + false + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + + + + + org.matsim + matsim + 12.0-SNAPSHOT + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + + + junit + junit + 4.13 + test + + + + + UTF-8 + UTF-8 + 11 + 11 + + + diff --git a/contribs/accessibility/pom.xml b/contribs/accessibility/pom.xml index 830d248a196..cd894d60eba 100644 --- a/contribs/accessibility/pom.xml +++ b/contribs/accessibility/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -42,12 +42,12 @@ org.matsim.contrib matrixbasedptrouter - 12.0-SNAPSHOT + 12.0 org.matsim.contrib roadpricing - 12.0-SNAPSHOT + 12.0 net.sf.trove4j @@ -75,7 +75,7 @@ org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/accessibility/pom.xml.versionsBackup b/contribs/accessibility/pom.xml.versionsBackup new file mode 100644 index 00000000000..830d248a196 --- /dev/null +++ b/contribs/accessibility/pom.xml.versionsBackup @@ -0,0 +1,97 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + accessibility + accessibility + + + + src/main/resources + + **/revision.txt + + + + src/main/resources + + **/revision.txt + + true + + + + + maven-assembly-plugin + + + + + + + jitpack.io + https://jitpack.io + + + + + + org.matsim.contrib + matrixbasedptrouter + 12.0-SNAPSHOT + + + org.matsim.contrib + roadpricing + 12.0-SNAPSHOT + + + net.sf.trove4j + trove4j + 3.0.3 + + + org.openstreetmap.osmosis + osmosis-core + 0.47 + + + + + xml-apis + xml-apis + + + + + org.openstreetmap.osmosis + osmosis-xml + 0.47 + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + + + + + + + + org.apache.commons + commons-math + 2.2 + + + + org.geotools.jdbc + gt-jdbc-postgis + 21.5 + + + diff --git a/contribs/accidents/pom.xml b/contribs/accidents/pom.xml index 4d77f29c7e2..57c4b4d51cb 100644 --- a/contribs/accidents/pom.xml +++ b/contribs/accidents/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/accidents/pom.xml.versionsBackup b/contribs/accidents/pom.xml.versionsBackup new file mode 100644 index 00000000000..4d77f29c7e2 --- /dev/null +++ b/contribs/accidents/pom.xml.versionsBackup @@ -0,0 +1,22 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + accidents + accidents + + + + + org.geotools.jdbc + gt-jdbc-postgis + 21.5 + + + + + diff --git a/contribs/analysis/pom.xml b/contribs/analysis/pom.xml index 7c4f708f924..a43e9da27f2 100644 --- a/contribs/analysis/pom.xml +++ b/contribs/analysis/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -20,7 +20,7 @@ org.matsim.contrib roadpricing - 12.0-SNAPSHOT + 12.0 org.osgeo diff --git a/contribs/analysis/pom.xml.versionsBackup b/contribs/analysis/pom.xml.versionsBackup new file mode 100644 index 00000000000..7c4f708f924 --- /dev/null +++ b/contribs/analysis/pom.xml.versionsBackup @@ -0,0 +1,41 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + analysis + analysis + + + + maven-assembly-plugin + + + + + + org.matsim.contrib + roadpricing + 12.0-SNAPSHOT + + + org.osgeo + proj4j + 0.1.0 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.apache.commons + commons-math3 + 3.6.1 + + + diff --git a/contribs/av/pom.xml b/contribs/av/pom.xml index 12a9de5476e..3baeb08ef2c 100644 --- a/contribs/av/pom.xml +++ b/contribs/av/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -23,19 +23,19 @@ org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 compile org.matsim.contrib taxi - 12.0-SNAPSHOT + 12.0 compile org.matsim.contrib drt - 12.0-SNAPSHOT + 12.0 compile diff --git a/contribs/av/pom.xml.versionsBackup b/contribs/av/pom.xml.versionsBackup new file mode 100644 index 00000000000..12a9de5476e --- /dev/null +++ b/contribs/av/pom.xml.versionsBackup @@ -0,0 +1,43 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + av + av + + + + + maven-assembly-plugin + + + + + + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + compile + + + org.matsim.contrib + taxi + 12.0-SNAPSHOT + compile + + + org.matsim.contrib + drt + 12.0-SNAPSHOT + compile + + + + diff --git a/contribs/bicycle/pom.xml b/contribs/bicycle/pom.xml index 41001ab512c..4bdb9e64684 100644 --- a/contribs/bicycle/pom.xml +++ b/contribs/bicycle/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -17,7 +17,7 @@ org.matsim.contrib osm - 12.0-SNAPSHOT + 12.0 compile diff --git a/contribs/bicycle/pom.xml.versionsBackup b/contribs/bicycle/pom.xml.versionsBackup new file mode 100644 index 00000000000..41001ab512c --- /dev/null +++ b/contribs/bicycle/pom.xml.versionsBackup @@ -0,0 +1,24 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + bicycle + bicycle + + + org.geotools + gt-geotiff + 21.5 + + + org.matsim.contrib + osm + 12.0-SNAPSHOT + compile + + + diff --git a/contribs/cadytsIntegration/pom.xml b/contribs/cadytsIntegration/pom.xml index 8dfdca886f8..2ad54df921d 100644 --- a/contribs/cadytsIntegration/pom.xml +++ b/contribs/cadytsIntegration/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -24,12 +24,12 @@ org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test diff --git a/contribs/cadytsIntegration/pom.xml.versionsBackup b/contribs/cadytsIntegration/pom.xml.versionsBackup new file mode 100644 index 00000000000..8dfdca886f8 --- /dev/null +++ b/contribs/cadytsIntegration/pom.xml.versionsBackup @@ -0,0 +1,39 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + cadytsIntegration + cadytsIntegration + + + + maven-assembly-plugin + + + + + + cadyts + cadyts + 1.1.0 + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + + 2012 + Provides integration of MATSim with Cadyts for automated calibration. + diff --git a/contribs/carsharing/pom.xml b/contribs/carsharing/pom.xml index d9224935b1d..148a23a43b0 100644 --- a/contribs/carsharing/pom.xml +++ b/contribs/carsharing/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -19,7 +19,7 @@ org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/carsharing/pom.xml.versionsBackup b/contribs/carsharing/pom.xml.versionsBackup new file mode 100644 index 00000000000..d9224935b1d --- /dev/null +++ b/contribs/carsharing/pom.xml.versionsBackup @@ -0,0 +1,25 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + carsharing + carsharing + + + + maven-assembly-plugin + + + + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + diff --git a/contribs/commercialTrafficApplications/pom.xml b/contribs/commercialTrafficApplications/pom.xml index eba79ef44b0..a9bdae5f7fa 100644 --- a/contribs/commercialTrafficApplications/pom.xml +++ b/contribs/commercialTrafficApplications/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -14,13 +14,13 @@ org.matsim.contrib freight - 12.0-SNAPSHOT + 12.0 org.matsim.contrib drt - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/commercialTrafficApplications/pom.xml.versionsBackup b/contribs/commercialTrafficApplications/pom.xml.versionsBackup new file mode 100644 index 00000000000..eba79ef44b0 --- /dev/null +++ b/contribs/commercialTrafficApplications/pom.xml.versionsBackup @@ -0,0 +1,27 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + commercialTrafficApplications + commercialTrafficApplications + + + + + org.matsim.contrib + freight + 12.0-SNAPSHOT + + + + org.matsim.contrib + drt + 12.0-SNAPSHOT + + + + diff --git a/contribs/common/pom.xml b/contribs/common/pom.xml index d2eda5bb446..622be02ea07 100644 --- a/contribs/common/pom.xml +++ b/contribs/common/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/common/pom.xml.versionsBackup b/contribs/common/pom.xml.versionsBackup new file mode 100644 index 00000000000..d2eda5bb446 --- /dev/null +++ b/contribs/common/pom.xml.versionsBackup @@ -0,0 +1,31 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + common + common + + + + maven-assembly-plugin + + + + + + org.apache.commons + commons-math + 2.2 + + + commons-lang + commons-lang + 2.6 + + + diff --git a/contribs/decongestion/pom.xml b/contribs/decongestion/pom.xml index 572d50a9884..168002853b4 100644 --- a/contribs/decongestion/pom.xml +++ b/contribs/decongestion/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/decongestion/pom.xml.versionsBackup b/contribs/decongestion/pom.xml.versionsBackup new file mode 100644 index 00000000000..572d50a9884 --- /dev/null +++ b/contribs/decongestion/pom.xml.versionsBackup @@ -0,0 +1,18 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + decongestion + decongestion + + + + maven-assembly-plugin + + + + diff --git a/contribs/discrete_mode_choice/pom.xml b/contribs/discrete_mode_choice/pom.xml index c10260465b9..eff918ac294 100644 --- a/contribs/discrete_mode_choice/pom.xml +++ b/contribs/discrete_mode_choice/pom.xml @@ -9,7 +9,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/discrete_mode_choice/pom.xml.versionsBackup b/contribs/discrete_mode_choice/pom.xml.versionsBackup new file mode 100644 index 00000000000..c10260465b9 --- /dev/null +++ b/contribs/discrete_mode_choice/pom.xml.versionsBackup @@ -0,0 +1,30 @@ + + 4.0.0 + org.matsim.contrib + discrete_mode_choice + Discrete Mode Choice + + + org.matsim + contrib + 12.0-SNAPSHOT + + + + + org.apache.commons + commons-math3 + 3.6.1 + + + + + + + maven-assembly-plugin + + + + diff --git a/contribs/drt/pom.xml b/contribs/drt/pom.xml index 22bb41867d4..ebb202dc288 100644 --- a/contribs/drt/pom.xml +++ b/contribs/drt/pom.xml @@ -4,7 +4,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -22,13 +22,13 @@ org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 org.matsim.contrib ev - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/drt/pom.xml.versionsBackup b/contribs/drt/pom.xml.versionsBackup new file mode 100644 index 00000000000..22bb41867d4 --- /dev/null +++ b/contribs/drt/pom.xml.versionsBackup @@ -0,0 +1,41 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + drt + drt + + + + maven-assembly-plugin + + + + + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + + org.matsim.contrib + ev + 12.0-SNAPSHOT + + + + org.assertj + assertj-core + 3.15.0 + test + + + diff --git a/contribs/dvrp/pom.xml b/contribs/dvrp/pom.xml index 0ef8d532339..35f0c48e569 100644 --- a/contribs/dvrp/pom.xml +++ b/contribs/dvrp/pom.xml @@ -4,7 +4,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -32,12 +32,12 @@ org.matsim.contrib otfvis - 12.0-SNAPSHOT + 12.0 org.matsim.contrib locationchoice - 12.0-SNAPSHOT + 12.0 org.apache.commons diff --git a/contribs/dvrp/pom.xml.versionsBackup b/contribs/dvrp/pom.xml.versionsBackup new file mode 100644 index 00000000000..0ef8d532339 --- /dev/null +++ b/contribs/dvrp/pom.xml.versionsBackup @@ -0,0 +1,65 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + dvrp + dvrp + + + + maven-assembly-plugin + + + + + + + org.apache.commons + commons-lang3 + 3.9 + + + com.google.guava + guava + 28.2-jre + + + org.matsim.contrib + otfvis + 12.0-SNAPSHOT + + + org.matsim.contrib + locationchoice + 12.0-SNAPSHOT + + + org.apache.commons + commons-math3 + 3.6.1 + + + com.opencsv + opencsv + 5.1 + + + one.util + streamex + 0.7.2 + + + org.assertj + assertj-core + 3.15.0 + test + + + + diff --git a/contribs/emissions/pom.xml b/contribs/emissions/pom.xml index c5ee9f11c9b..b1141424f62 100644 --- a/contribs/emissions/pom.xml +++ b/contribs/emissions/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 @@ -63,7 +63,7 @@ org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 com.fasterxml.jackson.core diff --git a/contribs/emissions/pom.xml.versionsBackup b/contribs/emissions/pom.xml.versionsBackup new file mode 100644 index 00000000000..c5ee9f11c9b --- /dev/null +++ b/contribs/emissions/pom.xml.versionsBackup @@ -0,0 +1,80 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + + 4.0.0 + org.matsim.contrib + emissions + emissions + + + + unidata-all + Unidata All + https://artifacts.unidata.ucar.edu/repository/unidata-all/ + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + true + libs/ + emissions.example.RunEmissionToolOfflineExample + + + + + + maven-assembly-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + **/*$* + org/matsim/testcases/MatsimTestCase.java + + 1 + false + + -Xmx700m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true + + + + + + + + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + + + com.fasterxml.jackson.core + jackson-databind + 2.10.2 + + + edu.ucar + cdm + 5.0.0 + compile + + + diff --git a/contribs/ev/pom.xml b/contribs/ev/pom.xml index cefda373a3c..0839c596628 100644 --- a/contribs/ev/pom.xml +++ b/contribs/ev/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -20,7 +20,7 @@ org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/ev/pom.xml.versionsBackup b/contribs/ev/pom.xml.versionsBackup new file mode 100644 index 00000000000..cefda373a3c --- /dev/null +++ b/contribs/ev/pom.xml.versionsBackup @@ -0,0 +1,38 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + ev + ev + + + + maven-assembly-plugin + + + + + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + + org.assertj + assertj-core + 3.15.0 + test + + + org.apache.commons + commons-csv + 1.8 + + + diff --git a/contribs/eventsBasedPTRouter/pom.xml b/contribs/eventsBasedPTRouter/pom.xml index 1659781aad5..d5e8a61fdb6 100644 --- a/contribs/eventsBasedPTRouter/pom.xml +++ b/contribs/eventsBasedPTRouter/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/eventsBasedPTRouter/pom.xml.versionsBackup b/contribs/eventsBasedPTRouter/pom.xml.versionsBackup new file mode 100644 index 00000000000..1659781aad5 --- /dev/null +++ b/contribs/eventsBasedPTRouter/pom.xml.versionsBackup @@ -0,0 +1,18 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + eventsBasedPTRouter + eventsBasedPTRouter + + + + maven-assembly-plugin + + + + diff --git a/contribs/freight/pom.xml b/contribs/freight/pom.xml index e6c6cc65550..817eb504384 100644 --- a/contribs/freight/pom.xml +++ b/contribs/freight/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/freight/pom.xml.versionsBackup b/contribs/freight/pom.xml.versionsBackup new file mode 100644 index 00000000000..e6c6cc65550 --- /dev/null +++ b/contribs/freight/pom.xml.versionsBackup @@ -0,0 +1,154 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + freight + freight + + + 12.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + + jar-no-fork + + + + + + maven-assembly-plugin + + + + + + + + + org.graphstream + gs-ui + 1.3 + + + org.graphstream + gs-core + 1.3 + + + + + + + org.apache.commons + commons-math + 2.2 + jar + compile + + + + com.graphhopper + jsprit-core + 1.7.2 + + + + com.graphhopper + jsprit-io + 1.7.2 + + + + + xml-apis + xml-apis + + + + + + com.graphhopper + jsprit-analysis + 1.7.2 + + + org.jfree + jfreechart + + + + + + org.matsim.contrib + roadpricing + ${matsim.version} + + + + org.matsim.contrib + otfvis + ${matsim.version} + + + + org.mockito + mockito-all + 1.9.5 + test + + + + org.slf4j + slf4j-api + 1.7.21 + + + org.slf4j + slf4j-log4j12 + 1.7.21 + + + + org.matsim + matsim-examples + ${matsim.version} + + + + + + + jsprit-releases + https://github.com/jsprit/mvn-rep/raw/master/releases + + + + + + diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml index 7ed39b8e8cc..930cdd3a66f 100644 --- a/contribs/hybridsim/pom.xml +++ b/contribs/hybridsim/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/hybridsim/pom.xml.versionsBackup b/contribs/hybridsim/pom.xml.versionsBackup new file mode 100644 index 00000000000..7ed39b8e8cc --- /dev/null +++ b/contribs/hybridsim/pom.xml.versionsBackup @@ -0,0 +1,74 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + hybridsim + hybridsim + + + 3.11.4 + 0.13.2 + + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + io.grpc + grpc-all + ${grpc.version} + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + + + + + + kr.motd.maven + os-maven-plugin + 1.4.1.Final + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + grpc-java + io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} + true + + + + + compile + compile-custom + + + + + + maven-assembly-plugin + + + + diff --git a/contribs/integration/pom.xml b/contribs/integration/pom.xml index 155b0143a19..5e2982438ce 100644 --- a/contribs/integration/pom.xml +++ b/contribs/integration/pom.xml @@ -9,7 +9,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/integration/pom.xml.versionsBackup b/contribs/integration/pom.xml.versionsBackup new file mode 100644 index 00000000000..155b0143a19 --- /dev/null +++ b/contribs/integration/pom.xml.versionsBackup @@ -0,0 +1,120 @@ + + + 4.0.0 + org.matsim.contrib + integration + integration + + + org.matsim + contrib + 12.0-SNAPSHOT + + + + + + + + + + + 12.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/SomeNonExistingTestName + + always + -Xmx1500m -Djava.awt.headless=true + false + + + + + + + + daily + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/daily/**/*Test.java + + + + + + + + weekly + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/weekly/**/*Test.java + + + + + + + + + + + org.matsim.contrib + accessibility + ${matsim.version} + + + org.geotools.jdbc + gt-jdbc-postgis + 21.5 + + + org.matsim.contrib + analysis + ${matsim.version} + + + org.matsim.contrib + dvrp + ${matsim.version} + test + + + org.matsim.contrib + drt + ${matsim.version} + test + + + + diff --git a/contribs/locationchoice/pom.xml b/contribs/locationchoice/pom.xml index 7cd604269b3..25f76b62638 100644 --- a/contribs/locationchoice/pom.xml +++ b/contribs/locationchoice/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -27,18 +27,18 @@ org.matsim.contrib otfvis - 12.0-SNAPSHOT + 12.0 org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 test diff --git a/contribs/locationchoice/pom.xml.versionsBackup b/contribs/locationchoice/pom.xml.versionsBackup new file mode 100644 index 00000000000..7cd604269b3 --- /dev/null +++ b/contribs/locationchoice/pom.xml.versionsBackup @@ -0,0 +1,45 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + locationchoice + locationchoice + + + + maven-assembly-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + 1 + false + + + + + + + org.matsim.contrib + otfvis + 12.0-SNAPSHOT + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + test + + + diff --git a/contribs/matrixbasedptrouter/pom.xml b/contribs/matrixbasedptrouter/pom.xml index b0a74cd65be..ba9e83b2fb9 100644 --- a/contribs/matrixbasedptrouter/pom.xml +++ b/contribs/matrixbasedptrouter/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/matrixbasedptrouter/pom.xml.versionsBackup b/contribs/matrixbasedptrouter/pom.xml.versionsBackup new file mode 100644 index 00000000000..b0a74cd65be --- /dev/null +++ b/contribs/matrixbasedptrouter/pom.xml.versionsBackup @@ -0,0 +1,18 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + matrixbasedptrouter + matrixbasedptrouter + + + + maven-assembly-plugin + + + + diff --git a/contribs/minibus/pom.xml b/contribs/minibus/pom.xml index 29771676371..09363fbb391 100644 --- a/contribs/minibus/pom.xml +++ b/contribs/minibus/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -48,7 +48,7 @@ org.matsim matsim - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/minibus/pom.xml.versionsBackup b/contribs/minibus/pom.xml.versionsBackup new file mode 100644 index 00000000000..29771676371 --- /dev/null +++ b/contribs/minibus/pom.xml.versionsBackup @@ -0,0 +1,60 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + minibus + minibus + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + org.matsim.contrib.minibus.PMain + + + + + + maven-assembly-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + 1 + false + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + false + + + + + + + org.matsim + matsim + 12.0-SNAPSHOT + + + + commons-codec + commons-codec + 1.4 + + + diff --git a/contribs/multimodal/pom.xml b/contribs/multimodal/pom.xml index 05be7470276..795781b1f11 100644 --- a/contribs/multimodal/pom.xml +++ b/contribs/multimodal/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -35,7 +35,7 @@ org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test diff --git a/contribs/multimodal/pom.xml.versionsBackup b/contribs/multimodal/pom.xml.versionsBackup new file mode 100644 index 00000000000..05be7470276 --- /dev/null +++ b/contribs/multimodal/pom.xml.versionsBackup @@ -0,0 +1,42 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + multimodal + multimodal + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.8 + + + **/*$* + org/matsim/testcases/TestDepth.java + org/matsim/testcases/MatsimTestCase.java + org/matsim/vis/otfvis/checklists/**/*.java + + once + + -Xmx2000m -Djava.awt.headless=true + + + + maven-assembly-plugin + + + + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + diff --git a/contribs/noise/pom.xml b/contribs/noise/pom.xml index 1d9ad712281..d4c6b9f8f39 100644 --- a/contribs/noise/pom.xml +++ b/contribs/noise/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -20,7 +20,7 @@ org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/noise/pom.xml.versionsBackup b/contribs/noise/pom.xml.versionsBackup new file mode 100644 index 00000000000..1d9ad712281 --- /dev/null +++ b/contribs/noise/pom.xml.versionsBackup @@ -0,0 +1,33 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + noise + noise + + + + maven-assembly-plugin + + + + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + + + + org.geotools + gt-geojson + 21.5 + + + + diff --git a/contribs/osm/pom.xml b/contribs/osm/pom.xml index 329f87991a0..9199a9212e9 100644 --- a/contribs/osm/pom.xml +++ b/contribs/osm/pom.xml @@ -5,7 +5,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 diff --git a/contribs/osm/pom.xml.versionsBackup b/contribs/osm/pom.xml.versionsBackup new file mode 100644 index 00000000000..329f87991a0 --- /dev/null +++ b/contribs/osm/pom.xml.versionsBackup @@ -0,0 +1,34 @@ + + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + + org.matsim.contrib + osm + + + + topobyte + https://mvn.topobyte.de + + + slimjars + https://mvn.slimjars.com + + + + + + + de.topobyte + osm4j-pbf + 0.1.1 + + + \ No newline at end of file diff --git a/contribs/otfvis/pom.xml b/contribs/otfvis/pom.xml index fcb1c07d765..f4bc02df805 100644 --- a/contribs/otfvis/pom.xml +++ b/contribs/otfvis/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 @@ -54,7 +54,7 @@ org.matsim matsim - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/otfvis/pom.xml.versionsBackup b/contribs/otfvis/pom.xml.versionsBackup new file mode 100644 index 00000000000..fcb1c07d765 --- /dev/null +++ b/contribs/otfvis/pom.xml.versionsBackup @@ -0,0 +1,60 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*$* + org/matsim/vis/otfvis/checklists/**/*.java + + once + + -Xmx700m -Djava.awt.headless=true + false + + + + maven-assembly-plugin + + + + 4.0.0 + org.matsim.contrib + otfvis + otfvis + + + net.java.dev.timingframework + timingframework + 1.0 + + + org.jogamp.gluegen + gluegen-rt-main + 2.3.2 + + + org.jogamp.jogl + jogl-all-main + 2.3.2 + + + org.jxmapviewer + jxmapviewer2 + 2.5 + + + org.matsim + matsim + 12.0-SNAPSHOT + + + diff --git a/contribs/parking/pom.xml b/contribs/parking/pom.xml index 921c61adcad..d67c307c676 100644 --- a/contribs/parking/pom.xml +++ b/contribs/parking/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -19,17 +19,17 @@ org.matsim.contrib multimodal - 12.0-SNAPSHOT + 12.0 org.matsim.contrib otfvis - 12.0-SNAPSHOT + 12.0 org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 org.apache.commons @@ -40,7 +40,7 @@ org.matsim.contrib osm - 12.0-SNAPSHOT + 12.0 compile diff --git a/contribs/parking/pom.xml.versionsBackup b/contribs/parking/pom.xml.versionsBackup new file mode 100644 index 00000000000..921c61adcad --- /dev/null +++ b/contribs/parking/pom.xml.versionsBackup @@ -0,0 +1,47 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + parking + parking + + + + maven-assembly-plugin + + + + + + org.matsim.contrib + multimodal + 12.0-SNAPSHOT + + + org.matsim.contrib + otfvis + 12.0-SNAPSHOT + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + org.apache.commons + commons-math + 2.2 + compile + + + org.matsim.contrib + osm + 12.0-SNAPSHOT + compile + + + diff --git a/contribs/pom.xml b/contribs/pom.xml index 0355ae8f307..1811f68b2a3 100644 --- a/contribs/pom.xml +++ b/contribs/pom.xml @@ -5,7 +5,7 @@ org.matsim contrib pom - 12.0-SNAPSHOT + 12.0 MATSim-Contrib @@ -217,14 +217,14 @@ org.matsim matsim - 12.0-SNAPSHOT + 12.0 jar compile org.matsim matsim - 12.0-SNAPSHOT + 12.0 test-jar test @@ -237,7 +237,7 @@ test - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/pom.xml.versionsBackup b/contribs/pom.xml.versionsBackup new file mode 100644 index 00000000000..0355ae8f307 --- /dev/null +++ b/contribs/pom.xml.versionsBackup @@ -0,0 +1,288 @@ + + + 4.0.0 + org.matsim + contrib + pom + 12.0-SNAPSHOT + MATSim-Contrib + + + https://github.com/matsim-org/matsim + scm:git:git://github.com/matsim-org/matsim.git + scm:git:git@github.com:matsim-org/matsim.git + + + + + bintray + https://api.bintray.com/maven/matsim/matsim/matsim + + + oss-jfrog-artifactory + artifactory-snapshots + https://oss.jfrog.org/oss-snapshot-local + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + + false + false + unknown + {0,date,yyyy-MM-dd HH:mm:ss} + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + maven-jar-plugin + + + + true + libs/ + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + + + true + none + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19 + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + src/main/assembly/assembly-release.xml + + false + + + + make-assembly + package + + single + + + + + + + + + + accessibility + accidents + analysis + av + bicycle + cadytsIntegration + carsharing + commercialTrafficApplications + common + decongestion + discrete_mode_choice + drt + dvrp + ev + emissions + eventsBasedPTRouter + freight + hybridsim + integration + locationchoice + matrixbasedptrouter + minibus + multimodal + noise + osm + otfvis + parking + protobuf + pseudosimulation + roadpricing + signals + socnetsim + taxi + vsp + + + + osgeo + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + + false + + + true + + + + matsim + https://dl.bintray.com/matsim/matsim + + + ch.sbb + https://schweizerischebundesbahnen.bintray.com/simba.mvn + + + + + + junit + junit + 4.13 + jar + provided + + + org.hamcrest + hamcrest-library + 1.3 + test + + + org.matsim + matsim + 12.0-SNAPSHOT + jar + compile + + + org.matsim + matsim + 12.0-SNAPSHOT + test-jar + test + + + + + + org.matsim + matsim-examples + + + test + 12.0-SNAPSHOT + + + + + commons-logging + commons-logging + 1.2 + + + + + + hudson + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + xml + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + none + + + + + + + + + + UTF-8 + UTF-8 + 11 + 11 + + + diff --git a/contribs/protobuf/pom.xml b/contribs/protobuf/pom.xml index 47a132fdc94..b869883b4ac 100644 --- a/contribs/protobuf/pom.xml +++ b/contribs/protobuf/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/protobuf/pom.xml.versionsBackup b/contribs/protobuf/pom.xml.versionsBackup new file mode 100644 index 00000000000..47a132fdc94 --- /dev/null +++ b/contribs/protobuf/pom.xml.versionsBackup @@ -0,0 +1,68 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + protobuf + protobuf + + + 3.11.4 + + + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + org.assertj + assertj-core + 3.15.0 + test + + + + + + + + + kr.motd.maven + os-maven-plugin + 1.4.1.Final + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.6.1 + + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + true + + + + + compile + compile-python + test-compile + + + + + + maven-assembly-plugin + + + + diff --git a/contribs/pseudosimulation/pom.xml b/contribs/pseudosimulation/pom.xml index d9952217164..e0367863cf1 100644 --- a/contribs/pseudosimulation/pom.xml +++ b/contribs/pseudosimulation/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -20,12 +20,12 @@ org.matsim.contrib common - 12.0-SNAPSHOT + 12.0 org.matsim.contrib eventsBasedPTRouter - 12.0-SNAPSHOT + 12.0 commons-cli @@ -40,7 +40,7 @@ org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test diff --git a/contribs/pseudosimulation/pom.xml.versionsBackup b/contribs/pseudosimulation/pom.xml.versionsBackup new file mode 100644 index 00000000000..d9952217164 --- /dev/null +++ b/contribs/pseudosimulation/pom.xml.versionsBackup @@ -0,0 +1,47 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + pseudosimulation + + pseudosimulation + + + + maven-assembly-plugin + + + + + + org.matsim.contrib + common + 12.0-SNAPSHOT + + + org.matsim.contrib + eventsBasedPTRouter + 12.0-SNAPSHOT + + + commons-cli + commons-cli + 1.0 + + + colt + colt + 1.2.0 + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + diff --git a/contribs/roadpricing/pom.xml b/contribs/roadpricing/pom.xml index 7804be7d94c..a04f6146c83 100644 --- a/contribs/roadpricing/pom.xml +++ b/contribs/roadpricing/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -53,7 +53,7 @@ org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test diff --git a/contribs/roadpricing/pom.xml.versionsBackup b/contribs/roadpricing/pom.xml.versionsBackup new file mode 100644 index 00000000000..7804be7d94c --- /dev/null +++ b/contribs/roadpricing/pom.xml.versionsBackup @@ -0,0 +1,60 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + roadpricing + roadpricing + + + + src/main/resources + + **/revision.txt + + + + src/main/resources + + **/revision.txt + + true + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + + false + false + unknown + {0,date,yyyy-MM-dd HH:mm:ss} + + + + maven-assembly-plugin + + + + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + diff --git a/contribs/signals/pom.xml b/contribs/signals/pom.xml index 4d78bf30a40..c3616fc528d 100644 --- a/contribs/signals/pom.xml +++ b/contribs/signals/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -19,12 +19,12 @@ org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 org.matsim.contrib otfvis - 12.0-SNAPSHOT + 12.0 compile diff --git a/contribs/signals/pom.xml.versionsBackup b/contribs/signals/pom.xml.versionsBackup new file mode 100644 index 00000000000..4d78bf30a40 --- /dev/null +++ b/contribs/signals/pom.xml.versionsBackup @@ -0,0 +1,37 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + signals + signals + + + + maven-assembly-plugin + + + + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + + + org.matsim.contrib + otfvis + 12.0-SNAPSHOT + compile + + + org.assertj + assertj-core + 3.15.0 + test + + + diff --git a/contribs/socnetsim/pom.xml b/contribs/socnetsim/pom.xml index ba27ae3f628..1e23977215e 100644 --- a/contribs/socnetsim/pom.xml +++ b/contribs/socnetsim/pom.xml @@ -2,7 +2,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib diff --git a/contribs/socnetsim/pom.xml.versionsBackup b/contribs/socnetsim/pom.xml.versionsBackup new file mode 100644 index 00000000000..ba27ae3f628 --- /dev/null +++ b/contribs/socnetsim/pom.xml.versionsBackup @@ -0,0 +1,28 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + socnetsim + socnetsim + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + + -Xmx700m -Djava.awt.headless=true + + + + maven-assembly-plugin + + + + diff --git a/contribs/taxi/pom.xml b/contribs/taxi/pom.xml index 925310e9fdd..2592be5b5a7 100644 --- a/contribs/taxi/pom.xml +++ b/contribs/taxi/pom.xml @@ -4,7 +4,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 org.matsim.contrib @@ -31,12 +31,12 @@ org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 org.matsim.contrib ev - 12.0-SNAPSHOT + 12.0 diff --git a/contribs/taxi/pom.xml.versionsBackup b/contribs/taxi/pom.xml.versionsBackup new file mode 100644 index 00000000000..925310e9fdd --- /dev/null +++ b/contribs/taxi/pom.xml.versionsBackup @@ -0,0 +1,43 @@ + + + org.matsim + contrib + 12.0-SNAPSHOT + + 4.0.0 + org.matsim.contrib + taxi + taxi + + + + + maven-assembly-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + 1 + false + + + + + + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + org.matsim.contrib + ev + 12.0-SNAPSHOT + + + + diff --git a/contribs/vsp/pom.xml b/contribs/vsp/pom.xml index 7e2b61ebb4a..9ca1feee5cd 100644 --- a/contribs/vsp/pom.xml +++ b/contribs/vsp/pom.xml @@ -3,7 +3,7 @@ org.matsim contrib - 12.0-SNAPSHOT + 12.0 4.0.0 diff --git a/contribs/vsp/pom.xml.versionsBackup b/contribs/vsp/pom.xml.versionsBackup new file mode 100644 index 00000000000..7e2b61ebb4a --- /dev/null +++ b/contribs/vsp/pom.xml.versionsBackup @@ -0,0 +1,186 @@ + + + + org.matsim + contrib + 12.0-SNAPSHOT + + + 4.0.0 + org.matsim.contrib + vsp + vsp + + + 12.0-SNAPSHOT + + + + + org.matsim.contrib + multimodal + ${matsim.version} + compile + + + org.matsim.contrib + taxi + ${matsim.version} + compile + + + org.matsim.contrib + dvrp + ${matsim.version} + + + org.matsim.contrib + parking + ${matsim.version} + + + org.matsim.contrib + accessibility + ${matsim.version} + + + org.matsim.contrib + emissions + ${matsim.version} + + + org.matsim.contrib + minibus + ${matsim.version} + + + org.matsim.contrib + common + ${matsim.version} + + + org.matsim.contrib + analysis + ${matsim.version} + + + org.processing + core + 3.0.1 + + + org.jogamp.gluegen + gluegen-rt-main + 2.3.2 + + + org.jogamp.jogl + jogl-all-main + 2.3.2 + + + org.matsim.contrib + otfvis + ${matsim.version} + + + + + + + + org.matsim.contrib + noise + ${matsim.version} + + + org.matsim.contrib + signals + ${matsim.version} + + + org.openstreetmap.osmosis + osmosis-core + 0.47 + + + + + xml-apis + xml-apis + + + + + org.openstreetmap.osmosis + osmosis-xml + 0.47 + + + org.openstreetmap.osmosis + osmosis-tagfilter + 0.47 + + + org.openstreetmap.osmosis + osmosis-set + 0.47 + + + org.openstreetmap.osmosis + osmosis-areafilter + 0.47 + + + de.micromata.jak + JavaAPIforKml + 2.2.0 + jar + compile + + + org.matsim.contrib + cadytsIntegration + ${matsim.version} + + + org.apache.poi + poi-ooxml + 3.12 + + + + + xml-apis + xml-apis + + + stax + stax-api + + + + + + com.jcraft + jsch + 0.1.54 + + + + org.matsim + matsim-examples + ${matsim.version} + + + org.matsim.contrib + drt + ${matsim.version} + + + org.openjfx + javafx-graphics + 11.0.2 + + + diff --git a/distribution/pom.xml b/distribution/pom.xml index 07197e6a528..feac6f142a0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,161 +4,161 @@ org.matsim matsim-distribution pom - 12.0-SNAPSHOT + 12.0 Release Directory (for GitHub) org.matsim matsim - 12.0-SNAPSHOT + 12.0 org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 org.matsim.contrib accessibility - 12.0-SNAPSHOT + 12.0 org.matsim.contrib analysis - 12.0-SNAPSHOT + 12.0 org.matsim.contrib av - 12.0-SNAPSHOT + 12.0 org.matsim.contrib cadytsIntegration - 12.0-SNAPSHOT + 12.0 org.matsim.contrib carsharing - 12.0-SNAPSHOT + 12.0 org.matsim.contrib decongestion - 12.0-SNAPSHOT + 12.0 org.matsim.contrib discrete_mode_choice - 12.0-SNAPSHOT + 12.0 org.matsim.contrib common - 12.0-SNAPSHOT + 12.0 org.matsim.contrib drt - 12.0-SNAPSHOT + 12.0 org.matsim.contrib dvrp - 12.0-SNAPSHOT + 12.0 org.matsim.contrib emissions - 12.0-SNAPSHOT + 12.0 org.matsim.contrib ev - 12.0-SNAPSHOT + 12.0 org.matsim.contrib eventsBasedPTRouter - 12.0-SNAPSHOT + 12.0 org.matsim.contrib freight - 12.0-SNAPSHOT + 12.0 org.matsim.contrib hybridsim - 12.0-SNAPSHOT + 12.0 org.matsim.contrib locationchoice - 12.0-SNAPSHOT + 12.0 org.matsim.contrib matrixbasedptrouter - 12.0-SNAPSHOT + 12.0 org.matsim.contrib minibus - 12.0-SNAPSHOT + 12.0 org.matsim.contrib multimodal - 12.0-SNAPSHOT + 12.0 org.matsim.contrib noise - 12.0-SNAPSHOT + 12.0 org.matsim.contrib otfvis - 12.0-SNAPSHOT + 12.0 org.matsim.contrib parking - 12.0-SNAPSHOT + 12.0 org.matsim.contrib protobuf - 12.0-SNAPSHOT + 12.0 org.matsim.contrib pseudosimulation - 12.0-SNAPSHOT + 12.0 org.matsim.contrib roadpricing - 12.0-SNAPSHOT + 12.0 org.matsim.contrib signals - 12.0-SNAPSHOT + 12.0 org.matsim.contrib socnetsim - 12.0-SNAPSHOT + 12.0 org.matsim.contrib taxi - 12.0-SNAPSHOT + 12.0 diff --git a/distribution/pom.xml.versionsBackup b/distribution/pom.xml.versionsBackup new file mode 100644 index 00000000000..07197e6a528 --- /dev/null +++ b/distribution/pom.xml.versionsBackup @@ -0,0 +1,193 @@ + + + 4.0.0 + org.matsim + matsim-distribution + pom + 12.0-SNAPSHOT + Release Directory (for GitHub) + + + + org.matsim + matsim + 12.0-SNAPSHOT + + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + + + + org.matsim.contrib + accessibility + 12.0-SNAPSHOT + + + org.matsim.contrib + analysis + 12.0-SNAPSHOT + + + org.matsim.contrib + av + 12.0-SNAPSHOT + + + org.matsim.contrib + cadytsIntegration + 12.0-SNAPSHOT + + + org.matsim.contrib + carsharing + 12.0-SNAPSHOT + + + org.matsim.contrib + decongestion + 12.0-SNAPSHOT + + + org.matsim.contrib + discrete_mode_choice + 12.0-SNAPSHOT + + + org.matsim.contrib + common + 12.0-SNAPSHOT + + + org.matsim.contrib + drt + 12.0-SNAPSHOT + + + org.matsim.contrib + dvrp + 12.0-SNAPSHOT + + + org.matsim.contrib + emissions + 12.0-SNAPSHOT + + + org.matsim.contrib + ev + 12.0-SNAPSHOT + + + org.matsim.contrib + eventsBasedPTRouter + 12.0-SNAPSHOT + + + org.matsim.contrib + freight + 12.0-SNAPSHOT + + + org.matsim.contrib + hybridsim + 12.0-SNAPSHOT + + + org.matsim.contrib + locationchoice + 12.0-SNAPSHOT + + + org.matsim.contrib + matrixbasedptrouter + 12.0-SNAPSHOT + + + org.matsim.contrib + minibus + 12.0-SNAPSHOT + + + org.matsim.contrib + multimodal + 12.0-SNAPSHOT + + + org.matsim.contrib + noise + 12.0-SNAPSHOT + + + org.matsim.contrib + otfvis + 12.0-SNAPSHOT + + + org.matsim.contrib + parking + 12.0-SNAPSHOT + + + org.matsim.contrib + protobuf + 12.0-SNAPSHOT + + + org.matsim.contrib + pseudosimulation + 12.0-SNAPSHOT + + + org.matsim.contrib + roadpricing + 12.0-SNAPSHOT + + + org.matsim.contrib + signals + 12.0-SNAPSHOT + + + org.matsim.contrib + socnetsim + 12.0-SNAPSHOT + + + org.matsim.contrib + taxi + 12.0-SNAPSHOT + + + + + + maven-assembly-plugin + + + src/assembly/assembly-release.xml + + false + + + + make-assembly + package + + single + + + + + + maven-deploy-plugin + 3.0.0-M1 + + true + + + + + diff --git a/examples/pom.xml b/examples/pom.xml index 6876ab7c5dc..ddb32e1565c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ org.matsim matsim-examples jar - 12.0-SNAPSHOT + 12.0 MATSim Examples diff --git a/examples/pom.xml.versionsBackup b/examples/pom.xml.versionsBackup new file mode 100644 index 00000000000..6876ab7c5dc --- /dev/null +++ b/examples/pom.xml.versionsBackup @@ -0,0 +1,62 @@ + + + 4.0.0 + org.matsim + matsim-examples + jar + 12.0-SNAPSHOT + MATSim Examples + + + bintray + https://api.bintray.com/maven/matsim/matsim/matsim + + + oss-jfrog-artifactory + artifactory-snapshots + https://oss.jfrog.org/oss-snapshot-local + + + + + + scenarios + test/scenarios + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + maven-assembly-plugin + 3.2.0 + + + src/main/assembly/assembly-release.xml + + false + + + + make-assembly + package + + single + + + + + + + + + UTF-8 + UTF-8 + 11 + 11 + + + diff --git a/matsim/pom.xml b/matsim/pom.xml index 432721c7de1..237301152c2 100644 --- a/matsim/pom.xml +++ b/matsim/pom.xml @@ -5,7 +5,7 @@ org.matsim matsim MATSim - 12.0-SNAPSHOT + 12.0 Multi-Agent Transport Simulation http://ci.matsim.org:8080/job/MATSim_M2/ws/matsim/target/site 2005 @@ -321,7 +321,7 @@ org.matsim matsim-examples - 12.0-SNAPSHOT + 12.0 test diff --git a/matsim/pom.xml.versionsBackup b/matsim/pom.xml.versionsBackup new file mode 100644 index 00000000000..432721c7de1 --- /dev/null +++ b/matsim/pom.xml.versionsBackup @@ -0,0 +1,443 @@ + + + + 4.0.0 + org.matsim + matsim + MATSim + 12.0-SNAPSHOT + Multi-Agent Transport Simulation + http://ci.matsim.org:8080/job/MATSim_M2/ws/matsim/target/site + 2005 + + + + + + GNU General Public License + ${basedir}/COPYING + See also the LICENSE file + + + + https://github.com/matsim-org/matsim + scm:git:git://github.com/matsim-org/matsim.git + scm:git:git@github.com:matsim-org/matsim.git + + + + bintray + https://api.bintray.com/maven/matsim/matsim/matsim + + + oss-jfrog-artifactory + artifactory-snapshots + https://oss.jfrog.org/oss-snapshot-local + + + + compiler:compile + + + src/main/resources + + revision.txt + + + + src/main/resources + + revision.txt + + true + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + validate + + create + + + + + false + false + unknown + {0,date,yyyy-MM-dd HH:mm:ss} + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + **/*$* + org/matsim/testcases/MatsimTestCase.java + + once + + -Xmx700m -Djava.awt.headless=true -Dmatsim.preferLocalDtds=true + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + + test-jar + + + + + + + true + libs/ + org.matsim.run.gui.Gui + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.0 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + + + + true +
MATSim API
+ org.matsim.jaxb:org.matsim.jaxb.* + + + api + org.matsim.api:org.matsim.api.* + + + run + org.matsim.run:org.matsim.run.* + + + core + org.matsim.core:org.matsim.core.* + + + pt + org.matsim.pt:org.matsim.pt.* + + + utils + org.matsim.utils:org.matsim.utils.* + + + withinday + org.matsim.withinday:org.matsim.withinday.* + + + vis + org.matsim.vis:org.matsim.vis.* + + + true + none + true + + + + maven-assembly-plugin + 3.2.0 + + + src/main/assembly/assembly-release.xml + + false + + + + make-assembly + package + + single + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.22.2 + + + + integration-test + verify + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + xml + + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.22.2 + + + + + + + osgeo + OSGeo Release Repository + https://repo.osgeo.org/repository/release/ + + false + + + true + + + + matsim + https://dl.bintray.com/matsim/matsim + + + + ojo-snapshots + https://oss.jfrog.org/libs-snapshot + + + + + + org.apache.logging.log4j + log4j-api + 2.13.0 + + + org.apache.logging.log4j + log4j-core + 2.13.0 + + + org.apache.logging.log4j + log4j-1.2-api + 2.13.0 + + + org.geotools + gt-main + ${geotools.version} + + + org.geotools + gt-referencing + ${geotools.version} + + + org.geotools + gt-shapefile + ${geotools.version} + + + org.geotools + gt-epsg-hsql + ${geotools.version} + runtime + + + org.jfree + jfreechart + 1.5.0 + + + junit + junit + 4.13 + test + + + pl.pragmatists + JUnitParams + 1.1.0 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + org.matsim + matsim-examples + 12.0-SNAPSHOT + test + + + org.jfree + jcommon + 1.0.24 + + + com.google.inject + guice + ${guice.version} + + + com.google.inject.extensions + guice-multibindings + ${guice.version} + + + com.google.inject.extensions + guice-grapher + ${guice.version} + + + org.jgrapht + jgrapht-core + 1.4.0 + + + net.sf.trove4j + trove4j + 3.0.3 + + + org.jvnet.ogc + kml-v_2_2_0 + 2.2.0 + + + org.lz4 + lz4-java + 1.7.1 + + + com.github.luben + zstd-jni + 1.4.4-7 + + + javax.validation + validation-api + 2.0.1.Final + + + org.hibernate.validator + hibernate-validator + 6.1.1.Final + + + org.hibernate.validator + hibernate-validator-annotation-processor + 6.1.1.Final + + + org.glassfish + javax.el + 3.0.1-b11 + + + org.assertj + assertj-core + 3.15.0 + test + + + org.apache.commons + commons-compress + 1.20 + + + org.apache.commons + commons-csv + 1.8 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + + + com.sun.xml.bind + jaxb-impl + 2.3.0.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.10.2 + + + com.fasterxml.jackson.core + jackson-core + 2.10.2 + + + + + UTF-8 + UTF-8 + 11 + 11 + 21.5 + 4.2.2 + + diff --git a/pom.xml b/pom.xml index f80c8da220c..b499f53ece8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.matsim matsim-all pom - 12.0-SNAPSHOT + 12.0 MATSim-All matsim diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup new file mode 100644 index 00000000000..f80c8da220c --- /dev/null +++ b/pom.xml.versionsBackup @@ -0,0 +1,16 @@ + + + 4.0.0 + org.matsim + matsim-all + pom + 12.0-SNAPSHOT + MATSim-All + + matsim + examples + benchmark + contribs + distribution + +