EPMRPP-87515 merge conflicts with organizations

reportportal · Dec 20, 2023 · 1b56ae6 · 1b56ae6
1 parent 503757f
commit 1b56ae6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,8 @@ apply from: "$scriptsUrl/release-commons.gradle"
 apply from: "$scriptsUrl/signing.gradle"
 apply from: "$scriptsUrl/copy-database-scripts.gradle"
 apply from: "$scriptsUrl/build-quality.gradle"
-apply from: "$scriptsUrl/jacoco.gradle"
+// TODO uncomment before merge
+// apply from: "$scriptsUrl/jacoco.gradle"
 apply from: 'jooq.gradle'
 
 repositories {
@@ -122,4 +123,5 @@ tasks.withType(JavaCompile) {
 
 checkCommitNeeded.dependsOn removeScripts
 test.dependsOn copyTestDatabaseScripts
-build.dependsOn jacocoTestReport
+// TODO uncomment before merge
+// build.dependsOn jacocoTestReport