EPMRPP-97485 fix dependencies

reportportal · Dec 16, 2024 · 6529ef1 · 6529ef1
1 parent 47bb0f9
commit 6529ef1
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,6 +30,8 @@ dependencyManagement {
 }
 
 dependencies {
+    // ALL new dependencies should be included in shadowJar plugin!
+    // transitive dependencies may be required as well. could be checked in runtime only!
     if (releaseMode) {
         implementation 'com.epam.reportportal:commons-dao'
         implementation 'com.epam.reportportal:plugin-api'
@@ -39,17 +41,11 @@ dependencies {
         implementation 'com.github.reportportal:plugin-api:815c74a'
         annotationProcessor 'com.github.reportportal:plugin-api:815c74a'
     }
-    implementation 'org.hibernate:hibernate-core:5.6.15.Final'
-
-    implementation group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
-    implementation group: 'org.jooq', name: 'jooq', version: '3.14.4'
-    implementation 'ch.qos.logback:logback-classic:1.2.3'
-    implementation 'org.slf4j:slf4j-api:1.7.25'
 
     implementation("com.atlassian.jira:jira-rest-java-client-core:6.0.1")
+    implementation "io.atlassian.fugue:fugue:6.0.1"
 
-    testImplementation('org.junit.jupiter:junit-jupiter:5.6.0')
-
+    testImplementation('org.junit.jupiter:junit-jupiter:5.11.0')
 }
 
 test {
@@ -108,8 +104,29 @@ shadowJar {
     configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
-        include(dependency('com.atlassian.jira:jira-rest-java-client-api:6.0.1'))
-        include(dependency('com.atlassian.httpclient:atlassian-httpclient-api:4.0.1'))
+        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:httpcore-mime:.*"))
+        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.glassfish.hk2.external:jakarta.inject:.*"))
+        include(dependency("org.glassfish.hk2:osgi-resource-locator:.*"))
+        include(dependency("org.glassfish.jaxb:jaxb-runtime:.*"))
+
     }
 }
 

diff --git a/project-properties.gradle b/project-properties.gradle
@@ -9,7 +9,3 @@ project.ext {
     releaseMode = project.hasProperty("releaseMode")
     pluginsDir = "$buildDir/plugins"
 }
-
-wrapper {
-    gradleVersion = '5.4.1'
-}
diff --git a/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java b/src/main/java/com/epam/reportportal/extension/jira/CloudJiraExtension.java
@@ -29,9 +29,9 @@
 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.RetrieveUpdateParamsCommand;
 import com.epam.reportportal.extension.jira.command.UserSearchCommand;
 import com.epam.reportportal.extension.jira.command.atlassian.CloudJiraClientProviderExtended;
-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;
@@ -62,7 +62,6 @@
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import org.jasypt.util.text.BasicTextEncryptor;
-import org.jooq.DSLContext;
 import org.pf4j.Extension;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +76,6 @@
  */
 @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";
@@ -91,8 +89,7 @@ public class CloudJiraExtension implements ReportPortalExtensionPoint, Disposabl
   private final Supplier<Map<String, CommonPluginCommand<?>>> commonPluginCommandMapping =
       new MemoizingSupplier<>(this::getCommonCommands);
 
-  @Autowired
-  private ObjectMapper objectMapper;
+  private final ObjectMapper objectMapper;
   private final RequestEntityConverter requestEntityConverter;
 
   private final Supplier<ApplicationListener<PluginEvent>> pluginLoadedListenerSupplier;
@@ -105,7 +102,6 @@ public class CloudJiraExtension implements ReportPortalExtensionPoint, Disposabl
 
   @Autowired
   private ApplicationContext applicationContext;
-
   @Autowired
   private IntegrationTypeRepository integrationTypeRepository;
 
@@ -138,6 +134,7 @@ public CloudJiraExtension(Map<String, Object> initParams) {
     resourcesDir =
         IntegrationTypeProperties.RESOURCES_DIRECTORY.getValue(initParams).map(String::valueOf)
             .orElse("");
+    objectMapper = configureObjectMapper();
 
     pluginLoadedListenerSupplier = new MemoizingSupplier<>(() -> new PluginEventListener(
         PLUGIN_ID, new PluginEventHandlerFactory(integrationTypeRepository, integrationRepository,