Merge branch 'develop' of https://github.com/reportportal/plugin-import-junit into develop

Author: pbortnik

.github/workflows/release.yml

@@ -12,8 +12,8 @@ on:
 
 env:
   GH_USER_NAME: github.actor
-  SCRIPTS_VERSION: 5.12.0
-  BOM_VERSION: 5.12.1
+  SCRIPTS_VERSION: 5.12.1
+  BOM_VERSION: 5.13.0
 
 jobs:
   release:

build.gradle

@@ -1,8 +1,9 @@
 plugins {
-    id "io.spring.dependency-management" version "1.0.9.RELEASE"
+    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.springframework.boot" version "3.4.2" apply false
 }
 
 
@@ -35,23 +36,22 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.12.3')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.13.0')
     }
 }
 
+ext['spring-boot.version'] = "${springBootVersion}"
+
 dependencies {
     if (releaseMode) {
         implementation 'com.epam.reportportal:commons-dao'
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:develop-SNAPSHOT'
-        implementation 'com.github.reportportal:commons:develop-SNAPSHOT'
-        implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
-        annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
+        implementation 'com.github.reportportal:commons-dao:11fa2a6'
+        implementation 'com.github.reportportal:plugin-api:8874441'
+        annotationProcessor 'com.github.reportportal:plugin-api:8874441'
     }
-    implementation('org.hibernate:hibernate-core:5.4.18.Final')
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.7'
 
 }
 
@@ -113,6 +113,7 @@ shadowJar {
     configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
+        include(dependency('commons-io:commons-io:2.15.1'))
     }
 }
 
@@ -135,6 +136,3 @@ task assemblePlugin(type: Copy) {
 task assemblePlugins(type: Copy) {
     dependsOn subprojects.assemblePlugin
 }
-
-//compileJava.dependsOn npm_run_build
-

gradle.properties

@@ -1,3 +1,5 @@
-version=1.0.1
+version=1.0.2
 description=Reinforce you ReportPortal instance with JUnit import functionality and easily upload your log files right to ReportPortal.
 pluginId=junit
+
+springBootVersion=3.4.2

src/main/java/com/epam/reportportal/extension/importing/ImportXUnitPluginExtension.java

@@ -22,12 +22,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 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 javax.annotation.PostConstruct;
 import org.pf4j.Extension;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/epam/reportportal/extension/importing/event/handler/plugin/PluginLoadedEventHandler.java

@@ -1,5 +1,7 @@
 package com.epam.reportportal.extension.importing.event.handler.plugin;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.reportportal.extension.event.PluginEvent;
 import com.epam.reportportal.extension.importing.ImportXUnitPluginExtension;
 import com.epam.reportportal.extension.importing.event.handler.EventHandler;
@@ -10,7 +12,6 @@
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -21,8 +22,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author Andrei Piankouski
  */

src/main/java/com/epam/reportportal/extension/importing/event/plugin/PluginEventHandlerFactory.java

@@ -6,7 +6,6 @@
 import com.epam.reportportal.extension.importing.event.handler.plugin.PluginLoadedEventHandler;
 import com.epam.ta.reportportal.dao.IntegrationRepository;
 import com.epam.ta.reportportal.dao.IntegrationTypeRepository;
-
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/com/epam/reportportal/extension/importing/event/plugin/PluginEventListener.java

@@ -1,11 +1,11 @@
 package com.epam.reportportal.extension.importing.event.plugin;
 
+import static java.util.Optional.ofNullable;
+
 import com.epam.reportportal.extension.event.PluginEvent;
 import com.epam.reportportal.extension.importing.event.EventHandlerFactory;
 import org.springframework.context.ApplicationListener;
 
-import static java.util.Optional.ofNullable;
-
 /**
  * @author Andrei Piankouski
  */
@@ -30,4 +30,4 @@ public void onApplicationEvent(PluginEvent event) {
 	private boolean supports(PluginEvent event) {
 		return pluginId.equals(event.getPluginId());
 	}
-}
+}

src/main/java/com/epam/reportportal/extension/importing/service/XunitImportHandler.java

@@ -133,7 +133,7 @@ public void startElement(String uri, String localName, String qName, Attributes
         handleProperty(attributes);
       case UNKNOWN:
       default:
-        LOGGER.warn("Unknown tag: {}", qName);
+        LOGGER.debug("Unknown tag: {}", qName);
         break;
     }
   }
@@ -163,7 +163,7 @@ public void endElement(String uri, String localName, String qName) {
         pushDescription();
       case UNKNOWN:
       default:
-        LOGGER.warn("Unknown tag: {}", qName);
+        LOGGER.debug("Unknown tag: {}", qName);
         break;
     }
   }

src/main/java/com/epam/reportportal/extension/importing/utils/MemoizingSupplier.java

@@ -1,10 +1,10 @@
 package com.epam.reportportal.extension.importing.utils;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * @author Andrei Piankouski
  */