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

Bump org.json:json from 20230227 to 20231013 #43

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ab3bfe2
Merge pull request #29 from ONLYOFFICE/develop
LinneyS Oct 31, 2022
3b52fcf
jira v.9.3.1
aleksandrfedorov97 Oct 31, 2022
83c5b8a
Merge pull request #30 from ONLYOFFICE/develop
LinneyS Oct 31, 2022
2101a8f
2.1.0
LinneyS Oct 31, 2022
12d1982
Merge pull request #31 from ONLYOFFICE/feature/jira-v9
LinneyS Oct 31, 2022
53307ce
Update README.md
kseniafedoruk Nov 2, 2022
ef6dbb1
Merge pull request #32 from ONLYOFFICE/feature/update-readme
LinneyS Nov 3, 2022
fd660c5
ci: remove deprecated actions
Nsenz Nov 22, 2022
0548816
ci: linter configuration
Nsenz Jan 30, 2023
af4b827
added: checkstyle-suppressions.xml
aleksandrfedorov97 Mar 16, 2023
560d72e
fix: maven-checkstyle-plugin configuration
aleksandrfedorov97 Mar 17, 2023
5b1790c
feat: linter action
aleksandrfedorov97 Mar 17, 2023
1d3c9cf
Merge pull request #36 from ONLYOFFICE/feat/linter
LinneyS Mar 18, 2023
5d5385d
Merge remote-tracking branch 'remotes/origin/develop' into feature/ji…
LinneyS Mar 18, 2023
775056e
Merge branch 'develop' into feature/jira-v9
aleksandrfedorov97 Jun 13, 2023
a55279b
Merge branch 'develop' into feature/jira-v9
aleksandrfedorov97 Jun 13, 2023
e013f1a
Merge branch 'develop' into feature/jira-v9
aleksandrfedorov97 Jun 19, 2023
53ac79a
compatible with jira version 9.9.*
aleksandrfedorov97 Jun 19, 2023
8ca3644
Merge remote-tracking branch 'remotes/origin/develop' into feature/ji…
LinneyS Jun 19, 2023
664fef2
Merge branch 'develop' into feature/jira-v9
LinneyS Jun 19, 2023
0a42c3b
2.3.0
LinneyS Jun 19, 2023
d8a1cc6
Merge pull request #40 from ONLYOFFICE/feature/jira-v9
LinneyS Jun 19, 2023
54b44d4
Bump org.json:json from 20230227 to 20231013
dependabot[bot] Nov 14, 2023
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# Change Log

## 2.2.0
## 2.3.0
## Added
- compatible with JIRA 9.9.*
- opening for editing not OOXML

## 2.1.0
## Added
- compatible with JIRA 9.*

## 2.0.0
## Added
- download as
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>onlyoffice</groupId>
<artifactId>onlyoffice-jira-app</artifactId>
<version>2.2.0</version>
<version>2.3.0</version>

<organization>
<name>Ascensio System SIA</name>
Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20231013</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -169,7 +169,7 @@
</pluginRepositories>

<properties>
<jira.version>7.13.0</jira.version>
<jira.version>9.0.0</jira.version>
<amps.version>8.0.2</amps.version>
<plugin.testrunner.version>2.0.1</plugin.testrunner.version>
<atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/onlyoffice/action/OnlyOfficeConversion.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
import com.atlassian.jira.issue.attachment.CreateAttachmentParamsBean;
import com.atlassian.jira.issue.history.ChangeItemBean;
import com.atlassian.jira.security.JiraAuthenticationContext;
import com.atlassian.jira.security.request.RequestMethod;
import com.atlassian.jira.user.ApplicationUser;
import com.atlassian.jira.web.action.issue.AbstractIssueSelectAction;
import com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
import com.atlassian.plugin.spring.scanner.annotation.imports.JiraImport;
import com.atlassian.jira.security.request.SupportedMethods;
import onlyoffice.AttachmentUtil;
import onlyoffice.ConfigurationManager;
import onlyoffice.ConversionManager;
Expand Down Expand Up @@ -53,6 +55,7 @@
import java.util.List;

@Scanned
@SupportedMethods({RequestMethod.GET, RequestMethod.POST})
public class OnlyOfficeConversion extends AbstractIssueSelectAction {
private final Logger log = LogManager.getLogger("onlyoffice.action.OnlyOfficeConversion");

Expand Down Expand Up @@ -186,7 +189,7 @@ public String doExecute() throws Exception {

CreateAttachmentParamsBean createAttachmentParamsBean =
new CreateAttachmentParamsBean.Builder(tempFile,
fileName, mimeType, getLoggedInUser(), getIssueObject()).build();
fileName, mimeType, getLoggedInUser(), getIssueObject()).build();

ChangeItemBean changeItemBean = attachmentManager.createAttachment(createAttachmentParamsBean);

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/onlyoffice/action/OnlyOfficeCreateFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import com.atlassian.jira.issue.history.ChangeItemBean;
import com.atlassian.jira.permission.ProjectPermissions;
import com.atlassian.jira.security.JiraAuthenticationContext;
import com.atlassian.jira.security.request.RequestMethod;
import com.atlassian.jira.security.request.SupportedMethods;
import com.atlassian.jira.user.ApplicationUser;
import com.atlassian.jira.web.action.issue.AbstractIssueSelectAction;
import com.atlassian.plugin.PluginAccessor;
Expand All @@ -41,6 +43,7 @@
import java.nio.file.Files;

@Scanned
@SupportedMethods({RequestMethod.GET, RequestMethod.POST})
public class OnlyOfficeCreateFile extends AbstractIssueSelectAction {
private final Logger log = LogManager.getLogger("onlyoffice.action.OnlyOfficeCreateFile");

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="jira" min="7.13.0" max="8.22.6" />
<product name="jira" min="9.0.0" max="9.9.0" />
</compatibility>

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