Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update STAC up to v1.0.0 #376

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Update STAC up to v1.0.0 #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
963b8c8
Bump Scala and other deps versions up
pomadchin Jun 8, 2021
ae77738
Bump stac4s version up and STAC Catalogs versions
pomadchin Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ aliases:
command: ./scripts/cipublish

# Build environments
- &openjdk8-scala2_12_13_environment
- &openjdk8-scala2_12_14_environment
docker:
- image: circleci/openjdk:8-jdk
environment:
SCALA_VERSION: 2.12.13
SCALA_VERSION: 2.12.14

version: 2
workflows:
version: 2
build:
jobs:
- "openjdk8-scala2.12.13":
filters: # required since `openjdk8-scala2.12.12_deploy` has tag filters AND requires `openjdk8-scala2.12.12`
- "openjdk8-scala2.12.14":
filters: # required since `openjdk8-scala2.12.14_deploy` has tag filters AND requires `openjdk8-scala2.12.14`
tags:
only:
- /^(.*)$/
- "openjdk8-scala2.12.13_deploy":
- "openjdk8-scala2.12.14_deploy":
requires:
- "openjdk8-scala2.12.13"
- "openjdk8-scala2.12.14"
filters:
tags:
only:
Expand All @@ -65,10 +65,10 @@ workflows:
- /hotfix\/.*/

jobs:
"openjdk8-scala2.12.13":
<<: *openjdk8-scala2_12_13_environment
"openjdk8-scala2.12.14":
<<: *openjdk8-scala2_12_14_environment
steps: *run_cibuild

"openjdk8-scala2.12.13_deploy":
<<: *openjdk8-scala2_12_13_environment
"openjdk8-scala2.12.14_deploy":
<<: *openjdk8-scala2_12_14_environment
steps: *run_cipublish
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Changed
- OgcTime logic cleanup [#371](https://github.com/geotrellis/geotrellis-server/pull/371)
- Change RGB nodata handling [#373](https://github.com/geotrellis/geotrellis-server/pull/373)
- Update STAC up to v1.0.0 [#376](https://github.com/geotrellis/geotrellis-server/pull/376)

## [4.4.0] - 2021-04-30

Expand Down
3 changes: 2 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ lazy val commonSettings = Seq(
"osgeo-snapshots" at "https://repo.osgeo.org/repository/snapshot/",
"osgeo-releases" at "https://repo.osgeo.org/repository/release/",
"eclipse-releases" at "https://repo.eclipse.org/content/groups/releases",
"eclipse-snapshots" at "https://repo.eclipse.org/content/groups/snapshots"
"eclipse-snapshots" at "https://repo.eclipse.org/content/groups/snapshots",
"jitpack" at "https://jitpack.io"
),
addCompilerPlugin(kindProjector cross CrossVersion.full),
addCompilerPlugin(macrosParadise cross CrossVersion.full),
Expand Down
4 changes: 2 additions & 2 deletions example/src/main/scala/geotrellis/server/example/ndvi/NdviServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ object NdviServer extends IOApp {
val createServer: Resource[IO, Server[IO]] = {
for {
conf <- ExampleConf.loadResourceF[IO](None)
_ <- Resource.liftF {
_ <- Resource.eval {
logger.info(
s"Initializing NDVI service at ${conf.http.interface}:${conf.http.port}/"
)
}
mamlNdviRendering = new NdviService[IO, GeoTiffNode](
ConcurrentInterpreter.DEFAULT
)
server <- BlazeServerBuilder[IO]
server <- BlazeServerBuilder[IO](executionContext)
.enableHttp2(true)
.bindHttp(conf.http.port, conf.http.interface)
.withHttpApp(
Expand Down
4 changes: 2 additions & 2 deletions example/src/main/scala/geotrellis/server/example/persistence/PersistenceServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object PersistenceServer extends IOApp {
val createServer = {
for {
conf <- ExampleConf.loadResourceF[IO](None)
_ <- Resource.liftF {
_ <- Resource.eval {
logger.info(
s"Initializing persistence demo at ${conf.http.interface}:${conf.http.port}/"
)
Expand All @@ -66,7 +66,7 @@ object PersistenceServer extends IOApp {
](
mamlStore
)
server <- BlazeServerBuilder[IO]
server <- BlazeServerBuilder[IO](executionContext)
.enableHttp2(true)
.bindHttp(conf.http.port, conf.http.interface)
.withHttpApp(
Expand Down
6 changes: 3 additions & 3 deletions ogc-example/src/main/scala/geotrellis/server/ogc/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ object Main
for {
conf <- Conf.loadResourceF[IO](configPath)
simpleSources = conf.layers.values.collect { case rsc: RasterSourceConf => rsc.toLayer }.toList
_ <- Resource.liftF(
_ <- Resource.eval(
logOptState(
conf.wms,
ansi"%green{WMS configuration detected}, starting Web Map Service",
Expand All @@ -129,7 +129,7 @@ object Main
ExtendedParameters.extendedParametersBinding
)
}
_ <- Resource.liftF(
_ <- Resource.eval(
logOptState(
conf.wmts,
ansi"%green{WMTS configuration detected}, starting Web Map Tiling Service",
Expand All @@ -143,7 +143,7 @@ object Main
svc.layerSources(simpleSources)
)
}
_ <- Resource.liftF(
_ <- Resource.eval(
logOptState(
conf.wcs,
ansi"%green{WCS configuration detected}, starting Web Coverage Service",
Expand Down
2 changes: 1 addition & 1 deletion ogc-example/src/main/scala/geotrellis/server/ogc/conf/Conf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ object Conf {
}

def loadResourceF[F[_]: Sync](configPath: Option[String]): Resource[F, Conf] =
Resource.liftF(loadF[F](configPath))
Resource.eval(loadF[F](configPath))

// This is a work-around to use pureconfig to read scalaxb generated case classes
// DataRecord should never be specified from configuration, this satisfied the resolution
Expand Down
24 changes: 12 additions & 12 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ object Dependencies {
def catsVersion(module: String) =
Def.setting {
module match {
case "core" => "org.typelevel" %% s"cats-$module" % "2.4.2"
case "effect" => "org.typelevel" %% s"cats-$module" % "2.3.3"
case "core" => "org.typelevel" %% s"cats-$module" % "2.6.1"
case "effect" => "org.typelevel" %% s"cats-$module" % "2.5.1"
}
}

def circeVersion(module: String) = Def.setting { "io.circe" %% s"circe-$module" % "0.13.0" }
def http4sVer(module: String) = Def.setting { "org.http4s" %% s"http4s-$module" % "0.21.20" }
def circeVersion(module: String) = Def.setting { "io.circe" %% s"circe-$module" % "0.14.1" }
def http4sVer(module: String) = Def.setting { "org.http4s" %% s"http4s-$module" % "0.21.24" }

val crossScalaVer = List("2.12.13")
val crossScalaVer = List("2.12.14")
val scalaVer = crossScalaVer.head

val dispatchVer = "0.11.3"
val gtVer = "3.6.0"
val stac4sVer = "0.4.0-9-gb8eb735-SNAPSHOT"
val stac4sVer = "0.5.0-8-gaab61a6-SNAPSHOT"
val jaxbApiVer = "2.3.1"
val refinedVer = "0.9.20"
val shapelessVer = "2.3.3"
Expand All @@ -30,11 +30,11 @@ object Dependencies {
val circeShapes = circeVersion("shapes")
val circeGeneric = circeVersion("generic")
val circeGenericExtras = circeVersion("generic-extras")
val circeOptics = Def.setting { "io.circe" %% "circe-optics" % "0.13.0" }
val circeOptics = Def.setting { "io.circe" %% "circe-optics" % "0.14.1" }
val circeParser = circeVersion("parser")
val circeRefined = circeVersion("refined")
val circeJava8 = circeVersion("java8")
val commonsIO = "commons-io" % "commons-io" % "2.8.0"
val commonsIO = "commons-io" % "commons-io" % "2.9.0"
val concHashMap = "com.googlecode.concurrentlinkedhashmap" % "concurrentlinkedhashmap-lru" % "1.4.2"
val decline = "com.monovore" %% "decline" % "1.4.0"
val geotrellisRaster = "org.locationtech.geotrellis" %% "geotrellis-raster" % gtVer
Expand All @@ -53,17 +53,17 @@ object Dependencies {
val http4sXml = http4sVer("scala-xml")
val jaxbApi = "javax.xml.bind" % "jaxb-api" % jaxbApiVer
val kindProjector = "org.typelevel" %% "kind-projector" % "0.13.0"
val semanticdbScalac = "org.scalameta" % "semanticdb-scalac" % "4.4.18"
val semanticdbScalac = "org.scalameta" % "semanticdb-scalac" % "4.4.21"
val log4cats = "io.chrisdavenport" %% "log4cats-slf4j" % "1.1.1"
val mamlJvm = "com.azavea.geotrellis" %% "maml-jvm" % "0.6.1"
val pureConfig = "com.github.pureconfig" %% "pureconfig" % "0.14.1"
val pureConfigCatsEffect = "com.github.pureconfig" %% "pureconfig-cats-effect" % "0.14.1"
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.0.2"
val scaffeine = "com.github.blemale" %% "scaffeine" % "4.1.0"
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.3.0"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.5" % Test
val scalatest = "org.scalatest" %% "scalatest" % "3.2.9" % Test
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" % Test
val scalacheckCats = "io.chrisdavenport" %% "cats-scalacheck" % "0.1.1" % Test
val sttpHttp4s = "com.softwaremill.sttp.client3" %% "http4s-ce2-backend" % "3.3.4"
val sttpHttp4s = "com.softwaremill.sttp.client3" %% "http4s-ce2-backend" % "3.3.6"
val macrosParadise = "org.scalamacros" % "paradise" % "2.1.1"
val scalaParser = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
val shapeless = "com.chuusai" %% "shapeless" % shapelessVer
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.29")
10 changes: 5 additions & 5 deletions stac-example/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ postgres:
migrations:
docker run --rm \
--network stac-example_default \
quay.io/azavea/franklin:367cdc7 \
quay.io/azavea/franklin:1574674 \
migrate \
--db-user franklin \
--db-name franklin \
Expand All @@ -23,7 +23,7 @@ import-landsat-stac-collection:
--network stac-example_default \
-e AWS_REGION=us-east-1 \
-v ${PWD}/catalog:/opt/data/ \
quay.io/azavea/franklin:367cdc7 \
quay.io/azavea/franklin:1574674 \
import-catalog \
--db-user franklin \
--db-name franklin \
Expand All @@ -36,7 +36,7 @@ import-landsat-stac-periodic-collection:
--network stac-example_default \
-e AWS_REGION=us-east-1 \
-v ${PWD}/catalog:/opt/data/ \
quay.io/azavea/franklin:367cdc7 \
quay.io/azavea/franklin:1574674 \
import-catalog \
--db-user franklin \
--db-name franklin \
Expand All @@ -49,7 +49,7 @@ import-landsat-stac-layers:
--network stac-example_default \
-e AWS_REGION=us-east-1 \
-v ${PWD}/catalog:/opt/data/ \
quay.io/azavea/franklin:367cdc7 \
quay.io/azavea/franklin:1574674 \
import-catalog \
--db-user franklin \
--db-name franklin \
Expand All @@ -61,7 +61,7 @@ run-franklin:
docker run --rm \
--network stac-example_default \
-p 9090:9090 \
quay.io/azavea/franklin:367cdc7 \
quay.io/azavea/franklin:1574674 \
serve \
--db-user franklin \
--db-name franklin \
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Catalog",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [],
"id": "landsat-stac-collection-catalog",
"title": "STAC for Landsat data",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/landsat-8-l1/2018-05/LC80150322018141LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80150322018141LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/landsat-8-l1/2018-06/LC80140332018166LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80140332018166LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/landsat-8-l1/2018-06/LC80300332018166LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Feature",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/landsat-8-l1/2018-07/LC80150332018189LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80150332018189LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-collection/landsat-8-l1/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Collection",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Catalog",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [],
"id": "landsat-stac-layers-catalog",
"title": "STAC for Landsat data",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/landsat-8-l1/2018-05/LC80150322018141LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80150322018141LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/landsat-8-l1/2018-06/LC80140332018166LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80140332018166LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/landsat-8-l1/2018-06/LC80300332018166LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Feature",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/landsat-8-l1/2018-07/LC80150332018189LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80150332018189LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/landsat-8-l1/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Collection",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/layers/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Catalog",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [],
"id": "layer-us-global",
"title": "Landsat 8 L1",
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/layers/pa.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "layer-pa",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [
"layer"
],
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-layers/layers/us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "layer-us",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [
"layer"
],
Expand Down
2 changes: 1 addition & 1 deletion stac-example/catalog/landsat-stac-periodic-collection/catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"type": "Catalog",
"stac_version": "1.0.0-rc.2",
"stac_version": "1.0.0",
"stac_extensions": [],
"id": "landsat-stac-periodic-catalog",
"title": "STAC for Landsat data",
Expand Down
2 changes: 1 addition & 1 deletion .../catalog/landsat-stac-periodic-collection/landsat-8-l1/2018-05/LC80150322018141LGN00.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "Feature",
"id": "LC80150322018141LGN00",
"stac_version" : "1.0.0-rc.2",
"stac_version" : "1.0.0",
"stac_extensions" : [
"eo",
"view",
Expand Down
Loading