Merge pull request #1265 from openkfw/bump-to-v2.1.0

Bump to v2.1.0
openkfw · Aug 11, 2022 · 8f8a30f · 8f8a30f
2 parents 1c0922a + c5cd9e7
commit 8f8a30f
Show file tree

Hide file tree

Showing 18 changed files with 1,696 additions and 556 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,23 +7,32 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 <!-- ## Unreleased -->
 
+<!-- ### Added -->
+
+<!-- ### Changed -->
+
+<!-- ### Deprecated -->
+
+<!-- ### Removed -->
+
+<!-- ### Fixed -->
+
+## [2.1.0] - 2022-08-11
+
 ### Added
 
 - Add a warning in the workflowitem dialog for overwriting permissions [#1189](https://github.com/openkfw/TruBudget/issues/1189)
 - Add Budgets in Table-View [#1226](https://github.com/openkfw/TruBudget/issues/1226)
 - Add Button to view additional data object in Table-View [#1203](https://github.com/openkfw/TruBudget/issues/1203)
 - Docker-compose files including a better structure for more transparent configuration [#1046](https://github.com/openkfw/TruBudget/issues/1046)
-- Add wallet import endpoint to api [#1061](https://github.com/openkfw/TruBudget/pull/1234)
+- Add wallet import endpoint to api [#1234](https://github.com/openkfw/TruBudget/pull/1234)
+- Add migration script (1.x.x -> 2.x.x) to repository [#1061](https://github.com/openkfw/TruBudget/issues/1061)
 
-<!-- ### Changed -->
+### Fixed
 
 - Fixed a bug where the confirmation dialog remains frozen in case of error [#1105](https://github.com/openkfw/TruBudget/issues/1105)
 - Fixed translation in Table-View [#1227](https://github.com/openkfw/TruBudget/issues/1227)
 
-<!-- ### Deprecated -->
-
-<!-- ### Removed -->
-
 ## [2.0.1] - 2022-06-24
 
 ### Changed
@@ -32,8 +41,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [2.0.0] - 2022-06-08
 
-<!-- ### Added -->
-
 ### Changed
 
 - Replaced the master branch name and image tag with main [#1098](https://github.com/openkfw/TruBudget/pull/1098)
@@ -56,8 +63,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - project.list and subproject.list do not contain the `log` property anymore (use history endpoint instead) [#1132](https://github.com/openkfw/TruBudget/issues/1132)
 - Storing offchain documents using the multichain feature is removed, storage-service must be used instead [#1042](https://github.com/openkfw/TruBudget/issues/1042)
 
-<!-- ### Fixed -->
-
 ## [1.30.0] - 2022-06-08
 
 ### Added
@@ -72,10 +77,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - API readiness improvement: API waits for all connected services to be
   up [#1173](https://github.com/openkfw/TruBudget/pull/1173)
 
-<!-- ### Deprecated -->
-
-<!-- ### Removed -->
-
 ### Fixed
 
 - Fixed date picker for setting dates in another timezone [#1082](https://github.com/openkfw/TruBudget/issues/1082)
@@ -86,32 +87,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [2.0.0] -
 
-<!-- ### Added -->
-
-<!-- ### Changed -->
-
-<!-- ### Deprecated -->
-
 ### Removed
 
 - Removed the option to upload documents to the MultiChain offchain storage [#1042](https://github.com/openkfw/TruBudget/issues/1042)
 
-<!-- ### Fixed -->
-
 ## [2.0.0] -
 
-<!-- ### Added -->
-
-<!-- ### Changed -->
-
-<!-- ### Deprecated -->
-
 ### Removed
 
 - Removed the option to upload documents to the MultiChain offchain storage [#1042](https://github.com/openkfw/TruBudget/issues/1042)
 
-<!-- ### Fixed -->
-
 ## [1.29.0] - 2022-03-02
 
 ### Added
@@ -901,7 +886,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Updated translation keys and language-specific formatting.
 - Fixed bug where the subproject permissions dialog would break the details view of another project.
 
-[unreleased]: https://github.com/openkfw/TruBudget/compare/v2.0.1...main
+[unreleased]: https://github.com/openkfw/TruBudget/compare/v2.1.0...main
+[2.1.0]: https://github.com/openkfw/TruBudget/compare/v2.0.1...v2.1.0
 [2.0.1]: https://github.com/openkfw/TruBudget/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/openkfw/TruBudget/compare/v1.30.0...v2.0.0
 [1.30.0]: https://github.com/openkfw/TruBudget/compare/v1.29.0...v1.30.0

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trubudget-api",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/blockchain/package-lock.json b/blockchain/package-lock.json
diff --git a/blockchain/package.json b/blockchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trubudget-blockchain",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "private": true,
   "repository": {
     "type": "git",

diff --git a/bump-tag-versions.sh b/bump-tag-versions.sh
@@ -14,7 +14,7 @@ for project in "${trubudget_projects[@]}"; do
     echo "Bumping $project ..."
     eval "perl -pi -e 's/\"version\": .*/\"version\": \"$trubudget_version\",/' ./package.json"
     eval "npm install --legacy-peer-deps --no-audit"
-    eval "npm audit fix"
+    eval "npm audit fix --legacy-peer-deps"
     if [ $project == frontend ]; then
         echo "Auditing only production dependencies ..."
         eval "npm run audit -- --production"

diff --git a/e2e-test/package-lock.json b/e2e-test/package-lock.json
diff --git a/e2e-test/package.json b/e2e-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trubudget-e2e-test",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "private": true,
   "repository": {
     "type": "git",