Merge branch 'release/v5.1.3-3'

cloudogu · Sep 6, 2024 · b411835 · b411835
2 parents 718780b + a56b9f3
commit b411835
Show file tree

Hide file tree

Showing 12 changed files with 974 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v5.1.3-3] - 2024-09-06
+### Changed
+- Relicense to AGPL-3.0-only
+
 ## [v5.1.3-2] - 2024-08-13
 ### Changed
 - [#133] Update base image to 3.19.3-1

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM registry.cloudogu.com/official/base:3.19.3-1
 
 LABEL NAME="official/redmine" \
-   VERSION="5.1.3-2" \
+   VERSION="5.1.3-3" \
    maintainer="hello@cloudogu.com"
 
 ENV USER=redmine \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -183,7 +183,7 @@ static def installTestPlugin(EcoSystem ecoSystem, String name) {
 
 def runIntegrationTests(EcoSystem ecoSystem, String additionalCypressArgs) {
     ecoSystem.runCypressIntegrationTests([
-            cypressImage         : "cypress/included:12.17.1",
+            cypressImage         : "cypress/included:13.14.2",
             enableVideo          : params.EnableVideoRecording,
             enableScreenshots    : params.EnableScreenshotRecording,
             additionalCypressArgs: "${additionalCypressArgs}"

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,8 +1,3 @@
-<img src="https://cloudogu.com/images/dogus/redmine.png" alt="redmine logo" height="100px">
-
-
-[![GitHub license](https://img.shields.io/github/license/cloudogu/redmine.svg)](https://github.com/cloudogu/redmine/blob/master/LICENSE)
-[![GitHub release](https://img.shields.io/github/release/cloudogu/redmine.svg)](https://github.com/cloudogu/redmine/releases)
 
 # Redmine Dogu
 
@@ -25,15 +20,21 @@ cesapp install official/redmine
 cesapp start redmine
 ```
 ---
-### What is the Cloudogu EcoSystem?
-The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry. We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus. The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [MIT License](https://cloudogu.com/en/license/?mtm_campaign=redmine&mtm_kwd=license&mtm_source=github&mtm_medium=link).
 
-### How to get in touch?
-Want to talk to the Cloudogu team? Need help or support? There are several ways to get in touch with us:
+## What is the Cloudogu EcoSystem?
+The Cloudogu EcoSystem is an open platform, which lets you choose how and where your team creates great software. Each service or tool is delivered as a Dogu, a Docker container. Each Dogu can easily be integrated in your environment just by pulling it from our registry.
+
+We have a growing number of ready-to-use Dogus, e.g. SCM-Manager, Jenkins, Nexus Repository, SonarQube, Redmine and many more. Every Dogu can be tailored to your specific needs. Take advantage of a central authentication service, a dynamic navigation, that lets you easily switch between the web UIs and a smart configuration magic, which automatically detects and responds to dependencies between Dogus.
+
+The Cloudogu EcoSystem is open source and it runs either on-premises or in the cloud. The Cloudogu EcoSystem is developed by Cloudogu GmbH under [AGPL-3.0-only](https://spdx.org/licenses/AGPL-3.0-only.html).
+
+## License
+Copyright © 2020 - present Cloudogu GmbH
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses/.
+See [LICENSE](LICENSE) for details.
 
-* [Website](https://cloudogu.com/?mtm_campaign=redmine&mtm_kwd=website&mtm_source=github&mtm_medium=link)
-* [myCloudogu-Forum](https://forum.cloudogu.com/topic/34?ctx=1)
-* [Email hello@cloudogu.com](mailto:hello@cloudogu.com)
 
 ---
-&copy; 2020 Cloudogu GmbH - MADE WITH :heart:&nbsp;FOR DEV ADDICTS. [Legal notice / Impressum](https://cloudogu.com/en/imprint/?mtm_campaign=redmine&mtm_kwd=imprint&mtm_source=github&mtm_medium=link)
+MADE WITH :heart:&nbsp;FOR DEV ADDICTS. [Legal notice / Imprint](https://cloudogu.com/en/imprint/?mtm_campaign=ecosystem&mtm_kwd=imprint&mtm_source=github&mtm_medium=link)
diff --git a/docs/gui/release_notes_de.md b/docs/gui/release_notes_de.md
@@ -4,6 +4,9 @@ Im Folgenden finden Sie die Release Notes für das Redmine-Dogu.
 
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/redmine/CHANGELOG/).
 
+## Release 5.1.3-3
+* Die Cloudogu-eigenen Quellen werden von der MIT-Lizenz auf die AGPL-3.0-only relizensiert.
+
 ## Release 5.1.3-2
 * Behebung von kritischem CVE-2024-41110 in Bibliotheksabhängigkeiten. Diese Schwachstelle konnte jedoch nicht aktiv ausgenutzt werden.
 

diff --git a/docs/gui/release_notes_en.md b/docs/gui/release_notes_en.md
@@ -4,6 +4,9 @@ Below you will find the release notes for the Redmine Dogu.
 
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/redmine/CHANGELOG/).
 
+## Release 5.1.3-3
+* Cloudogu's own sources are relicensed from MIT to the AGPL 3.0-only.
+
 ## Release 5.1.3-2
 * Fix of critical CVE-2024-41110 in library dependencies. This vulnerability could not be actively exploited, though.
 

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/redmine",
-  "Version": "5.1.3-2",
+  "Version": "5.1.3-3",
   "DisplayName": "Redmine",
   "Description": "Redmine is a flexible project management web application",
   "Category": "Development Apps",

diff --git a/integrationTests/package.json b/integrationTests/package.json
@@ -2,8 +2,8 @@
   "dependencies": {
     "@badeball/cypress-cucumber-preprocessor": "^16.0.0",
     "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0",
-    "@cloudogu/dogu-integration-test-library": "6.0.1",
-    "cypress": "^12.9.0",
+    "@cloudogu/dogu-integration-test-library": "6.1.1",
+    "cypress": "13.14.2",
     "@bahmutov/cy-api": "^2.2.4"
   },
   "scripts": {