Skip to content

Commit 9455a22

Browse files
ppxlcesmarvin
authored andcommitted
Merge branch 'release/v1.7.5-1'
2 parents 77270b1 + 425edfd commit 9455a22

7 files changed

+16
-6
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v1.7.5-1] - 2024-11-27
11+
### Changed
12+
- [#231] Update spring-boot-starter-parent to 3.3.5 to prevent CVE-2024-52316
13+
1014
## [v1.7.4-1] - 2024-10-22
1115
### Fixed
1216
- [#229] Disable Google Analytics in Markdown-Editor

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -x \
1818

1919
FROM registry.cloudogu.com/official/java:21.0.4-3
2020
LABEL NAME="official/smeagol" \
21-
VERSION="1.7.4-1" \
21+
VERSION="1.7.5-1" \
2222
maintainer="[email protected]"
2323

2424
ENV SERVICE_TAGS=webapp \

docs/gui/release_notes_de.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Im Folgenden finden Sie die Release Notes für Smeagol.
44

55
Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/smeagol/CHANGELOG/).
66

7+
## Unreleased
8+
Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
9+
710
## 1.7.4-1
811
Teile der Applikation haben Anfragen an Google-Analytics geschickt. Diese Anfragen wurden dauerhaft entfernt.
912
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

docs/gui/release_notes_en.md

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Below you will find the release notes for Smeagol.
44

55
Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/en/docs/dogus/smeagol/CHANGELOG/).
66

7+
## Unreleased
8+
We have only made technical changes. You can find more details in the changelogs.
9+
710
## 1.7.4-1
811
Parts of the application have sent requests to Google Analytics. These requests have been permanently removed.
912
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

dogu.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "official/smeagol",
3-
"Version": "1.7.4-1",
3+
"Version": "1.7.5-1",
44
"DisplayName": "Smeagol",
55
"Description": "Store your technical documentation with in your git repositories",
66
"Category": "Development Apps",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "smeagol",
3-
"version": "1.7.4-1",
3+
"version": "1.7.5-1",
44
"private": true,
55
"license": "AGPL-3.0-only",
66
"dependencies": {

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.3.2</version>
9+
<version>3.3.5</version>
1010
<relativePath/>
1111
</parent>
1212

1313
<groupId>com.cloudogu.wiki</groupId>
1414
<artifactId>smeagol</artifactId>
15-
<version>1.7.4-1</version>
15+
<version>1.7.5-1</version>
1616
<name>smeagol</name>
1717
<packaging>war</packaging>
1818

@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.springframework</groupId>
4141
<artifactId>spring-web</artifactId>
42-
<version>6.1.11</version>
42+
<version>6.1.15</version>
4343
</dependency>
4444

4545
<dependency>

0 commit comments

Comments
 (0)