Merge branch 'release/6.1.0'

WikiWatershed · May 6, 2024 · e9de3bf · e9de3bf
2 parents acf7993 + b88e56f
commit e9de3bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 6.1.0
+
+- Updates max content length configuration for Akka Http 10.5,
+  allowing for HUC-8 requests
+
 ## 6.0.0
 
 - Upgrades the GeoTrellis library to `3.7.0`, the latest at this time

diff --git a/api/src/main/resources/application.conf b/api/src/main/resources/application.conf
@@ -13,9 +13,9 @@ akka.http {
     idle-timeout = ${?MMW_GEOPROCESSING_TIMEOUT}
     request-timeout = 120 s
     request-timeout = ${?MMW_GEOPROCESSING_TIMEOUT}
-  }
-  parsing {
-    max-content-length = 50m
-    max-content-length = ${?MMW_GEOPROCESSING_MAXLEN}
+    parsing {
+      max-content-length = 50m
+      max-content-length = ${?MMW_GEOPROCESSING_MAXLEN}
+    }
   }
 }
diff --git a/api/src/main/scala/Utils.scala b/api/src/main/scala/Utils.scala
@@ -253,7 +253,7 @@ trait Utils {
     val host = config.getString("geoprocessing.hostname")
     val port = config.getString("geoprocessing.port")
     val timeout = config.getString("akka.http.server.request-timeout")
-    val maxlen = config.getString("akka.http.parsing.max-content-length")
+    val maxlen = config.getString("akka.http.server.parsing.max-content-length")
 
     println("Initializing mmw-geoprocessing with these variables:")
     println(s"MMW_GEOPROCESSING_HOST $host")

diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,7 @@ licenses := Seq(
 
 scalaVersion := Version.scala
 ThisBuild  / scalaVersion := Version.scala
-ThisBuild  / version := "6.0.0"
+ThisBuild  / version := "6.1.0"
 
 lazy val root = Project("mmw-geoprocessing", file("."))
   .aggregate(