Skip to content

Commit

Permalink
Merge branch 'release/4.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin committed Apr 30, 2021
2 parents a72cee5 + 3b6f8fd commit ac8b84a
Show file tree
Hide file tree
Showing 165 changed files with 8,151 additions and 2,250 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,33 @@ aliases:
name: "Import signing key"
command: |
gpg --keyserver keyserver.ubuntu.com \
--recv-keys 0x13E9AA1D8153E95E && \
--recv-keys "0x${GPG_KEY_ID}" && \
echo "${GPG_KEY}" | base64 -d > signing_key.asc && \
gpg --import signing_key.asc
- run:
name: Executing cipublish
command: ./scripts/cipublish

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

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

jobs:
"openjdk8-scala2.12.12":
<<: *openjdk8-scala2_12_12_environment
"openjdk8-scala2.12.13":
<<: *openjdk8-scala2_12_13_environment
steps: *run_cibuild

"openjdk8-scala2.12.12_deploy":
<<: *openjdk8-scala2_12_12_environment
"openjdk8-scala2.12.13_deploy":
<<: *openjdk8-scala2_12_13_environment
steps: *run_cipublish
73 changes: 57 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,65 @@
# Scala #
# Operating System Files

project/boot
project/plugins/project
project/plugins/target
project/target
*.DS_Store
Thumbs.db

# Build Files

bin
target
.ensime*
ensime-langserver.log
pc.stdout.log
\#*#
*~
build/
.gradle
cmake-build-debug

# Eclipse Project Files

.classpath
.project
.settings

# IntelliJ IDEA Files

*.iml
*.ipr
*.iws
*.idea

# Sublime files

*.sublime-workspace

# VSCode files

.vscode
.history

# Metals

.metals
.bloop
metals.sbt

# SBT

.bsp

# Other

.#*
.lib
*.aux.xml
*.jar
*.crc
.idea

_SUCCESS

*.pyc
.cache
.settings
*.swp
*.swo

nohup.out
derby.log
metastore_db/
*.log
.DS_Store
.bloop
.metals
metals.sbt
.history
3 changes: 1 addition & 2 deletions .sbtopts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
-J-Xmx2G
-J-Xms1G
-J-Xss5M
-J-XX:+UseConcMarkSweepGC
-J-XX:+CMSClassUnloadingEnabled
-J-XX:+UseG1GC
-Djava.awt.headless=true
-Dsbt.color=always
-Dsbt.supershell=false
3 changes: 1 addition & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
version = "2.6.1"
version = "2.7.5"
align = most
continuationIndent.callSite = 2
continuationIndent.defnSite = 2
danglingParentheses = true
indentOperator = spray
maxColumn = 150
newlines.alwaysBeforeTopLevelStatements = false
project.excludeFilters = [".*\\.sbt"]
rewrite.rules = [RedundantParens, SortImports]
spaces.inImportCurlyBraces = false
unindentTopLevelOperators = true
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.4.0] - 2021-04-30

## Fixed
- Service endpoints reject requests with unsupported version parameters [#313](https://github.com/geotrellis/geotrellis-server/pull/313)
- Axis Ordering in a wms getmap [#302](https://github.com/geotrellis/geotrellis-server/issues/302)
- Interoperability of STAC and non-STAC layers in mapalgebra layers [#309](https://github.com/geotrellis/geotrellis-server/issues/309)
- OGC endpoints format parameter and HTTP response mime-type not matching [#255](https://github.com/geotrellis/geotrellis-server/issues/255)
- WMS 1.3.0 Boolean representation [#332](https://github.com/geotrellis/geotrellis-server/issues/332)
- Fix WCS projections support [#361](https://github.com/geotrellis/geotrellis-server/pull/361)
- STAC-example cleanup [#363](https://github.com/geotrellis/geotrellis-server/pull/363)

## Added
- WCS services support configuration of `supported-projections` [#314](https://github.com/geotrellis/geotrellis-server/pull/314)
- Add WCS 1.1.0 as the supported version [#330](https://github.com/geotrellis/geotrellis-server/pull/330)
- STAC Collections support [#338](https://github.com/geotrellis/geotrellis-server/issues/338)
- StacAssetRasterSource improvements [#326](https://github.com/geotrellis/geotrellis-server/issues/326)
- StacCollectionRasterSource implementation [#340](https://github.com/geotrellis/geotrellis-server/issues/340)
- WCS Rendering formats support [#195](https://github.com/geotrellis/geotrellis-server/issues/195)
- GeoTrellis Server STAC Package [#350](https://github.com/geotrellis/geotrellis-server/issues/350)
- STAC Collection temporal extents support [#347](https://github.com/geotrellis/geotrellis-server/issues/347)
- OGC Services configurable time representation [#324](https://github.com/geotrellis/geotrellis-server/issues/324)
- Default time period configurable on the WMS layer with a time dimension [#325](https://github.com/geotrellis/geotrellis-server/issues/325)
- STAC Periodic Temporal extent support [#354](https://github.com/geotrellis/geotrellis-server/issues/354)
- WMS GetFeatureInfo [#321](https://github.com/geotrellis/geotrellis-server/issues/321)
- MosaicRasterSource improvements [#344](https://github.com/geotrellis/geotrellis-server/issues/344)

### Changed
- Update GT Server STAC4S dependency [#319](https://github.com/geotrellis/geotrellis-server/issues/319)
- Unnecessary mandatory parameters on WCS 1.1.1 GetCoverage request [#306](https://github.com/geotrellis/geotrellis-server/issues/306)

## [4.3.0] - 2021-02-12

## Added
Expand All @@ -18,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Fixed
- Fix STAC API TemporalExtent JSON representation [#293](https://github.com/geotrellis/geotrellis-server/pull/293)
- XML responses in OGC services include a default namespace [#311](https://github.com/geotrellis/geotrellis-server/pull/311)

## [4.2.0] - 2020-06-23

Expand Down Expand Up @@ -111,7 +142,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Update geotrellis-contrib [#135](https://github.com/geotrellis/geotrellis-server/pull/135)

[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.2.0...HEAD
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.3.0...HEAD
[4.3.0]: https://github.com/geotrellis/geotrellis-server/compare/4.3.0...4.2.0
[4.2.0]: https://github.com/geotrellis/geotrellis-server/compare/4.2.0...4.1.0
[4.1.0]: https://github.com/geotrellis/geotrellis-server/compare/4.0.1...4.1.0
[4.0.1]: https://github.com/geotrellis/geotrellis-server/compare/4.0.0...4.0.1
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# GeoTrellis Server

[![CircleCI](https://circleci.com/gh/geotrellis/geotrellis-server.svg?style=svg)](https://circleci.com/gh/geotrellis/geotrellis-server) [![Join the chat at https://gitter.im/geotrellis/geotrellis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geotrellis/geotrellis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![CircleCI](https://circleci.com/gh/geotrellis/geotrellis-server.svg?style=svg)](https://circleci.com/gh/geotrellis/geotrellis-server) [![Join the chat at https://gitter.im/geotrellis/geotrellis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/geotrellis/geotrellis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/com.azavea.geotrellis/geotrellis-server-core_2.12)](http://search.maven.org/#search%7Cga%7C1%7com.azavea.geotrellis)


GeoTrellis Server is a set of components designed to simplify
viewing, processing, and serving raster data from arbitrary sources
Expand All @@ -13,16 +14,15 @@ or returned, this project aims to simplify the creation of dynamic,
responsive layers whose transformations can be described in MAML
([Map Algebra Modeling Language](https://github.com/geotrellis/maml/)).

### Getting Started with GeoTrellis Server

### Including Geotrellis Server

Current version:
- 0.1.10
GeoTrellis Server is currently available for Scala 2.12.

Add the geotrellis-server dependency by declaring it within your
project's `build.sbt`:
`libraryDependencies += "com.azavea" %% "geotrellis-server-core" % "0.1.10"`
To get started with SBT, simply add the following to your build.sbt file:

```scala
libraryDependencies += "com.azavea.geotrellis" %% "geotrellis-server-core" % "<latest version>"
```

### High level concepts

Expand Down
Loading

0 comments on commit ac8b84a

Please sign in to comment.