From 64c7632f231c3f761a9f5865866af1845e4c5f4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:17:30 +0000 Subject: [PATCH 1/4] chore(deps): bump ch.qos.logback:logback-classic from 1.2.3 to 1.2.13 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.3 to 1.2.13. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.3...v_1.2.13) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9abe57646..cea10e000 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.13 From 1c817d8ff1b0e974ed16d662d33977898f421206 Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Tue, 16 Jan 2024 12:14:44 +0000 Subject: [PATCH 2/4] refactor(Updated to include gtfs-lib with pattern name update): --- .github/workflows/maven.yml | 10 +++++----- pom.xml | 2 +- .../manager/jobs/validation/SharedStopsValidator.java | 2 +- .../conveyal/datatools/manager/models/FeedVersion.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7fe151840..f596c83be 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,11 +32,11 @@ jobs: with: java-version: 19 distribution: 'temurin' - # Install node 14 for running e2e tests (and for maven-semantic-release). - - name: Use Node.js 18.x + # Install Node 20.11.0 (LTS) for running e2e tests (and for maven-semantic-release). + - name: Use Node.js 20.x uses: actions/setup-node@v1 with: - node-version: 18.x + node-version: 20.11.0 - name: Start MongoDB uses: supercharge/mongodb-github-action@1.3.0 with: @@ -98,10 +98,10 @@ jobs: # Run maven-semantic-release to potentially create a new release of datatools-server. The flag --skip-maven-deploy is # used to avoid deploying to maven central. So essentially, this just creates a release with a changelog on github. - - name: Use Node.js 18.x + - name: Use Node.js 20.x uses: actions/setup-node@v1 with: - node-version: 18.x + node-version: 20.11.0 - name: Run maven-semantic-release if: env.SAVE_JAR_TO_S3 == 'true' env: diff --git a/pom.xml b/pom.xml index cc7e70c2d..9f0da896a 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.ibi-group gtfs-lib - 3fa0da9 + 12a990f2158d23681788419f832678895d345046 diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java index d608fe249..0377051cb 100644 --- a/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java +++ b/src/main/java/com/conveyal/datatools/manager/jobs/validation/SharedStopsValidator.java @@ -105,7 +105,7 @@ public void validate() { // Check for SS_02 (multiple primary stops per stop group) if (stopGroupsWithPrimaryStops.contains(stopGroupId)) { - registerError(NewGTFSError.forFeed(NewGTFSErrorType.SHARED_STOP_GROUP_MUTLIPLE_PRIMARY_STOPS, stopGroupId)); + registerError(NewGTFSError.forFeed(NewGTFSErrorType.SHARED_STOP_GROUP_MULTIPLE_PRIMARY_STOPS, stopGroupId)); } else if (configReader.get(IS_PRIMARY_INDEX).equals("true")) { stopGroupsWithPrimaryStops.add(stopGroupId); } diff --git a/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java b/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java index d05af58dd..bb87c6187 100644 --- a/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java +++ b/src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java @@ -518,7 +518,7 @@ public boolean hasBlockingIssuesForPublishing() { NewGTFSErrorType.TABLE_IN_SUBDIRECTORY, NewGTFSErrorType.WRONG_NUMBER_OF_FIELDS, NewGTFSErrorType.MULTIPLE_SHARED_STOPS_GROUPS, - NewGTFSErrorType.SHARED_STOP_GROUP_MUTLIPLE_PRIMARY_STOPS + NewGTFSErrorType.SHARED_STOP_GROUP_MULTIPLE_PRIMARY_STOPS )); } From ea9d595f00b9af3ff92307cd7cc8404631de416e Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Tue, 16 Jan 2024 14:24:34 +0000 Subject: [PATCH 3/4] refactor(pom.xml): Bumped GTFS-Lib version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f0da896a..9f9c6ca2f 100644 --- a/pom.xml +++ b/pom.xml @@ -272,7 +272,7 @@ com.github.ibi-group gtfs-lib - 12a990f2158d23681788419f832678895d345046 + f9500a0d9012e22ede8386d64b918ad2d9f4f8d5 From d14b775ce7efa11ead579f36a3604d4e274b58f1 Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Tue, 16 Jan 2024 14:41:22 +0000 Subject: [PATCH 4/4] refactor(maven.yml): Corrected indentation --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f596c83be..0193ac499 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: - name: Use Node.js 20.x uses: actions/setup-node@v1 with: - node-version: 20.11.0 + node-version: 20.11.0 - name: Start MongoDB uses: supercharge/mongodb-github-action@1.3.0 with: