Skip to content

Commit

Permalink
Merge branch 'opentripplanner:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-heppner-ibigroup authored Jan 3, 2025
2 parents 102aeda + d17207d commit d3cc673
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 8 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Create Github release

on:
push:
tags:
- "*.*.*"

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Release
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<junit.version>5.11.3</junit.version>
<jackson.version>2.18.1</jackson.version>
<junit.version>5.11.4</junit.version>
<jackson.version>2.18.2</jackson.version>
</properties>
<licenses>
<license>
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.12</version>
<version>1.5.15</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
</dependency>
<dependency>
<groupId>io.leonard</groupId>
Expand Down Expand Up @@ -144,7 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.2</version>
<configuration>
<doclint>none</doclint>
</configuration>
Expand Down
6 changes: 5 additions & 1 deletion renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
],
"prConcurrentLimit": 3,
"rebaseWhen": "conflicted",
"labels": [
"Dependencies"
],
"packageRules": [
{
"description": "automatically merge test, logging and build dependencies",
"groupName": "Test, build and logging dependencies",
"matchPackageNames": [
"org.apache.httpcomponents.client5:httpclient5",
"ch.qos.logback:logback-classic",
Expand All @@ -31,7 +35,7 @@
"jakarta.annotation"
],
"automerge": true,
"schedule": "after 11pm and before 5am every weekday"
"schedule": "monthly"
}
],
"timezone": "Europe/Berlin"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public enum LegMode {
WALK,
RAIL,
BUS,
COACH,
SUBWAY,
FERRY,
TRAM,
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/opentripplanner/IntegrationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public void planPlaceToPlaceWithBanned() throws IOException {

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

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

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

0 comments on commit d3cc673

Please sign in to comment.