Skip to content

Commit 55f04e4

Browse files
committed
Merge branch 'dev-2.x' of github.com:opentripplanner/OpenTripPlanner into fix-paging-first-search-previous-page-edge-case
2 parents fee18b6 + 0f02ee2 commit 55f04e4

794 files changed

Lines changed: 11068 additions & 67308 deletions

File tree

Some content is hidden

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

.github/workflows/prune-container-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
# remove all snapshot container images that have not been pulled for a long time
2020
# --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this
2121
pip install prune-container-repo==0.0.4
22-
prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=180 --keep-semver --activate
22+
prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=120 --keep-semver --activate

Makefile

Lines changed: 0 additions & 39 deletions
This file was deleted.

application/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>net.logstash.logback</groupId>
5757
<artifactId>logstash-logback-encoder</artifactId>
58-
<version>8.0</version>
58+
<version>8.1</version>
5959
</dependency>
6060

6161
<!-- dependency injection -->
@@ -166,13 +166,13 @@
166166
<dependency>
167167
<groupId>com.tngtech.archunit</groupId>
168168
<artifactId>archunit</artifactId>
169-
<version>1.4.0</version>
169+
<version>1.4.1</version>
170170
<scope>test</scope>
171171
</dependency>
172172
<dependency>
173173
<groupId>org.mockito</groupId>
174174
<artifactId>mockito-core</artifactId>
175-
<version>5.16.1</version>
175+
<version>5.17.0</version>
176176
<scope>test</scope>
177177
</dependency>
178178
<dependency>
@@ -318,7 +318,7 @@
318318
<dependency>
319319
<groupId>com.graphql-java</groupId>
320320
<artifactId>graphql-java</artifactId>
321-
<version>22.3</version>
321+
<version>24.0</version>
322322
</dependency>
323323
<dependency>
324324
<groupId>com.graphql-java</groupId>
@@ -328,7 +328,7 @@
328328
<dependency>
329329
<groupId>org.apache.httpcomponents.client5</groupId>
330330
<artifactId>httpclient5</artifactId>
331-
<version>5.4.2</version>
331+
<version>5.4.4</version>
332332
</dependency>
333333
<dependency>
334334
<groupId>commons-cli</groupId>
@@ -364,12 +364,12 @@
364364
<dependency>
365365
<groupId>com.azure</groupId>
366366
<artifactId>azure-messaging-servicebus</artifactId>
367-
<version>7.17.10</version>
367+
<version>7.17.11</version>
368368
</dependency>
369369
<dependency>
370370
<groupId>com.azure</groupId>
371371
<artifactId>azure-identity</artifactId>
372-
<version>1.15.4</version>
372+
<version>1.16.1</version>
373373
<scope>compile</scope>
374374
</dependency>
375375
<dependency>

application/src/client/classic-debug/i18n/babel.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)