diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ae2d015..7ea3814 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,8 +11,8 @@ on:
env:
GH_USER_NAME: github.actor
- SCRIPTS_VERSION: 5.7.0
- BOM_VERSION: 5.7.0
+ SCRIPTS_VERSION: 5.10.0
+ BOM_VERSION: 5.11.0
jobs:
release:
diff --git a/build.gradle b/build.gradle
index 7a42d33..71e4a5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
id 'java'
id 'jacoco'
id "com.github.spotbugs" version "3.0.0"
- id "com.moowork.node" version "1.3.1"
+ id "com.github.node-gradle.node" version "2.2.1"
id 'nu.studer.jooq' version '3.0.3'
}
@@ -21,26 +21,16 @@ apply from: scriptsUrl + '/signing.gradle'
repositories {
maven { url "https://packages.atlassian.com/maven/repository/public" }
- mavenCentral()
- mavenLocal()
- if (releaseMode) {
- dependencyRepos.forEach { path ->
- maven {
- setUrl("https://maven.pkg.github.com/reportportal/${path}")
- credentials {
- username = findProperty("githubUserName")
- password = findProperty("githubToken")
- }
- }
- }
- } else {
+ mavenCentral { url "https://repo1.maven.org/maven2" }
+
+ if (!releaseMode) {
maven { url 'https://jitpack.io' }
}
}
dependencyManagement {
imports {
- mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.7.0' : 'com.github.reportportal:commons-bom:5.7.0')
+ mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.11.2' : 'com.epam.reportportal:commons-bom:5.11.2')
}
}
@@ -49,13 +39,10 @@ dependencies {
implementation 'com.epam.reportportal:plugin-api'
annotationProcessor 'com.epam.reportportal:plugin-api'
} else {
- implementation 'com.github.reportportal:plugin-api:b7cced3'
- annotationProcessor 'com.github.reportportal:plugin-api:b7cced3'
+ implementation 'com.epam.reportportal:plugin-api'
+ annotationProcessor 'com.epam.reportportal:plugin-api'
}
-// implementation group: 'org.glassfish', name: 'javax.el', version: '3.0.0'
-// implementation 'org.springframework.boot:spring-boot-starter-web'
-
implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
implementation group: 'org.jooq', name: 'jooq', version: '3.14.4'
jooqRuntime 'org.postgresql:postgresql:42.2.13'
diff --git a/gradle.properties b/gradle.properties
index a5c3cfd..5dda506 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-version=5.7.3
+version=5.11.0
description=EPAM Report Portal. Cloud Jira plugin
pluginId = JIRA Cloud
diff --git a/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java b/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java
index 685ac37..fa8aad4 100644
--- a/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java
+++ b/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java
@@ -13,15 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.epam.reportportal.extension.jira;
-import com.epam.reportportal.extension.*;
+import com.epam.reportportal.extension.CommonPluginCommand;
+import com.epam.reportportal.extension.IntegrationGroupEnum;
+import com.epam.reportportal.extension.NamedPluginCommand;
+import com.epam.reportportal.extension.PluginCommand;
+import com.epam.reportportal.extension.ReportPortalExtensionPoint;
import com.epam.reportportal.extension.common.IntegrationTypeProperties;
import com.epam.reportportal.extension.event.PluginEvent;
import com.epam.reportportal.extension.event.StartLaunchEvent;
-import com.epam.reportportal.extension.jira.command.*;
+import com.epam.reportportal.extension.jira.command.GetIssueCommand;
+import com.epam.reportportal.extension.jira.command.GetIssueFieldsCommand;
+import com.epam.reportportal.extension.jira.command.GetIssueTypesCommand;
+import com.epam.reportportal.extension.jira.command.PostTicketCommand;
+import com.epam.reportportal.extension.jira.command.RetrieveCreationParamsCommand;
import com.epam.reportportal.extension.jira.command.atlassian.CloudJiraClientProviderExtended;
-import com.epam.reportportal.extension.jira.command.binary.GetFileCommand;
+import com.epam.reportportal.extension.jira.command.RetrieveUpdateParamsCommand;
import com.epam.reportportal.extension.jira.command.connection.TestConnectionCommand;
import com.epam.reportportal.extension.jira.command.utils.CloudJiraClientProvider;
import com.epam.reportportal.extension.jira.command.utils.JIRATicketDescriptionService;
@@ -32,12 +41,25 @@
import com.epam.reportportal.extension.jira.utils.MemoizingSupplier;
import com.epam.reportportal.extension.util.RequestEntityConverter;
import com.epam.ta.reportportal.binary.DataStoreService;
-import com.epam.ta.reportportal.dao.*;
+import com.epam.ta.reportportal.dao.IntegrationRepository;
+import com.epam.ta.reportportal.dao.IntegrationTypeRepository;
+import com.epam.ta.reportportal.dao.LaunchRepository;
+import com.epam.ta.reportportal.dao.LogRepository;
+import com.epam.ta.reportportal.dao.ProjectRepository;
+import com.epam.ta.reportportal.dao.TestItemRepository;
+import com.epam.ta.reportportal.dao.TicketRepository;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
import org.jasypt.util.text.BasicTextEncryptor;
import org.jooq.DSLContext;
import org.pf4j.Extension;
@@ -49,167 +71,168 @@
import org.springframework.context.event.ApplicationEventMulticaster;
import org.springframework.context.support.AbstractApplicationContext;
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
/**
* @author Ivan Budayeu
*/
@Extension
public class CloudJiraExtension implements ReportPortalExtensionPoint, DisposableBean {
+ private static final String DOCUMENTATION_LINK_FIELD = "documentationLink";
+ private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/AtlassianJiraCloud";
public static final String BINARY_DATA_PROPERTIES_FILE_ID = "binary-data.properties";
- private static final String PLUGIN_ID = "JIRA Cloud";
+ private static final String PLUGIN_ID = "JIRA Cloud";
- private final String resourcesDir;
+ private final String resourcesDir;
- private final Supplier