Merge pull request #69 from reportportal/master-to-develop

Master to develop
reportportal · Dec 20, 2024 · 84fe9fc · 84fe9fc
2 parents f88c845 + 9088c8b
commit 84fe9fc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
@@ -23,7 +23,7 @@ on:
 env:
   REPOSITORY_URL: 'https://maven.pkg.github.com'
   UPSTREAM_REPOSITORY_URL: 'https://oss.sonatype.org'
-  PACKAGE_SUFFIXES: '-javadoc.jar,-javadoc.jar.asc,-sources.jar,-sources.jar.asc,.jar,.jar.asc,.pom,.pom.asc'
+  PACKAGE_SUFFIXES: '-javadoc.jar,-javadoc.jar.asc,-sources.jar,-sources.jar.asc,-all.jar,-all.jar.asc,.pom,.pom.asc'
   PACKAGE: 'com.epam.reportportal'
 
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,8 +11,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:

diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.13.0')
     }
 }
 
@@ -37,8 +37,8 @@ dependencies {
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-dao:a98c172'
-        implementation 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
-        annotationProcessor 'com.github.reportportal:plugin-api:develop-SNAPSHOT'
+        implementation 'com.github.reportportal:plugin-api:1c2f758'
+        annotationProcessor 'com.github.reportportal:plugin-api:1c2f758'
     }
     implementation 'org.hibernate:hibernate-core:5.6.15.Final'
 
@@ -118,6 +118,9 @@ shadowJar {
     configurations = [project.configurations.compileClasspath]
     zip64 true
     dependencies {
+        include(dependency('com.squareup.okhttp:.*:.*'))
+        include(dependency('io.gsonfire:gson-fire:.*'))
+        include(dependency('org.threeten:threetenbp:.*'))
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version=5.12.0
+version=5.12.1
 description=EPAM Report Portal. Azure DevOps plugin
 pluginId = Azure DevOps