Merge remote-tracking branch 'upstream/dev-2.x' into fix-skipped-removal

Author: optionsome

.github/workflows/cibuild.yml

@@ -51,9 +51,11 @@ jobs:
 
       - name: Send coverage data to codecov.io
         if: github.repository_owner == 'opentripplanner'
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v4
         with:
           files: target/site/jacoco/jacoco.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
 
       - name: Deploy to Github Package Registry
         if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
@@ -75,7 +77,7 @@ jobs:
       # on windows there are frequent failures caused by page files being too small
       # https://github.com/actions/virtual-environments/issues/785
       - name: Configure Windows Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.3
+        uses: al-cheb/configure-pagefile-action@v1.4
       - name: Run tests
         run: mvn --batch-mode test -P prettierSkip
 
@@ -87,7 +89,7 @@ jobs:
       LOCAL_BRANCH: local-pages
       REMOTE_BRANCH: main
       TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
-      MASTER_BRANCH_VERSION: 2.4.0
+      MASTER_BRANCH_VERSION: 2.5.0
 
     steps:
 

.github/workflows/performance-test.yml

@@ -32,11 +32,10 @@ jobs:
             jfr-delay: "35s"
             profile: core
 
-          # disabled due to https://github.com/opentripplanner/OpenTripPlanner/issues/5702
-          #- location: skanetrafiken
-          #  iterations: 1
-          #  jfr-delay: "50s"
-          #  profile: core
+          - location: skanetrafiken
+            iterations: 1
+            jfr-delay: "50s"
+            profile: core
 
           # extended locations that are run only after merging to dev-2.x
 
@@ -76,7 +75,7 @@ jobs:
 
       - name: Set up Maven
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
-        uses: stCarolas/setup-maven@v.4.5
+        uses: stCarolas/setup-maven@v5
         with:
           maven-version: 3.8.2
 
@@ -103,7 +102,7 @@ jobs:
 
       - name: Archive travel results file
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.location }}-travelSearch-results.csv
           path: test/performance/${{ matrix.location }}/travelSearch-results.csv

README.md

@@ -1,7 +1,9 @@
 ## Overview
 
 [![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner)
+[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat&?cacheSeconds=172800)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
 [![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner)
+[![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors)
 [![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner)
 
 OpenTripPlanner (OTP) is an open source multi-modal trip planner, focusing on travel by scheduled
@@ -14,7 +16,7 @@ GTFS and OpenStreetMap). It applies real-time updates and alerts with immediate
 clients, finding itineraries that account for disruptions and service changes.
 
 Note that this branch contains **OpenTripPlanner 2**, the second major version of OTP, which has
-been under development since 2018. The latest version of OTP is v2.4.0, released in September 2023.
+been under development since 2018. The latest version of OTP is v2.5.0, released in March 2024.
 
 If you do not want to use this version, please switch to the final 1.x release
 tag `v1.5.0` or the `dev-1.x` branch.
@@ -58,18 +60,9 @@ the world.
 
 ## Getting in touch
 
-The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner)
-where most of the core developers are. You can also send questions and comments to the 
-[mailing list](http://groups.google.com/group/opentripplanner-users).
-
-Changes and extensions to OTP are debated in issues on [GitHub](https://github.com/opentripplanner/OpenTripPlanner/issues)
-and in the  [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner). More general 
-questions and announcements of interest to non-developer OTP users should be directed to
-the [opentripplanner-users](https://groups.google.com/forum/#!forum/opentripplanner-users) list.
-Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be
-found in the main documentation.
+The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is used almost exclusively for project announcements. The mailing list and issue tracker are not intended for support questions or discussions. Please use the chat for this purpose. Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be found in the main documentation.
 
 ## OTP Ecosystem
 
-- [awesome-transit](https://github.com/CUTR-at-USF/awesome-transit) Community list of transit APIs,
+- [awesome-transit](https://github.com/MobilityData/awesome-transit) Community list of transit APIs,
   apps, datasets, research, and software.