5.13.0 Release (#68)

* Update build.gradle * Update build.gradle * Update build.gradle * EPMRPP-97122 || Update to JDK 21 (#65) * Update dependencies (#66) * Update dependencies (#67) * 5.13.0 || Update release version --------- Co-authored-by: Reingold Shekhtel <[email protected]> Co-authored-by: APiankouski <[email protected]>
reportportal · Dec 5, 2024 · c40a12e · c40a12e
1 parent 188792e
commit c40a12e
Show file tree

Hide file tree

Showing 10 changed files with 235 additions and 169 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,11 +18,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/manualy-release.yml b/.github/workflows/manualy-release.yml
@@ -27,11 +27,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/release.yml b/.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
-  RELEASE_VERSION: 5.12.0
+  BOM_VERSION: 5.13.0
+  RELEASE_VERSION: 5.13.0
 
 jobs:
   release:
@@ -22,11 +22,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '21'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.spring.dependency-management' version '1.0.8.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'java-library'
 }
@@ -15,11 +15,12 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/
 
 apply from: scriptsUrl + '/release-commons.gradle'
 apply from: scriptsUrl + '/signing.gradle'
-apply from: scriptsUrl + '/build-quality.gradle'
+//apply from: scriptsUrl + '/build-quality.gradle'
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
-wrapper.gradleVersion('6.0')
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 repositories {
     mavenCentral { url "https://repo1.maven.org/maven2" }
@@ -31,22 +32,25 @@ repositories {
 
 dependencyManagement {
     imports {
-        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.12.1' : 'com.epam.reportportal:commons-bom:5.12.1')
+        mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:5.13.0' : 'com.epam.reportportal:commons-bom:5.13.0')
     }
 }
 
 dependencies {
     if (releaseMode) {
-        api 'com.epam.reportportal:commons-dao'
+        implementation 'com.epam.reportportal:commons-dao'
         api 'com.epam.reportportal:commons'
     } else {
-        api 'com.github.reportportal:commons-dao:823f284'
-        api 'com.github.reportportal:commons:24ea814'
+        implementation 'com.github.reportportal:commons-dao:adbb40e'
+        api 'com.github.reportportal:commons:6e23763'
     }
-
-    implementation 'org.hibernate:hibernate-core:5.6.15.Final'
     api 'org.pf4j:pf4j:3.10.0'
     api 'org.pf4j:pf4j-update:2.3.0'
 
-    testCompile 'junit:junit'
+    testImplementation 'junit:junit'
+}
+
+
+wrapper {
+    gradleVersion = '8.10'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version=5.12.1
+version=5.13.0
 description=EPAM Report portal. Plugin extension APIs
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists