Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/5.0.1 #132

Merged
merged 4 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions 3rd-Party.license
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ com.atlassian.confluence.confluence - Confluence Core
License: Apache 2.0
License File: com.atlassian.confluence.confluence.licence

com.fasterxml.jackson.core.jackson-databind - General data-binding functionality for Jackson: works on core streaming API (https://github.com/FasterXML/jackson-databind/blob/2.16/LICENSE)
License: Apache 2.0
License File: com.fasterxml.jackson.core.jackson-databind.license

commons-io.commons-io - The Apache Commons IO library contains utility classes, stream implementations, file filters, file comparators, endian transformation classes, and much more.
License: Apache 2.0
License File: commons-io.commons-io.license
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 5.0.1
## Added
- compatible with Confluence 8.9

## Changed
- delete dependency com.fasterxml.jackson.core (CVE-2023-35116)

## 5.0.0
## Added
- compatible with Confluence 8.8
Expand Down
4 changes: 0 additions & 4 deletions licenses/3rd-Party.license
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ com.atlassian.confluence.confluence - Confluence Core
License: Apache 2.0
License File: com.atlassian.confluence.confluence.licence

com.fasterxml.jackson.core.jackson-databind - General data-binding functionality for Jackson: works on core streaming API (https://github.com/FasterXML/jackson-databind/blob/2.16/LICENSE)
License: Apache 2.0
License File: com.fasterxml.jackson.core.jackson-databind.license

commons-io.commons-io - The Apache Commons IO library contains utility classes, stream implementations, file filters, file comparators, endian transformation classes, and much more.
License: Apache 2.0
License File: commons-io.commons-io.license
Expand Down
202 changes: 0 additions & 202 deletions licenses/com.fasterxml.jackson.core.jackson-databind.license

This file was deleted.

7 changes: 1 addition & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>onlyoffice</groupId>
<artifactId>onlyoffice-confluence-plugin</artifactId>
<version>5.0.0</version>
<version>5.0.1</version>

<organization>
<name>Ascensio System SIA</name>
Expand Down Expand Up @@ -37,11 +37,6 @@
<version>20231013</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>com.onlyoffice</groupId>
<artifactId>docs-integration-sdk</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/onlyoffice/OnlyOfficeEditorServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re

ObjectMapper mapper = new ObjectMapper();

context.put("request", request);
context.put("configAsHtml", mapper.writeValueAsString(config));
context.put("historyInfoUriAsHtml", urlManager.getHistoryInfoUri(attachmentId));
context.put("historyDataUriAsHtml", urlManager.getHistoryDataUri(attachmentId));
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/atlassian-plugin-marketing.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<atlassian-plugin-marketing>
<compatibility>
<product name="confluence" min="7.12.0" max="8.8.1" />
<product name="confluence" min="7.12.0" max="8.9.1" />
</compatibility>

<logo image="images/144.png"/>
Expand Down
Loading