From 5674230a9e6cb085017dd87f39b39429ffee8671 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:02:56 +0100 Subject: [PATCH 01/14] Add submodule configurations for commons-dao, commons, and plugin-api --- .gitmodules | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..67096bd8da --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "commons-dao"] + path = commons-dao + url = git@github.com:reportportal/commons-dao.git + branch = develop +[submodule "commons"] + path = commons + url = git@github.com:reportportal/commons.git + branch = develop +[submodule "plugin-api"] + path = plugin-api + url = git@github.com:reportportal/plugin-api.git + branch = develop From c276e1c34313cd4b3c6965626fde2761183d05ff Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:03:05 +0100 Subject: [PATCH 02/14] Update dependency versions and restructure project dependencies --- build.gradle | 36 +++++++++++++++++++++--------------- commons | 1 + commons-dao | 1 + plugin-api | 1 + project-properties.gradle | 3 ++- settings.gradle | 4 ++++ 6 files changed, 30 insertions(+), 16 deletions(-) create mode 160000 commons create mode 160000 commons-dao create mode 160000 plugin-api diff --git a/build.gradle b/build.gradle index 291ee43c45..2c7eed2a2e 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } @@ -40,10 +40,6 @@ project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from repositories { mavenCentral { url "https://repo1.maven.org/maven2" } - - if (!releaseMode) { - maven { url 'https://jitpack.io' } - } maven { url "https://jaspersoft.jfrog.io/artifactory/third-party-ce-artifacts" } } @@ -67,15 +63,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' @@ -237,3 +227,19 @@ drill { tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false tasks.commitNewVersion.enabled = false + +tasks.register('initSubmodules') { + doLast { + exec { + commandLine 'git', 'submodule', 'init' + } + } +} + +tasks.register('updateSubmodules') { + doLast { + exec { + commandLine 'git', 'submodule', 'update', '--remote', '--merge' + } + } +} \ No newline at end of file diff --git a/commons b/commons new file mode 160000 index 0000000000..96e0e42bf4 --- /dev/null +++ b/commons @@ -0,0 +1 @@ +Subproject commit 96e0e42bf424d2e40caf6f2aacca3c151741c706 diff --git a/commons-dao b/commons-dao new file mode 160000 index 0000000000..49a5cffb39 --- /dev/null +++ b/commons-dao @@ -0,0 +1 @@ +Subproject commit 49a5cffb391192c6c5a816522afd3b8f530ad588 diff --git a/plugin-api b/plugin-api new file mode 160000 index 0000000000..63113d3298 --- /dev/null +++ b/plugin-api @@ -0,0 +1 @@ +Subproject commit 63113d3298a2aced141db899b5328ae55e45841d diff --git a/project-properties.gradle b/project-properties.gradle index e2855f4db0..a9b51499c2 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -12,8 +12,9 @@ project.ext { 'method' : 65, 'class' : 90 ] + scriptVersion = isDebugMode = System.getProperty("DEBUG", "false") == "true" - releaseMode = project.hasProperty("releaseMode") + releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop') migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.13.0' : 'develop') //TODO refactor with archive download diff --git a/settings.gradle b/settings.gradle index 3178aa6638..92a88b449a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,5 @@ rootProject.name = 'service-api' + +include('commons') +include('commons-dao') +include('plugin-api') \ No newline at end of file From ac13b0d26c0651ee7343141910d95d27c5d3a685 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:44:14 +0100 Subject: [PATCH 03/14] Add dependency on initSubmodules task and update submodule commits --- build.gradle | 4 +++- commons | 2 +- plugin-api | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2c7eed2a2e..f44188ba01 100644 --- a/build.gradle +++ b/build.gradle @@ -242,4 +242,6 @@ tasks.register('updateSubmodules') { commandLine 'git', 'submodule', 'update', '--remote', '--merge' } } -} \ No newline at end of file +} + +tasks.build.dependsOn initSubmodules \ No newline at end of file diff --git a/commons b/commons index 96e0e42bf4..5708d401e6 160000 --- a/commons +++ b/commons @@ -1 +1 @@ -Subproject commit 96e0e42bf424d2e40caf6f2aacca3c151741c706 +Subproject commit 5708d401e64e20172ff7521d2df49bdde3d28ff2 diff --git a/plugin-api b/plugin-api index 63113d3298..ed20181d4e 160000 --- a/plugin-api +++ b/plugin-api @@ -1 +1 @@ -Subproject commit 63113d3298a2aced141db899b5328ae55e45841d +Subproject commit ed20181d4e987fb52cf1bb480e042f1ae3dd7dc9 From 797db0c6264812296959a8a28b78c25a772435cf Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 15:29:12 +0100 Subject: [PATCH 04/14] Update Gradle wrapper to version 8.10 and adjust repository settings for commons libraries --- build.gradle | 25 ++++++------------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index f44188ba01..e307ce0c2e 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,11 @@ 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' } + } maven { url "https://jaspersoft.jfrog.io/artifactory/third-party-ce-artifacts" } } @@ -226,22 +231,4 @@ drill { tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false -tasks.commitNewVersion.enabled = false - -tasks.register('initSubmodules') { - doLast { - exec { - commandLine 'git', 'submodule', 'init' - } - } -} - -tasks.register('updateSubmodules') { - doLast { - exec { - commandLine 'git', 'submodule', 'update', '--remote', '--merge' - } - } -} - -tasks.build.dependsOn initSubmodules \ No newline at end of file +tasks.commitNewVersion.enabled = false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b..9355b41557 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From 3326798e29ebb413c0ccd95e24b63afa9aada9d4 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:02:56 +0100 Subject: [PATCH 05/14] Add submodule configurations for commons-dao, commons, and plugin-api --- .gitmodules | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..67096bd8da --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "commons-dao"] + path = commons-dao + url = git@github.com:reportportal/commons-dao.git + branch = develop +[submodule "commons"] + path = commons + url = git@github.com:reportportal/commons.git + branch = develop +[submodule "plugin-api"] + path = plugin-api + url = git@github.com:reportportal/plugin-api.git + branch = develop From 89c85c29bde0048ae271da9ac40d9293776f3521 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:03:05 +0100 Subject: [PATCH 06/14] Update dependency versions and restructure project dependencies --- build.gradle | 36 +++++++++++++++++++++--------------- commons | 1 + commons-dao | 1 + plugin-api | 1 + project-properties.gradle | 3 ++- settings.gradle | 4 ++++ 6 files changed, 30 insertions(+), 16 deletions(-) create mode 160000 commons create mode 160000 commons-dao create mode 160000 plugin-api diff --git a/build.gradle b/build.gradle index 291ee43c45..2c7eed2a2e 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } @@ -40,10 +40,6 @@ project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from repositories { mavenCentral { url "https://repo1.maven.org/maven2" } - - if (!releaseMode) { - maven { url 'https://jitpack.io' } - } maven { url "https://jaspersoft.jfrog.io/artifactory/third-party-ce-artifacts" } } @@ -67,15 +63,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' @@ -237,3 +227,19 @@ drill { tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false tasks.commitNewVersion.enabled = false + +tasks.register('initSubmodules') { + doLast { + exec { + commandLine 'git', 'submodule', 'init' + } + } +} + +tasks.register('updateSubmodules') { + doLast { + exec { + commandLine 'git', 'submodule', 'update', '--remote', '--merge' + } + } +} \ No newline at end of file diff --git a/commons b/commons new file mode 160000 index 0000000000..96e0e42bf4 --- /dev/null +++ b/commons @@ -0,0 +1 @@ +Subproject commit 96e0e42bf424d2e40caf6f2aacca3c151741c706 diff --git a/commons-dao b/commons-dao new file mode 160000 index 0000000000..49a5cffb39 --- /dev/null +++ b/commons-dao @@ -0,0 +1 @@ +Subproject commit 49a5cffb391192c6c5a816522afd3b8f530ad588 diff --git a/plugin-api b/plugin-api new file mode 160000 index 0000000000..63113d3298 --- /dev/null +++ b/plugin-api @@ -0,0 +1 @@ +Subproject commit 63113d3298a2aced141db899b5328ae55e45841d diff --git a/project-properties.gradle b/project-properties.gradle index e2855f4db0..a9b51499c2 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -12,8 +12,9 @@ project.ext { 'method' : 65, 'class' : 90 ] + scriptVersion = isDebugMode = System.getProperty("DEBUG", "false") == "true" - releaseMode = project.hasProperty("releaseMode") + releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop') migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.13.0' : 'develop') //TODO refactor with archive download diff --git a/settings.gradle b/settings.gradle index 3178aa6638..92a88b449a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,5 @@ rootProject.name = 'service-api' + +include('commons') +include('commons-dao') +include('plugin-api') \ No newline at end of file From 230545ecd747f1964db39b14dad4225584b4aea8 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 14:44:14 +0100 Subject: [PATCH 07/14] Add dependency on initSubmodules task and update submodule commits --- build.gradle | 4 +++- commons | 2 +- plugin-api | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2c7eed2a2e..f44188ba01 100644 --- a/build.gradle +++ b/build.gradle @@ -242,4 +242,6 @@ tasks.register('updateSubmodules') { commandLine 'git', 'submodule', 'update', '--remote', '--merge' } } -} \ No newline at end of file +} + +tasks.build.dependsOn initSubmodules \ No newline at end of file diff --git a/commons b/commons index 96e0e42bf4..5708d401e6 160000 --- a/commons +++ b/commons @@ -1 +1 @@ -Subproject commit 96e0e42bf424d2e40caf6f2aacca3c151741c706 +Subproject commit 5708d401e64e20172ff7521d2df49bdde3d28ff2 diff --git a/plugin-api b/plugin-api index 63113d3298..ed20181d4e 160000 --- a/plugin-api +++ b/plugin-api @@ -1 +1 @@ -Subproject commit 63113d3298a2aced141db899b5328ae55e45841d +Subproject commit ed20181d4e987fb52cf1bb480e042f1ae3dd7dc9 From 76c353460d03833702446c183cd8c0616ff782d3 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 15:29:12 +0100 Subject: [PATCH 08/14] Update Gradle wrapper to version 8.10 and adjust repository settings for commons libraries --- build.gradle | 25 ++++++------------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index f44188ba01..e307ce0c2e 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,11 @@ 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' } + } maven { url "https://jaspersoft.jfrog.io/artifactory/third-party-ce-artifacts" } } @@ -226,22 +231,4 @@ drill { tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false -tasks.commitNewVersion.enabled = false - -tasks.register('initSubmodules') { - doLast { - exec { - commandLine 'git', 'submodule', 'init' - } - } -} - -tasks.register('updateSubmodules') { - doLast { - exec { - commandLine 'git', 'submodule', 'update', '--remote', '--merge' - } - } -} - -tasks.build.dependsOn initSubmodules \ No newline at end of file +tasks.commitNewVersion.enabled = false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b..9355b41557 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From aa843024dae8b4292d571e55c3c79f8bcb27967a Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 15:54:42 +0100 Subject: [PATCH 09/14] Disable commitNewVersion task in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e307ce0c2e..3220814a28 100644 --- a/build.gradle +++ b/build.gradle @@ -231,4 +231,4 @@ drill { tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false -tasks.commitNewVersion.enabled = false \ No newline at end of file +tasks.commitNewVersion.enabled = false From 8057ce0cca29b5f3380b7eb47300ba2eafd00043 Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 16:05:57 +0100 Subject: [PATCH 10/14] Add gradle-daemon-jvm.properties to specify toolchain version --- gradle/gradle-daemon-jvm.properties | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000000..63e5bbdf48 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,2 @@ +#This file is generated by updateDaemonJvm +toolchainVersion=21 From 31dbbfb858acc53383f478e140e6fa0b4ad485ba Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 16:16:37 +0100 Subject: [PATCH 11/14] Re-enable JaCoCo plugin and report generation in build.gradle --- build.gradle | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 3220814a28..6d364d671f 100644 --- a/build.gradle +++ b/build.gradle @@ -33,8 +33,8 @@ apply from: "$scriptsUrl/copy-database-scripts.gradle" //replaced with drill4j //apply from: "$scriptsUrl/build-quality.gradle" -//apply from: "$scriptsUrl/jacoco.gradle" -//apply plugin: 'jacoco' +apply from: "$scriptsUrl/jacoco.gradle" +apply plugin: 'jacoco' project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from: 'sealights.gradle') : println('No sealights session') @@ -213,21 +213,21 @@ publish.mustRunAfter build checkCommitNeeded.dependsOn removeScripts //replaced with drill4j -//build.dependsOn jacocoTestReport - -drill { - groupId = "report-portal" - appId = "service-api" - packagePrefixes = ["com/epam/ta/reportportal"] - enableTestAgent { - enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false - version = "0.23.3" - } - enableAppAgent { - enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false - version = "0.9.4" - } -} +build.dependsOn jacocoTestReport + +//drill { +// groupId = "report-portal" +// appId = "service-api" +// packagePrefixes = ["com/epam/ta/reportportal"] +// enableTestAgent { +// enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false +// version = "0.23.3" +// } +// enableAppAgent { +// enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false +// version = "0.9.4" +// } +//} tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false From 2b6430ad16c6e75723f25a7dd225b7567980a5ef Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Thu, 19 Dec 2024 17:05:45 +0100 Subject: [PATCH 12/14] Refactor build.gradle and project-properties.gradle to disable JaCoCo plugin and adjust releaseMode property handling --- build.gradle | 35 ++++++++++++++++++----------------- project-properties.gradle | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 6d364d671f..0ede672596 100644 --- a/build.gradle +++ b/build.gradle @@ -33,8 +33,8 @@ apply from: "$scriptsUrl/copy-database-scripts.gradle" //replaced with drill4j //apply from: "$scriptsUrl/build-quality.gradle" -apply from: "$scriptsUrl/jacoco.gradle" -apply plugin: 'jacoco' +//apply from: "$scriptsUrl/jacoco.gradle" +//apply plugin: 'jacoco' project.hasProperty('sealightsSession') && sealightsSession?.trim() ? apply(from: 'sealights.gradle') : println('No sealights session') @@ -189,6 +189,7 @@ dependencyCheck { } bootJar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE project.hasProperty('gcp') ? getArchiveFileName().set('app.jar') : archiveClassifier.set('' + 'exec') } @@ -213,21 +214,21 @@ publish.mustRunAfter build checkCommitNeeded.dependsOn removeScripts //replaced with drill4j -build.dependsOn jacocoTestReport - -//drill { -// groupId = "report-portal" -// appId = "service-api" -// packagePrefixes = ["com/epam/ta/reportportal"] -// enableTestAgent { -// enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false -// version = "0.23.3" -// } -// enableAppAgent { -// enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false -// version = "0.9.4" -// } -//} +//build.dependsOn jacocoTestReport + +drill { + groupId = "report-portal" + appId = "service-api" + packagePrefixes = ["com/epam/ta/reportportal"] + enableTestAgent { + enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false + version = "0.23.3" + } + enableAppAgent { + enabled = System.getenv("DRILL_AGENT_ENABLED") == "true" ?: false + version = "0.9.4" + } +} tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false diff --git a/project-properties.gradle b/project-properties.gradle index a9b51499c2..66985ccc4e 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -14,7 +14,7 @@ project.ext { ] scriptVersion = isDebugMode = System.getProperty("DEBUG", "false") == "true" - releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false + releaseMode = project.hasProperty("releaseMode") scriptsUrl = commonScriptsUrl + (releaseMode ? '5.12.0' : 'develop') migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.13.0' : 'develop') //TODO refactor with archive download From 3b568909c41a32f5e051fbc2c5717ec13c81be1c Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Fri, 20 Dec 2024 11:26:23 +0100 Subject: [PATCH 13/14] Adjust Gradle --- .gitmodules | 6 +++--- build.gradle | 10 ++++++++++ commons-dao | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 67096bd8da..3e136c6c79 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "commons-dao"] path = commons-dao - url = git@github.com:reportportal/commons-dao.git + url = https://github.com/reportportal/commons-dao.git branch = develop [submodule "commons"] path = commons - url = git@github.com:reportportal/commons.git + url = https://github.com/reportportal/commons.git branch = develop [submodule "plugin-api"] path = plugin-api - url = git@github.com:reportportal/plugin-api.git + url = https://github.com/reportportal/plugin-api.git branch = develop diff --git a/build.gradle b/build.gradle index 0ede672596..cb154e482b 100644 --- a/build.gradle +++ b/build.gradle @@ -230,6 +230,16 @@ drill { } } +tasks.register('initGitSubmodules') { + doLast { + exec { + commandLine 'git', 'submodule', 'update', '--init', '--recursive' + } + } +} + +compileJava.dependsOn initGitSubmodules + tasks.preTagCommit.enabled = false tasks.updateVersion.enabled = false tasks.commitNewVersion.enabled = false diff --git a/commons-dao b/commons-dao index 49a5cffb39..9eeeb820b8 160000 --- a/commons-dao +++ b/commons-dao @@ -1 +1 @@ -Subproject commit 49a5cffb391192c6c5a816522afd3b8f530ad588 +Subproject commit 9eeeb820b820e6fc555ebbcae711b5fb789bdaf2 From 65b718a4528bce09fdee69542023ca40a25f12fa Mon Sep 17 00:00:00 2001 From: Reingold Shekhtel Date: Fri, 20 Dec 2024 12:17:41 +0100 Subject: [PATCH 14/14] Update Git submodule initialization command and update commons-dao subproject reference --- build.gradle | 2 +- commons-dao | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cb154e482b..acc5772d6e 100644 --- a/build.gradle +++ b/build.gradle @@ -233,7 +233,7 @@ drill { tasks.register('initGitSubmodules') { doLast { exec { - commandLine 'git', 'submodule', 'update', '--init', '--recursive' + commandLine 'git', 'submodule', 'update', '--init' } } } diff --git a/commons-dao b/commons-dao index 9eeeb820b8..49a5cffb39 160000 --- a/commons-dao +++ b/commons-dao @@ -1 +1 @@ -Subproject commit 9eeeb820b820e6fc555ebbcae711b5fb789bdaf2 +Subproject commit 49a5cffb391192c6c5a816522afd3b8f530ad588