Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v5

- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
java-version: '25'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/manually-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 21
uses: actions/setup-java@v2
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
java-version: '25'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK 21
uses: actions/setup-java@v2
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '21'
distribution: 'temurin'
java-version: '25'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
Expand Down
28 changes: 14 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ plugins {
id 'io.spring.dependency-management' version '1.1.7'
id 'java'
id 'jacoco'
id "com.github.node-gradle.node" version "2.2.1"
id "com.github.node-gradle.node" version "7.1.0"
id "org.openapi.generator" version "7.12.0"
id "org.springframework.boot" version "${springBootVersion}" apply false
id 'com.gradleup.shadow' version '9.3.1'
}

import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
Expand All @@ -19,11 +20,11 @@ apply from: scriptsUrl + '/release-fat.gradle'
apply from: scriptsUrl + '/signing.gradle'

repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }
maven { url "https://packages.atlassian.com/maven/repository/public" }
mavenCentral { url = "https://repo1.maven.org/maven2" }
maven { url = "https://packages.atlassian.com/maven/repository/public" }

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

Expand All @@ -36,8 +37,8 @@ dependencies {
implementation 'com.epam.reportportal:service-api'
annotationProcessor 'com.epam.reportportal:service-api'
} else {
implementation 'com.github.reportportal:service-api:a47f5cf'
annotationProcessor 'com.github.reportportal:service-api:a47f5cf'
implementation 'com.github.reportportal:service-api:7044a29'
annotationProcessor 'com.github.reportportal:service-api:7044a29'
}
implementation 'jakarta.el:jakarta.el-api:6.0.1'
implementation 'org.glassfish:jakarta.el:4.0.2'
Expand All @@ -49,15 +50,16 @@ dependencies {
testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"

testImplementation('org.junit.jupiter:junit-jupiter:5.11.4')
testImplementation "org.mockito:mockito-junit-jupiter:5.14.2"
testImplementation "org.mockito:mockito-junit-jupiter:5.21.0"
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

}

sourceSets {
main {
java {
srcDirs "$buildDir/generated/src/main/java"
exclude("$buildDir/generated/src/main/java/com/epam/reportportal/api/jira/MyselfApi.java")
srcDirs layout.buildDirectory.dir("generated/src/main/java").get().asFile.path
exclude("${layout.buildDirectory.dir("generated/src/main/java").get().asFile.path}/com/epam/reportportal/api/jira/MyselfApi.java")
}
}
}
Expand All @@ -66,7 +68,7 @@ sourceSets {
tasks.register('generateJiraApi', GenerateTask) {
generatorName.set("java")
inputSpec.set("$rootDir/src/main/resources/openapi/swagger-v3.v3.json")
outputDir.set("$buildDir/generated")
outputDir.set(layout.buildDirectory.dir("generated").get().asFile.path)
configFile.set("$rootDir/src/main/resources/openapi/config.json")
ignoreFileOverride = "${projectDir.path}/.openapi-generator-ignore"
skipOverwrite.set(true)
Expand All @@ -83,9 +85,7 @@ test {

build.dependsOn jacocoTestReport

artifacts {
archives shadowJar
}
assemble.dependsOn shadowJar

sourceSets {
main {
Expand Down Expand Up @@ -125,7 +125,7 @@ shadowJar {
into("/resources")
}
configurations = [project.configurations.compileClasspath]
zip64 true
zip64 = true
dependencies {
include(dependency("jakarta.ws.rs:jakarta.ws.rs-api:.*"))
include(dependency("org.apache.tomcat:tomcat-annotations-api:.*"))
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ version=5.13.5
description=EPAM Report Portal. Cloud Jira plugin
pluginId = JIRA Cloud

springBootVersion=3.4.11
springBootVersion=3.5.9
lombokVersion=1.18.42
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading