Merge branch 'release/v1.7.4-1'

Author: sklein94

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.4-1] - 2024-10-22
+### Fixed
+- [#229] Disable Google Analytics in Markdown-Editor
+
 ## [v1.7.3-4] - 2024-09-25
 ### Changed
 - Switch to new CAS service account structure in dogu.json

Dockerfile

@@ -18,7 +18,7 @@ RUN set -x \
 
 FROM registry.cloudogu.com/official/java:21.0.4-3
 LABEL NAME="official/smeagol" \
-      VERSION="1.7.3-4" \
+      VERSION="1.7.4-1" \
       maintainer="[email protected]"
 
 ENV SERVICE_TAGS=webapp \

Jenkinsfile

@@ -78,6 +78,9 @@ parallel(
             } else if (branch.startsWith("bugfix/")) {
               echo "This branch has been detected as a bugfix branch."
               sh "${scannerHome}/bin/sonar-scanner -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.branch.target=develop"
+            } else {
+              echo "This branch has been detected as a miscellaneous branch."
+              sh "${scannerHome}/bin/sonar-scanner -Dsonar.branch.name=${env.BRANCH_NAME} -Dsonar.branch.target=develop"
             }
           }
           timeout(time: 2, unit: 'MINUTES') { // Needed when there is no webhook for example

docs/gui/release_notes_de.md

@@ -4,6 +4,10 @@ Im Folgenden finden Sie die Release Notes für Smeagol.
 
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/smeagol/CHANGELOG/).
 
+## 1.7.4-1
+Teile der Applikation haben Anfragen an Google-Analytics geschickt. Diese Anfragen wurden dauerhaft entfernt.
+Weitere Informationen dazu sind auf der Seite der Bibliothek zu finden, die bisher diese Anfragen verschickt hat: https://github.com/nhn/tui.editor/tree/v1.4.0?tab=readme-ov-file#collect-statistics-on-the-use-of-open-source
+
 ## 1.7.3-4
 Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
 

docs/gui/release_notes_en.md

@@ -4,6 +4,10 @@ Below you will find the release notes for Smeagol.
 
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/smeagol/CHANGELOG/).
 
+## 1.7.4-1
+Parts of the application have sent requests to Google Analytics. These requests have been permanently removed.
+Further information can be found on the page of the library that previously sent these requests: https://github.com/nhn/tui.editor/tree/v1.4.0?tab=readme-ov-file#collect-statistics-on-the-use-of-open-source
+
 ## 1.7.3-4
 We have only made technical changes. You can find more details in the changelogs.
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/smeagol",
-  "Version": "1.7.3-4",
+  "Version": "1.7.4-1",
   "DisplayName": "Smeagol",
   "Description": "Store your technical documentation with in your git repositories",
   "Category": "Development Apps",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smeagol",
-  "version": "1.7.3-4",
+  "version": "1.7.4-1",
   "private": true,
   "license": "AGPL-3.0-only",
   "dependencies": {

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.cloudogu.wiki</groupId>
     <artifactId>smeagol</artifactId>
-    <version>1.7.3-4</version>
+    <version>1.7.4-1</version>
     <name>smeagol</name>
     <packaging>war</packaging>
 

src/main/js/wiki/components/Markdown.tsx

@@ -61,6 +61,7 @@ class Markdown extends React.Component<Props> {
       viewer: true,
       initialEditType: "markdown",
       initialValue: this.props.content,
+      usageStatistics: false,
       exts: [
         "colorSyntax",
         { name: "uml", rendererURL: "/plantuml/png/" },

src/main/js/wiki/components/MarkdownEditor.tsx

@@ -74,6 +74,7 @@ class MarkdownEditor extends Component<Props, State> {
       previewStyle: "vertical",
       initialEditType: "markdown",
       initialValue: this.props.content,
+      usageStatistics: false,
       exts: [
         "scrollSync",
         "colorSyntax",