Merge branch 'release/v1.7.5-1'

cloudogu · Nov 27, 2024 · 9455a22 · 9455a22
2 parents 77270b1 + 425edfd
commit 9455a22
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.5-1] - 2024-11-27
+### Changed
+- [#231] Update spring-boot-starter-parent to 3.3.5 to prevent CVE-2024-52316
+
 ## [v1.7.4-1] - 2024-10-22
 ### Fixed
 - [#229] Disable Google Analytics in Markdown-Editor

diff --git a/Dockerfile b/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.4-1" \
+      VERSION="1.7.5-1" \
       maintainer="[email protected]"
 
 ENV SERVICE_TAGS=webapp \

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 Smeagol.
 
 Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/smeagol/CHANGELOG/).
 
+## Unreleased
+Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
+
 ## 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

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 Smeagol.
 
 Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/smeagol/CHANGELOG/).
 
+## Unreleased
+We have only made technical changes. You can find more details in the changelogs.
+
 ## 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

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/smeagol",
-  "Version": "1.7.4-1",
+  "Version": "1.7.5-1",
   "DisplayName": "Smeagol",
   "Description": "Store your technical documentation with in your git repositories",
   "Category": "Development Apps",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smeagol",
-  "version": "1.7.4-1",
+  "version": "1.7.5-1",
   "private": true,
   "license": "AGPL-3.0-only",
   "dependencies": {

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.2</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
     <groupId>com.cloudogu.wiki</groupId>
     <artifactId>smeagol</artifactId>
-    <version>1.7.4-1</version>
+    <version>1.7.5-1</version>
     <name>smeagol</name>
     <packaging>war</packaging>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>6.1.11</version>
+            <version>6.1.15</version>
         </dependency>
 
         <dependency>