Skip to content

Commit

Permalink
Merge branch 'release/4.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin committed Mar 3, 2020
2 parents 015cf77 + c890dd6 commit 1772870
Show file tree
Hide file tree
Showing 205 changed files with 10,345 additions and 1,783 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ aliases:
docker:
- image: circleci/openjdk:8-jdk
environment:
SCALA_VERSION: 2.12.8
SCALA_VERSION: 2.12.10

version: 2
workflows:
Expand All @@ -56,8 +56,8 @@ workflows:
tags:
only:
- /^(.*)$/
- "openjdk8-scala2.12.8":
filters: # required since `openjdk8-scala2.12.8_deploy` has tag filters AND requires `openjdk8-scala2.12.8`
- "openjdk8-scala2.12.10":
filters: # required since `openjdk8-scala2.12.10_deploy` has tag filters AND requires `openjdk8-scala2.12.10`
tags:
only:
- /^(.*)$/
Expand All @@ -73,9 +73,9 @@ workflows:
- develop
- /release\/.*/
- /hotfix\/.*/
- "openjdk8-scala2.12.8_deploy":
- "openjdk8-scala2.12.10_deploy":
requires:
- "openjdk8-scala2.12.8"
- "openjdk8-scala2.12.10"
filters:
tags:
only:
Expand All @@ -91,14 +91,14 @@ jobs:
<<: *openjdk8-scala2_11_12_environment
steps: *run_cibuild

"openjdk8-scala2.12.8":
"openjdk8-scala2.12.10":
<<: *openjdk8-scala2_12_8_environment
steps: *run_cibuild

"openjdk8-scala2.11.12_deploy":
<<: *openjdk8-scala2_11_12_environment
steps: *run_cipublish

"openjdk8-scala2.12.8_deploy":
"openjdk8-scala2.12.10_deploy":
<<: *openjdk8-scala2_12_8_environment
steps: *run_cipublish
1 change: 1 addition & 0 deletions .jabbarc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[email protected]
2 changes: 2 additions & 0 deletions .sbtopts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
-J-Xms1G
-J-Xss2M
-Djava.awt.headless=true
-Dsbt.color=always
-Dsbt.supershell=false
32 changes: 30 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.1.0] - 2020-03-03

### Added
- Add support for an interpolated version of the color map [#161](https://github.com/geotrellis/geotrellis-server/issues/161)
- Generate WCS 1.1.1 protocol using XSD data model [#188](https://github.com/geotrellis/geotrellis-server/issues/188)
- WCS 1.1.1 GetCoverage Support [#192](https://github.com/geotrellis/geotrellis-server/issues/192)
- RasterSource Catalog [#162](https://github.com/geotrellis/geotrellis-server/issues/162)
- {WCS|WMTS|WMS}Model uses RasterSource catalog [#163](https://github.com/geotrellis/geotrellis-server/issues/163)
- WCS DescribeCoverage may include time TemporalDomain [#211](https://github.com/geotrellis/geotrellis-server/issues/211)

### Changed
- Included split dependencies a la GeoTrellis 3.2 for cats ecosystem libraries [\#184](https://github.com/geotrellis/geotrellis-server/pull/184)
- Dropped WCS 1.0.0 support
- Updated MAML up to 0.6.0 [#199](https://github.com/geotrellis/geotrellis-server/pull/199)
- Add ability to configure subset of OGC services [#151](https://github.com/geotrellis/geotrellis-server/issues/151)

### Fixed
- Use default styles appropriately when configured [#149](https://github.com/geotrellis/geotrellis-server/issues/149)
- Use linspace function to ensure correct interpolation of [#205](https://github.com/geotrellis/geotrellis-server/issues/205)
- SLF4J backends have been excluded and marked as Runtime dependencies as necessary to make logging work again [#205](https://github.com/geotrellis/geotrellis-server/issues/205)
- Fixed color interpolation bug related to constructing a range when the step is 0 [#111](https://github.com/geotrellis/geotrellis-server/issues/111)
- Non-integer (floating point) ColorMap keys now work with or without being quoted [#187](https://github.com/geotrellis/geotrellis-server/issues/187)
- Missing `<ows:Title>` and `<ows:Abstract>` elements in WCS GetCapabilities response [#114](https://github.com/geotrellis/geotrellis-server/issues/114)
- Layer definition elements unused in WMS GetCapabilities response [#115](https://github.com/geotrellis/geotrellis-server/issues/115)
- Bad assembly strategy [#142](https://github.com/geotrellis/geotrellis-server/issues/142)

## [4.0.1] - 2019-11-22

### Changed
- Make publishSettings accessible to aggregate modules
- Make publishSettings accessible to aggregate modules

## [4.0.0]- 2019-11-21

### Added
- Enable artifact publishing for `opengis`, `ogc`, and `stac` subprojects [\#147](https://github.com/geotrellis/geotrellis-server/pull/147)
- Included more link types based on OGC Features API [\#176](https://github.com/geotrellis/geotrellis-server/pull/176)
- Included more OGC specs (sld, se, wfs, filter) [#186](https://github.com/geotrellis/geotrellis-server/pull/186)

### Changed
- *Breaking* Update StacItem and StacLinkType compliance and better ergonomics with labeling extension [\#145](https://github.com/geotrellis/geotrellis-server/pull/145)
Expand All @@ -37,7 +64,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.0.1...HEAD
[Unreleased]: https://github.com/geotrellis/geotrellis-server/compare/4.1.0...HEAD
[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
[4.0.0]: https://github.com/geotrellis/geotrellis-server/compare/3.4.0...4.0.0
[3.4.0]: https://github.com/geotrellis/geotrellis-server/compare/3.3.8...3.4.0
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
### About the library
# 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)

GeoTrellis Server is a set of components designed to simplify
viewing, processing, and serving raster data from arbitrary sources
Expand Down
16 changes: 16 additions & 0 deletions bench/src/main/scala/geotrellis/server/TmsReificationBench.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2020 Azavea
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// package geotrellis.server

// import geotrellis.server.vlm.geotiff._
Expand Down
Loading

0 comments on commit 1772870

Please sign in to comment.