Skip to content

Commit

Permalink
Merge pull request HSLdevcom#132 from opentripplanner/master
Browse files Browse the repository at this point in the history
pull from upstream
  • Loading branch information
hannesj authored Mar 10, 2017
2 parents 84d137b + d349752 commit 8ab0c7d
Show file tree
Hide file tree
Showing 12 changed files with 1,586 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ I18NEXT=./node_modules/.bin/i18next-conv
LOCALE_FOLDER=./src/client/i18n
BABEL_CFG=$(LOCALE_FOLDER)/babel.cfg
TEMPLATE_FILE=$(LOCALE_FOLDER)/messages.pot
LANGS=sl en fr de it ca_ES pl
LANGS=sl en fr de it ca_ES pl pt
JS_FILESPATH=./src/client/js/otp
JS_FILES = $(shell find $(JS_FILESPATH)/ -name '*.js')
LOCALE_FILES = $(shell find $(LOCALE_FOLDER)/ -name '*.po')
Expand Down
2 changes: 1 addition & 1 deletion docs/Basic-Usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This page will get you up and running with your own OTP server. If all goes well

## Get OTP

OpenTripPlanner is written in Java and distributed as a single runnable JAR file. These JARs are published on the Conveyal Maven repository [here](http://maven.conveyal.com/org/opentripplanner/otp/). Grab the JAR for the latest released version, which will be found in the highest-numbered directory without a -SNAPSHOT suffix. The stand-alone JAR file is the one that ends with "-shaded.jar".
OpenTripPlanner is written in Java and distributed as a single runnable JAR file. These JARs are published on the Conveyal Maven repository. Here is a link to the latest released version 1.0.0 as a [stand-alone JAR file](https://maven.conveyal.com/org/opentripplanner/otp/1.0.0/otp-1.0.0-shaded.jar).
You may also want to get your own copy of the OTP source code and [build a bleeding edge development JAR from scratch](Getting-OTP), especially if you plan to do some development yourself.

## Get some data
Expand Down
2 changes: 1 addition & 1 deletion docs/Getting-OTP.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Pre-built JARs

OpenTripPlanner is now distributed as a single stand-alone runnable JAR file. The JAR files for each release are
published to the [Conveyal Maven repository](http://maven.conveyal.com/org/opentripplanner/otp/). Most users will want to navigate into the directory with the highest-numbered non-snapshot version and download the file whose name ends with `shaded.jar`. The latest release is the [0.19.0 shaded JAR](http://maven.conveyal.com.s3.amazonaws.com/org/opentripplanner/otp/0.19.0/otp-0.19.0-shaded.jar).
published to the Conveyal Maven repository at `https://maven.conveyal.com/org/opentripplanner/otp/`. Unfortunately, directory listings are currently disabled on this repository as a stopgap compatibility fix. When directory listings are re-enabled, most users will want to navigate into the directory with the highest-numbered non-snapshot version and download the file whose name ends with `shaded.jar`. Until listings are available, please use the following direct link to the [latest release 1.0.0 as a stand-alone JAR file](https://maven.conveyal.com/org/opentripplanner/otp/1.0.0/otp-1.0.0-shaded.jar).

## Building from Source

Expand Down
Loading

0 comments on commit 8ab0c7d

Please sign in to comment.