Skip to content

Commit daed894

Browse files
miklcctmiklcct
committed
Merge branch 'remove-safety-normalizer' into safest-street
# Conflicts: # application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java
2 parents 5b89e9a + 0466c39 commit daed894

File tree

565 files changed

+21338
-4585
lines changed

Some content is hidden

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

565 files changed

+21338
-4585
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,7 @@ c287575df6798810a69fafc54c8c4e1867b71367
2121
14f2d6bc7622649c817e9f45e4d1a9e6dd94847d
2222

2323
# update prettier to 2.6.8
24-
5e507bb6960746fb367672c27fb607e9335366f9
24+
5e507bb6960746fb367672c27fb607e9335366f9
25+
26+
# add braces with OpenRewrite
27+
882e72ca362b25d5c76204e7d5db2bcee611c069

‎.github/workflows/close_stale_pr_and_issues.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
days-before-stale: 90
2121
days-before-close: 30
2222
operations-per-run: 260
23-
exempt-issue-labels: 'Roadmap'
23+
exempt-issue-labels: '+Roadmap,+Keep Open'
2424
ascending: true

‎application/pom.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<dependency>
148148
<groupId>org.mobilitydata</groupId>
149149
<artifactId>gbfs-java-model</artifactId>
150-
<version>1.0.9</version>
150+
<version>1.0.12</version>
151151
</dependency>
152152

153153
<!-- TESTING -->
@@ -301,7 +301,7 @@
301301
<dependency>
302302
<groupId>org.onebusaway</groupId>
303303
<artifactId>onebusaway-gtfs</artifactId>
304-
<version>10.2.0</version>
304+
<version>11.0.0</version>
305305
</dependency>
306306
<!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
307307
<dependency>
@@ -330,7 +330,7 @@
330330
<dependency>
331331
<groupId>com.graphql-java</groupId>
332332
<artifactId>graphql-java</artifactId>
333-
<version>24.3</version>
333+
<version>25.0</version>
334334
</dependency>
335335
<dependency>
336336
<groupId>com.graphql-java</groupId>
@@ -387,7 +387,7 @@
387387
<dependency>
388388
<groupId>ch.poole</groupId>
389389
<artifactId>OpeningHoursParser</artifactId>
390-
<version>0.28.2</version>
390+
<version>0.29.0</version>
391391
</dependency>
392392

393393
<dependency>
@@ -504,6 +504,18 @@
504504
</execution>
505505
</executions>
506506
</plugin>
507+
<plugin>
508+
<groupId>org.apache.maven.plugins</groupId>
509+
<artifactId>maven-checkstyle-plugin</artifactId>
510+
<configuration>
511+
<sourceDirectories>
512+
<sourceDirectory>src/main/java</sourceDirectory>
513+
<sourceDirectory>src/ext/java</sourceDirectory>
514+
<sourceDirectory>src/ext-test/java</sourceDirectory>
515+
<sourceDirectory>src/test-fixtures/java</sourceDirectory>
516+
</sourceDirectories>
517+
</configuration>
518+
</plugin>
507519
<plugin>
508520
<groupId>com.hubspot.maven.plugins</groupId>
509521
<artifactId>prettier-maven-plugin</artifactId>

0 commit comments

Comments
 (0)