From e6f51e49adc9704bdeeddc5bef780381244c949d Mon Sep 17 00:00:00 2001 From: Rob Kooper Date: Sat, 30 Apr 2022 11:06:28 -0500 Subject: [PATCH 1/4] version bump --- CHANGELOG.md | 2 ++ doc/src/sphinx/conf.py | 2 +- project/Build.scala | 2 +- public/swagger.yml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b23d0aae..2489e58b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## 1.20.2 - 2022-04-30 + ## 1.20.1 - 2022-04-04 ### Fixed diff --git a/doc/src/sphinx/conf.py b/doc/src/sphinx/conf.py index c103902ec..cf120a58b 100644 --- a/doc/src/sphinx/conf.py +++ b/doc/src/sphinx/conf.py @@ -22,7 +22,7 @@ author = 'Luigi Marini' # The full version, including alpha/beta/rc tags -release = '1.20.1' +release = '1.20.2' # -- General configuration --------------------------------------------------- diff --git a/project/Build.scala b/project/Build.scala index e12fa7db2..196e7df4f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -13,7 +13,7 @@ import NativePackagerKeys._ object ApplicationBuild extends Build { val appName = "clowder" - val version = "1.20.1" + val version = "1.20.2" val jvm = "1.7" def appVersion: String = { diff --git a/public/swagger.yml b/public/swagger.yml index 78ade0465..548169eae 100644 --- a/public/swagger.yml +++ b/public/swagger.yml @@ -9,7 +9,7 @@ info: Clowder is a customizable and scalable data management system to support any data format and multiple research domains. It is under active development and deployed for a variety of research projects. - version: 1.20.1 + version: 1.20.2 termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos contact: name: Clowder From 1503af5d0b2403f406ef75496ef3d0bc953f0fb5 Mon Sep 17 00:00:00 2001 From: Rob Kooper Date: Sat, 30 Apr 2022 11:10:52 -0500 Subject: [PATCH 2/4] enabled by server admin (fixes #344) --- CHANGELOG.md | 3 +++ app/views/spaces/updateExtractors.scala.html | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2489e58b6..52532121f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## 1.20.2 - 2022-04-30 +### CHanged +- Changed `Enabled By SuperAdmin` to read `Enabled by Server Admin` [#344](https://github.com/clowder-framework/clowder/issues/344) + ## 1.20.1 - 2022-04-04 ### Fixed diff --git a/app/views/spaces/updateExtractors.scala.html b/app/views/spaces/updateExtractors.scala.html index 0e53789a7..6b4147435 100644 --- a/app/views/spaces/updateExtractors.scala.html +++ b/app/views/spaces/updateExtractors.scala.html @@ -35,8 +35,8 @@

Space Extractors

Name Description Process Triggers - Enabled By SuperAdmin - Use Default + Enabled by Server Admin + Use Default Enable in Space Disable in Space From c6e604ed8653d292783700404fc9166a43761847 Mon Sep 17 00:00:00 2001 From: Rob Kooper Date: Sat, 30 Apr 2022 11:20:06 -0500 Subject: [PATCH 3/4] fix swagger lint --- .github/workflows/swagger.yml | 5 +++-- CHANGELOG.md | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index 9db7bbfca..e67d293df 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -22,7 +22,8 @@ jobs: steps: - uses: actions/checkout@v2 + example.openapi.yaml - name: openapi-lint - uses: mhiew/redoc-lint-github-action@v2 + uses: mbowman100/swagger-validator-action@master with: - args: 'public/swagger.yml --skip-rule operation-operationId' + files: public/swagger.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 52532121f..8c6c47351 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## 1.20.2 - 2022-04-30 -### CHanged +### Fixed +- swagger lint action + +### Changed - Changed `Enabled By SuperAdmin` to read `Enabled by Server Admin` [#344](https://github.com/clowder-framework/clowder/issues/344) ## 1.20.1 - 2022-04-04 From 9b6e7625a8fb90276708fe2a6253fdff8c055159 Mon Sep 17 00:00:00 2001 From: Rob Kooper Date: Sat, 30 Apr 2022 11:21:12 -0500 Subject: [PATCH 4/4] remove typo --- .github/workflows/swagger.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index e67d293df..b0f328a67 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -22,7 +22,6 @@ jobs: steps: - uses: actions/checkout@v2 - example.openapi.yaml - name: openapi-lint uses: mbowman100/swagger-validator-action@master with: