Merge pull request #6 from ONLYOFFICE/develop

Develop

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>
@@ -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>

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"/>

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">