EPMRPP-95256 merge conflicts

reportportal · Sep 23, 2024 · 9dabc46 · 9dabc46
1 parent 5e060f5
commit 9dabc46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     if (releaseMode) {
         compile 'com.epam.reportportal:commons'
     } else {
-        implementation 'com.github.reportportal:commons:59af813d4'
+        implementation 'com.github.reportportal:commons:1fa3eb2'
     }
 
     implementation 'io.swagger.core.v3:swagger-annotations:2.2.9'

diff --git a/project-properties.gradle b/project-properties.gradle
@@ -79,7 +79,7 @@ project.ext {
             (migrationsUrl + '/migrations/76_user_bid_extension.up.sql')               : 'V076__user_bid_extension.sql',
             (migrationsUrl + '/migrations/77_email_server_documentation_link.up.sql')  : 'V077__email_server_documentation_link.sql',
             (migrationsUrl + '/migrations/78_drop_redundant_index.up.sql')             : 'V078__drop_redundant_index.sql',
-            (migrationsUrl + '/migrations/84_notication_update.up.sql')                : 'V084_notication_update.sql',
+            (migrationsUrl + '/migrations/84_notication_update.up.sql')                : 'V084__notication_update.sql',
             (migrationsUrl + '/migrations/86_add_retention_policy_launch.up.sql')      : 'V086__add_retention_policy_launch.sql',
             (migrationsUrl + '/migrations/87_add_group_enam_value.up.sql')             : 'V087__add_group_enam_value.sql',
             (migrationsUrl + '/migrations/88_analytics_data_table.up.sql')             : 'V088__analytics_data_table.sql',

diff --git a/src/main/java/com/epam/ta/reportportal/dao/util/OrganizationMapper.java b/src/main/java/com/epam/ta/reportportal/dao/util/OrganizationMapper.java
@@ -35,9 +35,8 @@
 import com.epam.reportportal.api.model.OrganizationUserRelationRelationships;
 import com.epam.reportportal.api.model.OrganizationUserRelationRelationshipsProjects;
 import com.epam.reportportal.api.model.OrganizationUserRelationRelationshipsProjectsMeta;
-
-import com.epam.reportportal.api.model.UserAccount.AuthProviderEnum;
-import com.epam.reportportal.api.model.UserDetails.InstanceRoleEnum;
+import com.epam.reportportal.api.model.UserAccount.InstanceRoleEnum;
+import com.epam.reportportal.api.model.UserMetadata.AuthProviderEnum;
 import com.epam.ta.reportportal.entity.organization.Organization;
 import com.epam.ta.reportportal.entity.organization.OrganizationFilter;
 import com.fasterxml.jackson.databind.DeserializationFeature;