Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}


Expand Down Expand Up @@ -39,19 +40,18 @@ dependencyManagement {
}
}

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:1e6fe09'
implementation 'com.github.reportportal:commons:6e23763'
implementation 'com.github.reportportal:plugin-api:815c74a'
annotationProcessor 'com.github.reportportal:plugin-api:815c74a'
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'

}

Expand Down Expand Up @@ -136,6 +136,3 @@ task assemblePlugin(type: Copy) {
task assemblePlugins(type: Copy) {
dependsOn subprojects.assemblePlugin
}

//compileJava.dependsOn npm_run_build

2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -21,8 +22,6 @@
import java.util.Map;
import java.util.Properties;

import static java.util.Optional.ofNullable;

/**
* @author Andrei Piankouski
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
*/
Expand All @@ -30,4 +30,4 @@ public void onApplicationEvent(PluginEvent event) {
private boolean supports(PluginEvent event) {
return pluginId.equals(event.getPluginId());
}
}
}
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down