Release 5.13.0

Author: APiankouski

.github/workflows/release.yml

@@ -11,8 +11,8 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.12.1
-  BOM_VERSION: 5.13.0
+  SCRIPTS_VERSION: 5.14.0
+  BOM_VERSION: 5.14.2
 
 jobs:
   release:

.openapi-generator-ignore

@@ -0,0 +1,16 @@
+docs/*.md
+api/*.yaml
+
+
+## Exclude APIs
+/**/MyselfApi.java
+/**/Bulk**Api.java
+/**/Work**Api.java
+/**/Screens**Api.java
+/**/Project**Api.java
+
+## Exclude broken model
+/**/ApprovalConfiguration.java
+
+#Force generate
+!/**/ProjectsApi.java

build.gradle

@@ -1,10 +1,14 @@
 plugins {
-    id "io.spring.dependency-management" version "1.1.4"
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'java'
     id 'jacoco'
     id "com.github.node-gradle.node" version "2.2.1"
+    id "org.openapi.generator" version "7.12.0"
+    id "org.springframework.boot" version "3.4.2" apply false
 }
 
+import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
+
 apply from: 'project-properties.gradle'
 
 def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' +
@@ -15,8 +19,8 @@ apply from: scriptsUrl + '/release-fat.gradle'
 apply from: scriptsUrl + '/signing.gradle'
 
 repositories {
-    maven { url "https://packages.atlassian.com/maven/repository/public" }
     mavenCentral { url "https://repo1.maven.org/maven2" }
+    maven { url "https://packages.atlassian.com/maven/repository/public" }
 
     if (!releaseMode) {
         maven { url 'https://jitpack.io' }
@@ -25,9 +29,10 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.14.2')
     }
 }
+ext['spring-boot.version'] = "${springBootVersion}"
 
 dependencies {
     // ALL new dependencies should be included in shadowJar plugin!
@@ -37,16 +42,44 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:8dcc514'
-        implementation 'com.github.reportportal:plugin-api:815c74a'
-        annotationProcessor 'com.github.reportportal:plugin-api:815c74a'
+        implementation 'com.github.reportportal:commons-dao:6298e53'
+        implementation 'com.github.reportportal:plugin-api:8874441'
+        annotationProcessor 'com.github.reportportal:plugin-api:8874441'
     }
 
-    implementation 'org.hibernate:hibernate-core:5.6.15.Final'
-    implementation("com.atlassian.jira:jira-rest-java-client-core:6.0.1")
-    implementation "io.atlassian.fugue:fugue:6.0.1"
+    implementation("org.apache.httpcomponents.client5:httpclient5:5.4.2") // supports gzip encoding
+    implementation "org.hibernate.validator:hibernate-validator:8.0.2.Final"
+    implementation 'jakarta.el:jakarta.el-api:6.0.1'
+    implementation 'org.glassfish:jakarta.el:4.0.2'
+    implementation "org.springdoc:springdoc-openapi-common:1.8.0"
+
+    compileOnly "org.projectlombok:lombok:${lombokVersion}"
+    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
+    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
+
+    testImplementation('org.junit.jupiter:junit-jupiter:5.11.4')
+    testImplementation "org.mockito:mockito-junit-jupiter:5.14.2"
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.11.0')
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs "$buildDir/generated/src/main/java"
+            exclude("$buildDir/generated/src/main/java/com/epam/reportportal/api/jira/MyselfApi.java")
+        }
+    }
+}
+
+
+tasks.register('generateJiraApi', GenerateTask) {
+    generatorName.set("java")
+    inputSpec.set("$rootDir/src/main/resources/openapi/swagger-v3.v3.json")
+    outputDir.set("$buildDir/generated")
+    configFile.set("$rootDir/src/main/resources/openapi/config.json")
+    ignoreFileOverride = "${projectDir.path}/.openapi-generator-ignore"
+    skipOverwrite.set(true)
 }
 
 test {
@@ -104,29 +137,8 @@ shadowJar {
     configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
-        include(dependency("com.atlassian.jira:jira-rest-java-client-api:.*"))
-        include(dependency("com.atlassian.jira:jira-rest-java-client-core:.*"))
-        include(dependency("com.atlassian.httpclient:atlassian-httpclient-api:.*"))
-        include(dependency("com.atlassian.httpclient:atlassian-httpclient-library:.*"))
-        include(dependency("com.atlassian.sal:sal-api:.*"))
-        include(dependency("com.atlassian.event:atlassian-event:.*"))
-        include(dependency("io.atlassian.util.concurrent:atlassian-util-concurrent:.*"))
-        include(dependency("io.atlassian.fugue:fugue:.*"))
-        include(dependency("org.apache.httpcomponents:httpasyncclient:.*"))
-        include(dependency("org.apache.httpcomponents:httpasyncclient-cache:.*"))
-        include(dependency("org.apache.httpcomponents:httpclient:.*"))
-        include(dependency("org.apache.httpcomponents:httpclient-cache:.*"))
-        include(dependency("org.apache.httpcomponents:httpcore:.*"))
-        include(dependency("org.apache.httpcomponents:httpcore-nio:.*"))
-        include(dependency("org.apache.httpcomponents:httpmime:.*"))
-        include(dependency("org.glassfish.jersey.core:jersey-server:.*"))
-        include(dependency("org.glassfish.jersey.core:jersey-common:.*"))
         include(dependency("jakarta.ws.rs:jakarta.ws.rs-api:.*"))
-        //include(dependency("jakarta.annotation:jakarta.annotation-api:.*"))
         include(dependency("org.apache.tomcat:tomcat-annotations-api:.*"))
-        include(dependency("org.glassfish.hk2.external:jakarta.inject:.*"))
-        include(dependency("org.glassfish.hk2:osgi-resource-locator:.*"))
-        include(dependency("org.glassfish.jaxb:jaxb-runtime:.*"))
     }
 }
 
@@ -150,5 +162,4 @@ task assemblePlugins(type: Copy) {
     dependsOn subprojects.assemblePlugin
 }
 
-compileJava.dependsOn npm_run_build
-
+compileJava.dependsOn npm_run_build, generateJiraApi

gradle.properties

@@ -1,3 +1,6 @@
-version=5.12.1
+version=5.13.0
 description=EPAM Report Portal. Cloud Jira plugin
 pluginId = JIRA Cloud
+
+springBootVersion=3.4.2
+lombokVersion=1.18.36

jooq.gradle

@@ -30,9 +30,8 @@
 import com.epam.reportportal.extension.jira.command.PostTicketCommand;
 import com.epam.reportportal.extension.jira.command.RetrieveCreationParamsCommand;
 import com.epam.reportportal.extension.jira.command.RetrieveUpdateParamsCommand;
+import com.epam.reportportal.extension.jira.command.TestConnectionCommand;
 import com.epam.reportportal.extension.jira.command.UserSearchCommand;
-import com.epam.reportportal.extension.jira.command.atlassian.CloudJiraClientProviderExtended;
-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;
 import com.epam.reportportal.extension.jira.event.launch.StartLaunchEventListener;
@@ -52,15 +51,16 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import jakarta.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;
-import javax.annotation.PostConstruct;
 import org.jasypt.util.text.BasicTextEncryptor;
 import org.pf4j.Extension;
 import org.springframework.beans.factory.DisposableBean;
@@ -76,12 +76,17 @@
  */
 @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 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 NAME_FIELD = "name";
+
+  private static final String PLUGIN_NAME = "Jira Cloud";
+
   private final String resourcesDir;
 
   private final Supplier<Map<String, PluginCommand<?>>> pluginCommandMapping =
@@ -96,7 +101,6 @@ public class CloudJiraExtension implements ReportPortalExtensionPoint, Disposabl
   private final Supplier<ApplicationListener<StartLaunchEvent>> startLaunchEventListenerSupplier;
 
   private final Supplier<CloudJiraClientProvider> cloudJiraClientProviderSupplier;
-	private final Supplier<CloudJiraClientProvider> cloudJiraClientProviderExtendedSupplier;
 
   private final Supplier<JIRATicketDescriptionService> jiraTicketDescriptionServiceSupplier;
 
@@ -131,9 +135,8 @@ public class CloudJiraExtension implements ReportPortalExtensionPoint, Disposabl
   private DataStoreService dataStoreService;
 
   public CloudJiraExtension(Map<String, Object> initParams) {
-    resourcesDir =
-        IntegrationTypeProperties.RESOURCES_DIRECTORY.getValue(initParams).map(String::valueOf)
-            .orElse("");
+    resourcesDir = IntegrationTypeProperties.RESOURCES_DIRECTORY.getValue(initParams).map(String::valueOf)
+        .orElse("");
     objectMapper = configureObjectMapper();
 
     pluginLoadedListenerSupplier = new MemoizingSupplier<>(() -> new PluginEventListener(
@@ -145,9 +148,7 @@ PLUGIN_ID, new PluginEventHandlerFactory(integrationTypeRepository, integrationR
 
     requestEntityConverter = new RequestEntityConverter(objectMapper);
 
-    cloudJiraClientProviderSupplier =
-        new MemoizingSupplier<>(() -> new CloudJiraClientProvider(textEncryptor));
-		cloudJiraClientProviderExtendedSupplier = new MemoizingSupplier<>(() -> new CloudJiraClientProviderExtended(textEncryptor));
+    cloudJiraClientProviderSupplier = new MemoizingSupplier<>(() -> new CloudJiraClientProvider(textEncryptor));
 
     jiraTicketDescriptionServiceSupplier = new MemoizingSupplier<>(
         () -> new JIRATicketDescriptionService(logRepository, testItemRepository));
@@ -158,6 +159,7 @@ protected ObjectMapper configureObjectMapper() {
     om.setAnnotationIntrospector(new JacksonAnnotationIntrospector());
     om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true);
     om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    om.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
     om.registerModule(new JavaTimeModule());
     return om;
   }
@@ -167,6 +169,7 @@ protected ObjectMapper configureObjectMapper() {
     Map<String, Object> params = new HashMap<>();
     params.put(ALLOWED_COMMANDS, new ArrayList<>(pluginCommandMapping.get().keySet()));
     params.put(DOCUMENTATION_LINK_FIELD, DOCUMENTATION_LINK);
+    params.put(NAME_FIELD, PLUGIN_NAME);
     params.put(COMMON_COMMANDS, new ArrayList<>(commonPluginCommandMapping.get().keySet()));
     return params;
   }
@@ -224,19 +227,15 @@ private Map<String, CommonPluginCommand<?>> getCommonCommands() {
     return commands.stream().collect(Collectors.toMap(NamedPluginCommand::getName, it -> it));
   }
 
-	private Map<String, PluginCommand<?>> getCommands() {
-		List<PluginCommand<?>> commands = new ArrayList<>();
-		commands.add(new UserSearchCommand(projectRepository, cloudJiraClientProviderSupplier.get()));
-		commands.add(new TestConnectionCommand(cloudJiraClientProviderSupplier.get()));
-		commands.add(new GetIssueFieldsCommand(projectRepository, cloudJiraClientProviderExtendedSupplier.get()));
-		commands.add(new GetIssueTypesCommand(projectRepository, cloudJiraClientProviderSupplier.get()));
-		commands.add(new PostTicketCommand(projectRepository,
-				requestEntityConverter,
-				cloudJiraClientProviderExtendedSupplier.get(),
-				jiraTicketDescriptionServiceSupplier.get(),
-				dataStoreService
-		));
-		return commands.stream().collect(Collectors.toMap(NamedPluginCommand::getName, it -> it));
+  private Map<String, PluginCommand<?>> getCommands() {
+    List<PluginCommand<?>> commands = new ArrayList<>();
+    commands.add(new UserSearchCommand(projectRepository, cloudJiraClientProviderSupplier.get()));
+    commands.add(new TestConnectionCommand(cloudJiraClientProviderSupplier.get()));
+    commands.add(new GetIssueFieldsCommand(projectRepository, cloudJiraClientProviderSupplier.get()));
+    commands.add(new GetIssueTypesCommand(projectRepository, cloudJiraClientProviderSupplier.get()));
+    commands.add(new PostTicketCommand(projectRepository, requestEntityConverter, cloudJiraClientProviderSupplier.get(),
+        jiraTicketDescriptionServiceSupplier.get(), dataStoreService));
+    return commands.stream().collect(Collectors.toMap(NamedPluginCommand::getName, it -> it));
 
   }
 }