Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support using libraries as modules #2131

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "commons-dao"]
path = commons-dao
url = https://github.com/reportportal/commons-dao.git
branch = develop
[submodule "commons"]
path = commons
url = https://github.com/reportportal/commons.git
branch = develop
[submodule "plugin-api"]
path = plugin-api
url = https://github.com/reportportal/plugin-api.git
branch = develop
28 changes: 17 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

plugins {
id "io.spring.dependency-management" version "1.1.4"
id "io.spring.dependency-management" version "1.1.6"
id 'org.springframework.boot' version '2.5.15'
id 'java'
id "org.owasp.dependencycheck" version "9.0.9"
id "org.owasp.dependencycheck" version "11.1.0"
id "com.epam.drill.integration.cicd" version "0.1.6"
}

Expand All @@ -41,6 +41,7 @@ project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from
repositories {
mavenCentral { url "https://repo1.maven.org/maven2" }

// We have to use jitpack for building commons libraries
if (!releaseMode) {
maven { url 'https://jitpack.io' }
}
Expand All @@ -67,15 +68,9 @@ dependencyManagement {
}

dependencies {
if (releaseMode) {
implementation 'com.epam.reportportal:commons-dao'
implementation 'com.epam.reportportal:commons'
implementation 'com.epam.reportportal:plugin-api'
} else {
implementation 'com.github.reportportal:commons-dao:72f99ff'
implementation 'com.github.reportportal:commons:26ab837'
implementation 'com.github.reportportal:plugin-api:8a1f61c'
}
implementation project(':commons')
implementation project(':commons-dao')
implementation project(':plugin-api')

implementation 'org.springframework.boot:spring-boot-starter-aop'
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down Expand Up @@ -194,6 +189,7 @@ dependencyCheck {
}

bootJar {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('' +
'exec')
}
Expand Down Expand Up @@ -234,6 +230,16 @@ drill {
}
}

tasks.register('initGitSubmodules') {
doLast {
exec {
commandLine 'git', 'submodule', 'update', '--init'
}
}
}

compileJava.dependsOn initGitSubmodules

tasks.preTagCommit.enabled = false
tasks.updateVersion.enabled = false
tasks.commitNewVersion.enabled = false
1 change: 1 addition & 0 deletions commons
Submodule commons added at 5708d4
1 change: 1 addition & 0 deletions commons-dao
Submodule commons-dao added at 49a5cf
2 changes: 2 additions & 0 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#This file is generated by updateDaemonJvm
toolchainVersion=21
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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions plugin-api
Submodule plugin-api added at ed2018
1 change: 1 addition & 0 deletions project-properties.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ project.ext {
'method' : 65,
'class' : 90
]
scriptVersion =
isDebugMode = System.getProperty("DEBUG", "false") == "true"
releaseMode = project.hasProperty("releaseMode")
scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop')
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
rootProject.name = 'service-api'

include('commons')
include('commons-dao')
include('plugin-api')
Loading