branch got out of sync with develop

.github/dependabot.yml

@@ -29,7 +29,7 @@ updates:
       - "dependency"
       - "gradle"
     commit-message:
-      prefix: "[DCJ-400-gradle]"
+      prefix: "[DT-400-gradle]"
     ignore:
       # Google API dependencies use a version format that Dependabot wrongly interprets as semver.
       - dependency-name: "com.google.apis:*"

README.md

@@ -29,13 +29,13 @@ See [started guide](docs/jade-getting-started.md) for information on running con
 ### Run TDR locally
 
 To run TDR locally:
-`./scripts/run local`
+`./scripts/run start_local`
 
 To run TDR in docker:
-`./scripts/run docker`
+`./scripts/run start_docker`
 
 To run TDR locally and wait for debugger to attach on port 5005:
-`./scripts/run local --debug-jvm`
+`./scripts/run start_local --debug-jvm`
 
 To have the code hot reload, enable automatic builds in intellij, go to:
 `Preferences -> Build, Execution, Deployment -> Compiler`

src/main/java/bio/terra/app/configuration/WebConfig.java

@@ -36,6 +36,6 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
   public void addResourceHandlers(ResourceHandlerRegistry registry) {
     registry
         .addResourceHandler("/webjars/swagger-ui-dist/**")
-        .addResourceLocations("classpath:/META-INF/resources/webjars/swagger-ui-dist/4.3.0/");
+        .addResourceLocations("classpath:/META-INF/resources/webjars/swagger-ui-dist/5.18.2/");
   }
 }

src/main/java/bio/terra/common/PdaoLoadStatistics.java

@@ -1,5 +1,6 @@
 package bio.terra.common;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.cloud.bigquery.JobStatistics;
 import java.time.Instant;
 
@@ -9,7 +10,11 @@ public class PdaoLoadStatistics {
   private final Instant startTime;
   private final Instant endTime;
 
-  public PdaoLoadStatistics(long badRecords, long rowCount, Instant startTime, Instant endTime) {
+  public PdaoLoadStatistics(
+      @JsonProperty("badRecords") long badRecords,
+      @JsonProperty("rowCount") long rowCount,
+      @JsonProperty("startTime") Instant startTime,
+      @JsonProperty("endTime") Instant endTime) {
     this.badRecords = badRecords;
     this.rowCount = rowCount;
     this.startTime = startTime;