Skip to content

Commit 335ff73

Browse files
authored
Epmrpp 97485 (#37)
1 parent 302a8f5 commit 335ff73

10 files changed

+213
-181
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v2
2020

21-
- name: Set up JDK 11
21+
- name: Set up JDK 21
2222
uses: actions/setup-java@v2
2323
with:
2424
distribution: 'adopt'
25-
java-version: '11'
25+
java-version: '21'
2626

2727
- name: Grant execute permission for gradlew
2828
run: chmod +x gradlew

.github/workflows/manually-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
- name: Checkout repository
2727
uses: actions/checkout@v2
2828

29-
- name: Set up JDK 11
29+
- name: Set up JDK 21
3030
uses: actions/setup-java@v2
3131
with:
3232
distribution: 'adopt'
33-
java-version: '11'
33+
java-version: '21'
3434

3535
- name: Grant execute permission for gradlew
3636
run: chmod +x gradlew

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Checkout repository
2323
uses: actions/checkout@v2
2424

25-
- name: Set up JDK 11
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v2
2727
with:
2828
distribution: 'adopt'
29-
java-version: '11'
29+
java-version: '21'
3030

3131
- name: Grant execute permission for gradlew
3232
run: chmod +x gradlew

.travis.yml

-18
This file was deleted.

build.gradle

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "io.spring.dependency-management" version "1.0.9.RELEASE"
2+
id "io.spring.dependency-management" version "1.1.4"
33
id 'java'
44
id 'jacoco'
55
}
@@ -17,11 +17,12 @@ def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/
1717

1818
apply from: scriptsUrl + '/release-fat.gradle'
1919
apply from: scriptsUrl + '/signing.gradle'
20-
apply from: scriptsUrl + '/build-quality.gradle'
2120

2221

23-
sourceCompatibility = JavaVersion.VERSION_11
24-
targetCompatibility = JavaVersion.VERSION_11
22+
java {
23+
sourceCompatibility = JavaVersion.VERSION_21
24+
targetCompatibility = JavaVersion.VERSION_21
25+
}
2526

2627
repositories {
2728
mavenCentral { url "https://repo1.maven.org/maven2" }
@@ -33,7 +34,7 @@ repositories {
3334

3435
dependencyManagement {
3536
imports {
36-
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.2')
37+
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.12.1')
3738
}
3839
}
3940

@@ -43,30 +44,30 @@ dependencies {
4344
implementation 'com.epam.reportportal:plugin-api'
4445
annotationProcessor 'com.epam.reportportal:plugin-api'
4546
} else {
46-
implementation 'com.github.reportportal:commons-dao:2834dd5'
47-
implementation 'com.github.reportportal:plugin-api:3ecb915657'
48-
annotationProcessor 'com.github.reportportal:plugin-api:3ecb915657'
47+
implementation 'com.github.reportportal:commons-dao:adbb40e'
48+
implementation 'com.github.reportportal:plugin-api:815c74a'
49+
annotationProcessor 'com.github.reportportal:plugin-api:815c74a'
4950
}
5051
implementation 'org.hibernate:hibernate-core:5.6.15.Final'
5152

52-
compile 'com.rallydev.rest:rally-rest-api:2.2.1'
53-
compile 'net.oauth.core:oauth:20090617'
54-
compile 'net.oauth.core:oauth-httpclient4:20090913'
55-
compile 'org.apache.tika:tika-core:1.14'
56-
compile 'javax.inject:javax.inject:1'
53+
implementation 'com.rallydev.rest:rally-rest-api:2.2.1'
54+
implementation 'net.oauth.core:oauth:20090617'
55+
implementation 'net.oauth.core:oauth-httpclient4:20090913'
56+
implementation 'org.apache.tika:tika-core:1.14'
57+
implementation 'javax.inject:javax.inject:1'
5758
}
5859

5960
wrapper {
60-
gradleVersion = '5.4.1'
61+
gradleVersion = '8.10.2'
6162
}
6263

6364
generatePomFileForShadowPublication { pom.packaging = "jar" }
6465

6566
jar {
6667
manifest {
6768
attributes(
68-
"Class-Path": configurations.compile.collect { it.getName() }.join(' '),
69-
"Plugin-Id": "${pluginID}",
69+
"Class-Path": configurations.compileClasspath.collect { it.getName() }.join(' '),
70+
"Plugin-Id": "${pluginId}",
7071
"Plugin-Version": "${project.version}",
7172
"Plugin-Provider": "Andrei Varabyeu",
7273
"Plugin-Class": "com.epam.reportportal.extension.bugtracking.rally.RallyStrategyPlugin",
@@ -86,14 +87,14 @@ shadowJar {
8687
}
8788

8889
task plugin(type: Jar) {
89-
baseName = "plugin-${pluginID}"
90+
getArchiveBaseName().set("plugin-${pluginId}")
9091
into('classes') {
9192
with jar
9293
}
9394
into('lib') {
94-
from configurations.compile
95+
from configurations.compileClasspath
9596
}
96-
extension('zip')
97+
archiveExtension.set('zip')
9798
}
9899

99100
task assemblePlugin(type: Copy) {

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
version=5.11.0
1+
version=5.12.0
22
description=EPAM Report portal. Rally Integration Plugin
3+
pluginId = rally

gradle/wrapper/gradle-wrapper.jar

5.87 KB
Binary file not shown.
+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Feb 16 21:55:33 MSK 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)