From 4f988f92a7be2f07f8bdfe67fdd6095fa0bb45fe Mon Sep 17 00:00:00 2001
From: Andrey Panov <gensurkin@yandex.ru>
Date: Thu, 7 Feb 2019 12:51:42 +0300
Subject: [PATCH 1/2] support confluence v 6.14

---
 pom.xml                                           | 8 ++++----
 src/main/resources/atlassian-plugin-marketing.xml | 2 +-
 src/main/resources/atlassian-plugin.xml           | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 01997ddd..f68a1283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,11 +155,11 @@
     </build>
 
     <properties>
-        <confluence.version>6.4.3</confluence.version>
-        <confluence.data.version>6.4.3</confluence.data.version>
-        <amps.version>6.2.1</amps.version>
+        <confluence.version>6.14.0</confluence.version>
+        <confluence.data.version>6.14.0</confluence.data.version>
+        <amps.version>6.3.21</amps.version>
         <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
-        <atlassian.spring.scanner.version>1.2.12</atlassian.spring.scanner.version>
+        <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
         <!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
     </properties>
diff --git a/src/main/resources/atlassian-plugin-marketing.xml b/src/main/resources/atlassian-plugin-marketing.xml
index de49281e..6f2c3d14 100644
--- 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="5.9.4" max="6.4.3" />
+        <product name="confluence" min="5.9.4" max="6.14.0" />
     </compatibility>
 
     <logo image="images/144.png"/>
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index ed056adb..8e53c7dd 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -13,8 +13,6 @@
         <param name="vendor-logo">images/72.png</param>
     </plugin-info>
 
-    <component-import key="userManager" interface="com.atlassian.sal.api.user.UserManager"/>
-
     <resource type="i18n" name="i18n" location="lang-resource"/>
 
     <web-resource key="onlyoffice-confluence-plugin-resources" name="Link for Web Resources rendering">

From 823f08259715759d6abf726df0f61ab9d312af7a Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 7 Feb 2019 16:00:23 +0300
Subject: [PATCH 2/2] 1.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f68a1283..74e87f35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>onlyoffice</groupId>
     <artifactId>onlyoffice-confluence-plugin</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 
     <organization>
         <name>Ascensio System SIA</name>