From fa0baa6dd80638fdb3de7da0bf68c79dbc8d2e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 11 Aug 2020 16:54:51 +0200 Subject: [PATCH 1/3] Update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3012e1eec6..3e12f2d7f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [20.08.0] - 2020-08-11 ### Added -- Add reload timer to feedstatuspage and displaying when updating is in progress [#2350](https://github.com/greenbone/gsa/pull/2350) -- Add filtered links to GVMD_DATA row in feed status page [#2339](https://github.com/greenbone/gsa/pull/2339) +- Added reload timer to feedstatuspage and displaying when updating is in progress [#2350](https://github.com/greenbone/gsa/pull/2350) +- Added filtered links to GVMD_DATA row in feed status page [#2339](https://github.com/greenbone/gsa/pull/2339) - Added loading indicator for CVEs on CPE detailspage [#2248](https://github.com/greenbone/gsa/pull/2248) - Added new form validation feature, implemented on create and edit ticket dialog [#1782](https://github.com/greenbone/gsa/pull/1782) - Added German translation for About page [#1998](https://github.com/greenbone/gsa/pull/1998) From d764d57d964d2fe0f5acea3776312a46a992bae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 11 Aug 2020 16:55:22 +0200 Subject: [PATCH 2/3] Prepare 20.08.0 release of GSA cmake doesn't support a .0X version schema. Therefore it 20.8 must be used instead. --- CHANGELOG.md | 2 +- CMakeLists.txt | 4 ++-- gsa/CMakeLists.txt | 2 +- gsa/package.json | 2 +- gsad/CMakeLists.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e12f2d7f3..ee66734fdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,7 +75,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Removed "All SecInfo" section [#1685](https://github.com/greenbone/gsa/pull/1685) [#1695](https://github.com/greenbone/gsa/pull/1695) - Removed agents [#1903](https://github.com/greenbone/gsa/pull/1903) -[20.08]: https://github.com/greenbone/gsa/compare/gsa-9.0...gsa-20.08 +[20.08]: https://github.com/greenbone/gsa/compare/gsa-9.0...v20.8.0 ## [9.0.1] - 2020-05-13 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ad10c7f64..9ce469aa9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ message ("-- Configuring Greenbone Security Assistant") # VERSION: Set patch version for stable releases, e.g. "9.0.1", # unset patch version for prereleases, e.g. "9.0" project (greenbone-security-assistant - VERSION 20.08.0) + VERSION 20.8.0) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) @@ -32,7 +32,7 @@ endif (NOT CMAKE_BUILD_TYPE) # set if this is in prerelease status, starting at 0 before first beta release, # unset if this is a stable release series. -set (PROJECT_BETA_RELEASE 0) +# set (PROJECT_BETA_RELEASE 0) ## Retrieve git revision (at configure time) include (ProjectVersion) diff --git a/gsa/CMakeLists.txt b/gsa/CMakeLists.txt index db597d390b..7d99b67756 100644 --- a/gsa/CMakeLists.txt +++ b/gsa/CMakeLists.txt @@ -19,7 +19,7 @@ cmake_minimum_required (VERSION 3.0) message ("-- Configuring gsa") -project (gsa VERSION 20.08 LANGUAGES) +project (gsa VERSION 20.8.0 LANGUAGES) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/gsa/package.json b/gsa/package.json index f3143b3f8f..b5bb119a93 100644 --- a/gsa/package.json +++ b/gsa/package.json @@ -1,6 +1,6 @@ { "name": "gsa", - "version": "20.08", + "version": "20.08.0", "description": "Greenbone Security Assistant", "keywords": [ "openvas", diff --git a/gsad/CMakeLists.txt b/gsad/CMakeLists.txt index 233bf1a513..21719bd3b7 100644 --- a/gsad/CMakeLists.txt +++ b/gsad/CMakeLists.txt @@ -20,7 +20,7 @@ cmake_minimum_required (VERSION 3.0) message ("-- Configuring gsad") -project (gsad VERSION 20.08 LANGUAGES C) +project (gsad VERSION 20.8.0 LANGUAGES C) if (NOT DEFINED PROJECT_VERSION_STRING) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) From 22cf9006ae98b93ae16730da974c571ac972736d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ricks?= Date: Tue, 11 Aug 2020 17:11:24 +0200 Subject: [PATCH 3/3] Update license of GSA in package.json file We switched to AGPLv3+ now. --- gsa/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsa/package.json b/gsa/package.json index b5bb119a93..d8f4db465c 100644 --- a/gsa/package.json +++ b/gsa/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/greenbone/gsa/" }, "author": "Björn Ricks ", - "license": "GPL-2.0+", + "license": "AGPL-3.0+", "main": "src/index.js", "engines": { "node": ">=10.0"