Skip to content

Commit d3cc673

Browse files
Merge branch 'opentripplanner:main' into main
2 parents 102aeda + d17207d commit d3cc673

File tree

5 files changed

+33
-8
lines changed

5 files changed

+33
-8
lines changed

Diff for: .github/workflows/release.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Create Github release
2+
3+
on:
4+
push:
5+
tags:
6+
- "*.*.*"
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
- name: Release
18+
uses: softprops/action-gh-release@v2
19+
with:
20+
generate_release_notes: true

Diff for: pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<maven.compiler.source>17</maven.compiler.source>
1919
<maven.compiler.target>17</maven.compiler.target>
20-
<junit.version>5.11.3</junit.version>
21-
<jackson.version>2.18.1</jackson.version>
20+
<junit.version>5.11.4</junit.version>
21+
<jackson.version>2.18.2</jackson.version>
2222
</properties>
2323
<licenses>
2424
<license>
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>ch.qos.logback</groupId>
4646
<artifactId>logback-classic</artifactId>
47-
<version>1.5.12</version>
47+
<version>1.5.15</version>
4848
<scope>provided</scope>
4949
<optional>true</optional>
5050
</dependency>
@@ -77,7 +77,7 @@
7777
<dependency>
7878
<groupId>com.google.guava</groupId>
7979
<artifactId>guava</artifactId>
80-
<version>33.3.1-jre</version>
80+
<version>33.4.0-jre</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>io.leonard</groupId>
@@ -144,7 +144,7 @@
144144
<plugin>
145145
<groupId>org.apache.maven.plugins</groupId>
146146
<artifactId>maven-surefire-plugin</artifactId>
147-
<version>3.5.1</version>
147+
<version>3.5.2</version>
148148
</plugin>
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
@@ -162,7 +162,7 @@
162162
<plugin>
163163
<groupId>org.apache.maven.plugins</groupId>
164164
<artifactId>maven-javadoc-plugin</artifactId>
165-
<version>3.10.1</version>
165+
<version>3.11.2</version>
166166
<configuration>
167167
<doclint>none</doclint>
168168
</configuration>

Diff for: renovate.json5

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
],
66
"prConcurrentLimit": 3,
77
"rebaseWhen": "conflicted",
8+
"labels": [
9+
"Dependencies"
10+
],
811
"packageRules": [
912
{
1013
"description": "automatically merge test, logging and build dependencies",
14+
"groupName": "Test, build and logging dependencies",
1115
"matchPackageNames": [
1216
"org.apache.httpcomponents.client5:httpclient5",
1317
"ch.qos.logback:logback-classic",
@@ -31,7 +35,7 @@
3135
"jakarta.annotation"
3236
],
3337
"automerge": true,
34-
"schedule": "after 11pm and before 5am every weekday"
38+
"schedule": "monthly"
3539
}
3640
],
3741
"timezone": "Europe/Berlin"

Diff for: src/main/java/org/opentripplanner/client/model/LegMode.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public enum LegMode {
77
WALK,
88
RAIL,
99
BUS,
10+
COACH,
1011
SUBWAY,
1112
FERRY,
1213
TRAM,

Diff for: src/test/java/org/opentripplanner/IntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void planPlaceToPlaceWithBanned() throws IOException {
163163

164164
assertFalse(checkTransitLegCondition(result, leg -> leg.agency().id().equals(BANNED_AGENCY)));
165165

166-
//assertFalse(checkTransitLegCondition(result, leg -> leg.route().id().equals(BANNED_ROUTE)));
166+
assertFalse(checkTransitLegCondition(result, leg -> leg.route().id().equals(BANNED_ROUTE)));
167167

168168
assertFalse(checkTransitLegCondition(result, leg -> leg.trip().id().equals(BANNED_TRIP)));
169169
}

0 commit comments

Comments
 (0)