Release 5.13.1

Author: APiankouski

gradle.properties

@@ -1,4 +1,4 @@
-version=5.13.0
+version=5.13.1
 description=EPAM Report Portal. Cloud Jira plugin
 pluginId = JIRA Cloud
 

src/main/java/com/epam/reportportal/extension/jira/info/impl/PluginInfoProviderImpl.java

@@ -40,7 +40,7 @@ public class PluginInfoProviderImpl implements PluginInfoProvider {
   private static final String METADATA_KEY = "metadata";
 
   private static final String PLUGIN_DESCRIPTION =
-      "The integration provides an exchange of information between ReportPortal and the JIRA Cloud, such as posting issues and linking issues, getting updates on their statuses.";
+      "The integration provides an exchange of information between ReportPortal and the Jira Cloud, such as posting issues and linking issues, getting updates on their statuses.";
 
   public static final Map<String, Object> PLUGIN_METADATA = new HashMap<>();
 

src/main/java/com/epam/reportportal/extension/jira/utils/IntegrationValidator.java

@@ -28,7 +28,7 @@
  */
 public final class IntegrationValidator {
 
-  private static final String JIRA_URL_PATTERN = "https://[^?]*\\.atlassian\\.(com|net).*";
+  private static final String JIRA_URL_PATTERN = "https://[^?]*\\.(atlassian\\.(com|net)|jira\\.com)/?$";
 
   private IntegrationValidator() {
     //static only

src/test/java/com/epam/reportportal/extension/jira/utils/IntegrationValidatorTest.java

@@ -33,6 +33,9 @@ class IntegrationValidatorTest {
       "https://random.atlassian.com/",
       "https://jira.atlassian.net",
       "https://another.atlassian.net/",
+      "https://atlassian.jira.com/",
+      "https://another.jira.com/",
+      "https://another.jira.com",
   }, delimiter = ',')
   void validateThirdPartyUrl(String url) {
     Assertions.assertDoesNotThrow(() ->
@@ -44,6 +47,9 @@ void validateThirdPartyUrl(String url) {
       "https://atlassian.com/",
       "https://jiraatlassian.com/",
       "https://zloi.hacker.com?jira=fake.atlassian.com",
+      "https://jira.com.zloi.hacker.net",
+      "https://jira.com.zloi.hacker.net/",
+      "https://another.jira.com/admin"
   }, delimiter = ',')
   void validateThirdPartyUrlFailed(String url) {
     Assertions.assertThrows(ReportPortalException.class, () ->

ui/src/components/utils.js

@@ -10,7 +10,7 @@ const composeValidators = (validators) => (value) =>
 
 const jiraCloudUrl = composeValidators([
   isNotEmpty,
-  regex(/https:\/\/[^?]*.atlassian.(net|com).*/),
+  regex(/^https:\/\/[^?]*\.(atlassian\.(com|net)|jira\.com)\/?$/),
 ]);
 
 const bindMessageToValidator = (validator, errorMessage) => (value) =>