Skip to content

Commit 8976a06

Browse files
authored
Merge pull request #30 from reportportal/rc/5.11.0
Release 5.11.0
2 parents 6957f0d + 70cebfb commit 8976a06

File tree

5 files changed

+54
-19
lines changed

5 files changed

+54
-19
lines changed

.github/workflows/build.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Build
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
- develop
9+
paths-ignore:
10+
- '.github/**'
11+
- README.md
12+
- gradle.properties
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v2
20+
21+
- name: Set up JDK 11
22+
uses: actions/setup-java@v2
23+
with:
24+
distribution: 'adopt'
25+
java-version: '11'
26+
27+
- name: Grant execute permission for gradlew
28+
run: chmod +x gradlew
29+
30+
- name: Setup git credentials
31+
uses: oleksiyrudenko/gha-git-credentials@v2
32+
with:
33+
name: 'reportportal.io'
34+
email: 'support@reportportal.io'
35+
token: ${{ secrets.GITHUB_TOKEN }}
36+
37+
- name: Build with Gradle
38+
id: build
39+
run: |
40+
./gradlew build

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111

1212
env:
1313
GH_USER_NAME: github.actor
14-
SCRIPTS_VERSION: 5.7.0
15-
BOM_VERSION: 5.7.0
14+
SCRIPTS_VERSION: 5.10.0
15+
BOM_VERSION: 5.11.2
1616
REPOSITORY_URL: 'https://maven.pkg.github.com/'
1717

1818
jobs:

build.gradle

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,16 @@ sourceCompatibility = JavaVersion.VERSION_11
2424
targetCompatibility = JavaVersion.VERSION_11
2525

2626
repositories {
27-
mavenCentral()
28-
if (releaseMode) {
29-
dependencyRepos.forEach { path ->
30-
maven {
31-
setUrl("https://maven.pkg.github.com/reportportal/${path}")
32-
credentials {
33-
username = findProperty("githubUserName")
34-
password = findProperty("githubToken")
35-
}
36-
}
37-
}
38-
} else {
27+
mavenCentral { url "https://repo1.maven.org/maven2" }
28+
29+
if (!releaseMode) {
3930
maven { url 'https://jitpack.io' }
4031
}
4132
}
4233

4334
dependencyManagement {
4435
imports {
45-
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:5.7.0')
36+
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.2')
4637
}
4738
}
4839

@@ -52,8 +43,8 @@ dependencies {
5243
annotationProcessor 'com.epam.reportportal:plugin-api'
5344

5445
} else {
55-
implementation 'com.github.reportportal:plugin-api:5.7.0'
56-
annotationProcessor 'com.github.reportportal:plugin-api:5.7.0'
46+
implementation 'com.epam.reportportal:plugin-api'
47+
annotationProcessor 'com.epam.reportportal:plugin-api'
5748
}
5849

5950
compile 'com.rallydev.rest:rally-rest-api:2.2.1'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=5.7.3
1+
version=5.11.0
22
description=EPAM Report portal. Rally Integration Plugin

src/main/java/com/epam/reportportal/extension/bugtracking/rally/RallyStrategy.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
@Component
8787
public class RallyStrategy implements ReportPortalExtensionPoint, BtsExtension {
8888

89+
private static final String DOCUMENTATION_LINK_FIELD = "documentationLink";
90+
private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/Rally";
8991
private static final String BUG_TEMPLATE_PATH = "bug_template.ftl";
9092
private static final Logger LOGGER = LoggerFactory.getLogger(RallyStrategy.class);
9193

@@ -113,7 +115,9 @@ public class RallyStrategy implements ReportPortalExtensionPoint, BtsExtension {
113115

114116
@Override
115117
public Map<String, ?> getPluginParams() {
116-
return Collections.emptyMap();
118+
Map<String, Object> params = new HashMap<>();
119+
params.put(DOCUMENTATION_LINK_FIELD, DOCUMENTATION_LINK);
120+
return params;
117121
}
118122

119123
@Override

0 commit comments

Comments
 (0)