Merge pull request #132 from ONLYOFFICE/hotfix/5.0.1

Hotfix/5.0.1
ONLYOFFICE · May 29, 2024 · 753b67f · 753b67f
2 parents a151af2 + 16c8d62
commit 753b67f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 217 deletions.
diff --git a/3rd-Party.license b/3rd-Party.license
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/licenses/3rd-Party.license b/licenses/3rd-Party.license
@@ -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

diff --git a/licenses/com.fasterxml.jackson.core.jackson-databind.license b/licenses/com.fasterxml.jackson.core.jackson-databind.license
diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>

diff --git a/src/main/java/onlyoffice/OnlyOfficeEditorServlet.java b/src/main/java/onlyoffice/OnlyOfficeEditorServlet.java
@@ -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));

diff --git a/src/main/resources/atlassian-plugin-marketing.xml b/src/main/resources/atlassian-plugin-marketing.xml
@@ -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"/>