EPMRPP-89384 merge conflicts

reportportal · Feb 28, 2024 · aff8beb · aff8beb
1 parent 84deadf
commit aff8beb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     } else {
         compile 'com.github.reportportal:commons:07566b8e'
         compile 'com.github.reportportal:commons-rules:1f6bfed'
-        compile 'com.github.reportportal:commons-model:41e9fdb'
+        compile 'com.github.reportportal:commons-model:38a52fb'
         implementation 'com.github.reportportal:commons-reporting:c324bab'
     }
 

diff --git a/src/main/java/com/epam/ta/reportportal/dao/util/WidgetContentUtil.java b/src/main/java/com/epam/ta/reportportal/dao/util/WidgetContentUtil.java
@@ -88,7 +88,7 @@
 import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.ws.model.ActivityResource;
 import com.epam.ta.reportportal.ws.reporting.ErrorType;
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

diff --git a/src/main/java/com/epam/ta/reportportal/entity/widget/content/LaunchesTableContent.java b/src/main/java/com/epam/ta/reportportal/entity/widget/content/LaunchesTableContent.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.entity.widget.content;
 
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.LinkedHashMap;

diff --git a/src/main/java/com/epam/ta/reportportal/entity/widget/content/UniqueBugContent.java b/src/main/java/com/epam/ta/reportportal/entity/widget/content/UniqueBugContent.java
@@ -16,7 +16,7 @@
 
 package com.epam.ta.reportportal.entity.widget.content;
 
-import com.epam.ta.reportportal.ws.model.attribute.ItemAttributeResource;
+import com.epam.ta.reportportal.ws.reporting.ItemAttributeResource;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Lists;