From 7be364650e170910b1b84174926f70f755fb2590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 21:06:08 +0000 Subject: [PATCH 1/9] chore(deps): bump aws-java-sdk-s3 from 1.11.18 to 1.12.261 Bumps [aws-java-sdk-s3](https://github.com/aws/aws-sdk-java) from 1.11.18 to 1.12.261. - [Release notes](https://github.com/aws/aws-sdk-java/releases) - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.11.18...1.12.261) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-s3 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 fa11a3762..c3d09335d 100644 --- a/pom.xml +++ b/pom.xml @@ -296,7 +296,7 @@ com.amazonaws aws-java-sdk-s3 - 1.11.18 + 1.12.261 From f803a1bd5e57969127bca1e8c4e95f612b718a09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 01:17:59 +0000 Subject: [PATCH 2/9] chore(deps): bump postgresql from 42.2.25 to 42.4.1 Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.25 to 42.4.1. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.25...REL42.4.1) --- updated-dependencies: - dependency-name: org.postgresql:postgresql 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 fa11a3762..a94ac9b44 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ org.postgresql postgresql - 42.2.25 + 42.4.1 org.apache.commons From 68edaeee99e6682440b2a9b6e97c956acbba0001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 21:06:16 +0000 Subject: [PATCH 3/9] chore(deps): bump graphql-java from 11.0 to 17.4 Bumps [graphql-java](https://github.com/graphql-java/graphql-java) from 11.0 to 17.4. - [Release notes](https://github.com/graphql-java/graphql-java/releases) - [Commits](https://github.com/graphql-java/graphql-java/compare/v11.0...v17.4) --- updated-dependencies: - dependency-name: com.graphql-java:graphql-java 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 fa11a3762..81a531f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -331,7 +331,7 @@ com.graphql-java graphql-java - 11.0 + 17.4 From 6d5b3e923bfff16bd7458b39f321d12109297b13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 16:21:01 +0000 Subject: [PATCH 4/9] chore(deps): bump commons-text from 1.6 to 1.10.0 Bumps commons-text from 1.6 to 1.10.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text 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 fa11a3762..86c2ceb74 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ org.apache.commons commons-text - 1.6 + 1.10.0 From 42fc7e1fe29352131e4284d19680ba1f70599942 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:16:50 +0000 Subject: [PATCH 5/9] chore(deps): bump com.google.guava:guava from 30.0-jre to 32.0.0-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 30.0-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava 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 c3d09335d..8cfbc17b7 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ com.google.guava guava - 30.0-jre + 32.0.0-jre org.locationtech.jts From c60b3f7430d2b3a52b3bf9a0a0d366672d9cc0a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:24:45 +0000 Subject: [PATCH 6/9] chore(deps): bump org.postgresql:postgresql from 42.4.1 to 42.4.3 Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.1 to 42.4.3. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.1...REL42.4.3) --- updated-dependencies: - dependency-name: org.postgresql:postgresql 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 66be192b2..889de28ba 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,7 @@ org.postgresql postgresql - 42.4.1 + 42.4.3 org.apache.commons From dc9cd50155da215a392b325bf11e153c03d5011c Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Mon, 21 Aug 2023 11:31:46 +0100 Subject: [PATCH 7/9] refactor(Newer version of java graphql): Newer version breaks existing code, code updated to address --- .../java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java index acd077d3d..27785e448 100644 --- a/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java +++ b/src/main/java/com/conveyal/gtfs/graphql/GraphQLGtfsSchema.java @@ -90,7 +90,12 @@ public class GraphQLGtfsSchema { .field(MapFetcher.field("description")) .build(); - private static final GraphQLScalarType stringList = new GraphQLScalarType("StringList", "List of Strings", new StringCoercing()); + private static final GraphQLScalarType stringList = GraphQLScalarType + .newScalar() + .name("StringList") + .description("List of Strings") + .coercing(new StringCoercing()) + .build(); // Represents GTFS Editor service exceptions. public static final GraphQLObjectType scheduleExceptionType = newObject().name("scheduleException") From 9ff75ccf133dded270c813d1549f901ff8259146 Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Mon, 21 Aug 2023 11:41:56 +0100 Subject: [PATCH 8/9] refactor(maven.yml): Bumped node version to 18 --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9cdc9e195..628c051d4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,11 +29,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - # Install node 14+ for running maven-semantic-release. - - name: Use Node.js 14.x + # Install node 18+ for running maven-semantic-release. + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 18.x - name: Install maven-semantic-release # FIXME: Enable cache for node packages (add package.json?) run: | From cb8d03c1ee4b3137377986b795de406ab8e1a825 Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Thu, 24 Aug 2023 11:05:56 -0400 Subject: [PATCH 9/9] refactor: hacky hack hack access modifier --- .../java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java b/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java index 3e7389ff9..8c2107bac 100644 --- a/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java +++ b/src/main/java/com/conveyal/gtfs/graphql/fetchers/JDBCFetcher.java @@ -180,7 +180,7 @@ public List> get (DataFetchingEnvironment environment) { * Handle fetching functionality for a given namespace, set of join values, and arguments. This is broken out from * the standard get function so that it can be reused in other fetchers (i.e., NestedJdbcFetcher) */ - List> getResults ( + public List> getResults ( String namespace, List parentJoinValues, Map graphQLQueryArguments