Merge pull request catalogueglobal#17 from conveyal/update-repo-url

Update repo URLs
5Tsrl · Dec 7, 2018 · 1914727 · 1914727
2 parents 93f3e95 + 8fdbf83
commit 1914727
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,13 +32,13 @@ before_deploy:
 deploy:
   provider: s3
   skip_cleanup: true
-  access_key_id: AKIAJISY76KTZBNHS4SA
+  access_key_id: AKIAIWMAQP5YXWT7OZEA
   secret_access_key:
-    secure: a2PNYiv7kzgKxfSx6IhZxSCFBZTCjrbIAK/vmCB1KcpnlV4vTt/IL13i3u6XC8wAbUxhd6iJMtVRm4diIwmy0K7nnpp0h3cQDxYqWCmf1dHZWBJXkpurDpbfxW5G6IlL14i+EsTSCpmwalov+atOBDVyJWVGqfEYaj9c6Q1E0fiYNP3QwZQcsVuD1CRw91xzckfERwqYcz70p/hmTEPOgUwDHuyHsjFafJx+krY3mnBdRdDRLcnPavjcEtprjGkdiVbNETe3CHVNQrAVfqm187OoDA2tHTPjTFmlAdUedp4rYqLmF/WWbHZLzUkQb95FJkklx30vlwC0bIutP1TwIlr3ma5aCRFc58x3SzG07AeM+vbt/nh5A52cpdRjBnhctC2kL++QvwkJhwRy2xptl/WEd5AUagoN4ngnGzyDS4kk/taQFL0IAav5C2WH668kGyH17KNeWG/bCDd55oCvwNlppAYXH+WdbtylqiVb9Fllvs1wcIYWqqyX5zdYiyFEI8LyEQsNF/D5ekuAtLXcF25uwjNtHMjdAxQxHbAbBOeaaLwJd29os9GrKFI/2C0TVXZo2zaFLZyFaIsDHqAC+MXDBDtktimC9Uuozz7bXENCrOUBfsDEQXb46tkXLGaQNXeOhe3KwVKxlGDCsLb7iHIcdDyBm19hqUWhU3uA+dU=
+    secure: cDfIv+/+YimqsH8NvWQZy9YTqaplOwlIeEK+KEBCfsJ3DJK5sa6U4BMZCA4OMP1oTEaIxkd4Rcvj0OAYSFQVNQHtwc+1WeHobzu+MWajMNwmJYdjIvCqMFg2lgJdzCWv6vWcitNvrsYpuXxJlQOirY/4GjEh2gueHlilEdJEItBGYebQL0/5lg9704oeO9v+tIEVivtNc76K5DoxbAa1nW5wCYD7yMQ/cc9EQiMgR5PXNEVJS4hO7dfdDwk2ulGfpwTDrcSaR9JsHyoXj72kJHC9wocS9PLeeYzNAw6ctIymNIjotUf/QUeMlheBbLfTq6DKQ0ISLcD9YYOwviUMEGmnte+HCvTPTtxNbjBWPGa2HMkKsGjTptWu1RtqRJTLy19EN1WG5znO9M+lNGBjLivxHZA/3w7jyfvEU3wvQlzo59ytNMwOEJ3zvSm6r3/QmOr5BU+UHsqy5vv2lOQ9Nv10Uag11zDP1YWCoD96jvjZJsUZtW80ZweHYpDMq0vKdZwZSlbrhgHzS7vlDW7llZPUntz0SfKCjtddbRdy6T4HgsmA8EsBATfisWpmFA6roQSnYwfEZ5ooJ8IMjfOm1qGphrP1Qv8kYkqdtOyTijYErqJ3YzldjeItqaWtyD5tmHm6Wmq6XIbw4bnSfGRx9di+cG5lDEPe1tfBPCf9O5M=
   # upload jars in deploy dir to bucket
   bucket: datatools-builds
   local-dir: deploy
   acl: public_read
   on:
-    repo: catalogueglobal/datatools-server
+    repo: conveyal/datatools-server
     all_branches: true
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     </licenses>
 
     <!-- Developer entries are provided for primary developers.
-   For other contributors, see https://github.com/catalogueglobal/datatools-server/graphs/contributors -->
+   For other contributors, see https://github.com/conveyal/datatools-server/graphs/contributors -->
     <developers>
         <developer>
             <name>Landon Reed</name>
@@ -46,9 +46,9 @@
 
     <!-- Define where the source code for project lives -->
     <scm>
-        <connection>scm:git:https://github.com/catalogueglobal/datatools-server.git</connection>
-        <developerConnection>scm:git:ssh://[email protected]/catalogueglobal/datatools-server.git</developerConnection>
-        <url>https://github.com/catalogueglobal/datatools-server.git</url>
+        <connection>scm:git:https://github.com/conveyal/datatools-server.git</connection>
+        <developerConnection>scm:git:ssh://[email protected]/conveyal/datatools-server.git</developerConnection>
+        <url>https://github.com/conveyal/datatools-server.git</url>
     </scm>
     <properties>
         <jackson.version>2.9.0</jackson.version>

diff --git a/src/main/java/com/conveyal/gtfs/GraphQLMain.java b/src/main/java/com/conveyal/gtfs/GraphQLMain.java
@@ -19,7 +19,7 @@
  * What we're trying to provide is this:
  * The queries that analysis-ui makes are at https://github.com/conveyal/analysis-ui/blob/dev/lib/graphql/query.js ;
  * note that feeds are wrapped in bundles in analysis-ui (we wrap the GTFS API types)
- * GraphQL queries for datatools-ui are at https://github.com/catalogueglobal/datatools-ui/blob/dev/lib/gtfs/util/graphql.js.
+ * GraphQL queries for datatools-ui are at https://github.com/conveyal/datatools-ui/blob/dev/lib/gtfs/util/graphql.js.
  *
  * We will eventually want to replace some of the REST-ish endpoints in datatools-ui, including:
  * stops/routes by bounding box

diff --git a/src/test/java/com/conveyal/datatools/manager/controllers/api/AppInfoControllerTest.java b/src/test/java/com/conveyal/datatools/manager/controllers/api/AppInfoControllerTest.java
@@ -32,7 +32,7 @@ public void canReturnApprInfo() throws IOException {
             .get("/api/manager/public/appinfo")
         .then()
             // make sure the repoUrl matches what is found in the pom.xml
-            .body("repoUrl", equalTo("https://github.com/catalogueglobal/datatools-server.git"))
+            .body("repoUrl", equalTo("https://github.com/conveyal/datatools-server.git"))
             .extract().response().asString();
 
         // parse the json and make sure the commit is the length of characters that a commit hash would be