Skip to content

Commit

Permalink
Merge pull request #30 from reportportal/rc/5.11.0
Browse files Browse the repository at this point in the history
Release 5.11.0
  • Loading branch information
pbortnik authored Feb 12, 2024
2 parents 6957f0d + 70cebfb commit 8976a06
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 19 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build

on:
pull_request:
push:
branches:
- master
- develop
paths-ignore:
- '.github/**'
- README.md
- gradle.properties

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'

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

- name: Setup git credentials
uses: oleksiyrudenko/gha-git-credentials@v2
with:
name: 'reportportal.io'
email: '[email protected]'
token: ${{ secrets.GITHUB_TOKEN }}

- name: Build with Gradle
id: build
run: |
./gradlew build
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:

env:
GH_USER_NAME: github.actor
SCRIPTS_VERSION: 5.7.0
BOM_VERSION: 5.7.0
SCRIPTS_VERSION: 5.10.0
BOM_VERSION: 5.11.2
REPOSITORY_URL: 'https://maven.pkg.github.com/'

jobs:
Expand Down
21 changes: 6 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,16 @@ sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

repositories {
mavenCentral()
if (releaseMode) {
dependencyRepos.forEach { path ->
maven {
setUrl("https://maven.pkg.github.com/reportportal/${path}")
credentials {
username = findProperty("githubUserName")
password = findProperty("githubToken")
}
}
}
} else {
mavenCentral { url "https://repo1.maven.org/maven2" }

if (!releaseMode) {
maven { url 'https://jitpack.io' }
}
}

dependencyManagement {
imports {
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.github.reportportal:commons-bom:5.7.0')
mavenBom(releaseMode ? 'com.epam.reportportal:commons-bom:' + getProperty('bom.version') : 'com.epam.reportportal:commons-bom:5.11.2')
}
}

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

} else {
implementation 'com.github.reportportal:plugin-api:5.7.0'
annotationProcessor 'com.github.reportportal:plugin-api:5.7.0'
implementation 'com.epam.reportportal:plugin-api'
annotationProcessor 'com.epam.reportportal:plugin-api'
}

compile 'com.rallydev.rest:rally-rest-api:2.2.1'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=5.7.3
version=5.11.0
description=EPAM Report portal. Rally Integration Plugin
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@
@Component
public class RallyStrategy implements ReportPortalExtensionPoint, BtsExtension {

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

Expand Down Expand Up @@ -113,7 +115,9 @@ public class RallyStrategy implements ReportPortalExtensionPoint, BtsExtension {

@Override
public Map<String, ?> getPluginParams() {
return Collections.emptyMap();
Map<String, Object> params = new HashMap<>();
params.put(DOCUMENTATION_LINK_FIELD, DOCUMENTATION_LINK);
return params;
}

@Override
Expand Down

0 comments on commit 8976a06

Please sign in to comment.