2020-09-04 14:41:37 +08:00
|
|
|
From 7298e1704b87799781a23c5b51adb6d6a794c4ee Mon Sep 17 00:00:00 2001
|
2020-03-10 17:42:39 +08:00
|
|
|
From: Michael Simacek <msimacek@redhat.com>
|
|
|
|
|
Date: Wed, 20 Sep 2017 15:26:10 +0300
|
2020-09-04 14:41:37 +08:00
|
|
|
Subject: [PATCH 06/17] Disable code quality checks
|
2020-03-10 17:42:39 +08:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
build.gradle | 4 ----
|
|
|
|
|
buildSrc/build.gradle | 9 ---------
|
|
|
|
|
gradle/classycle.gradle | 7 -------
|
|
|
|
|
subprojects/distributions/distributions.gradle | 2 --
|
|
|
|
|
4 files changed, 22 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/build.gradle b/build.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
index 7d8ac910b04..92233aef8c9 100644
|
2020-03-10 17:42:39 +08:00
|
|
|
--- a/build.gradle
|
|
|
|
|
+++ b/build.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
@@ -215,15 +215,11 @@ subprojects {
|
2020-03-10 17:42:39 +08:00
|
|
|
apply from: "$rootDir/gradle/groovyProject.gradle"
|
|
|
|
|
apply from: "$rootDir/gradle/testWithUnknownOS.gradle"
|
|
|
|
|
apply from: "$rootDir/gradle/java9.gradle"
|
|
|
|
|
- check.dependsOn ":docs:checkstyleApi"
|
|
|
|
|
- check.dependsOn "codeQuality"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (project in publishedProjects) {
|
|
|
|
|
apply from: "$rootDir/gradle/publish.gradle"
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
- apply from: "$rootDir/gradle/codeQuality.gradle"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
configurations {
|
|
|
|
|
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
index 196acdb4b73..80ccdd03188 100644
|
2020-03-10 17:42:39 +08:00
|
|
|
--- a/buildSrc/build.gradle
|
|
|
|
|
+++ b/buildSrc/build.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
@@ -50,9 +50,6 @@ dependencies {
|
2020-03-10 17:42:39 +08:00
|
|
|
|
|
|
|
|
compile "org.pegdown:pegdown:1.6.0"
|
|
|
|
|
compile "org.jsoup:jsoup:1.6.3"
|
|
|
|
|
- compile 'me.champeau.gradle:japicmp-gradle-plugin:0.2.4'
|
2020-09-04 14:41:37 +08:00
|
|
|
- compile "org.asciidoctor:asciidoctor-gradle-plugin:$asciidoctorPluginVersion"
|
2020-03-10 17:42:39 +08:00
|
|
|
- compile 'com.github.javaparser:javaparser-core:2.4.0'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ext.isCiServer = System.getenv().containsKey("CI")
|
2020-09-04 14:41:37 +08:00
|
|
|
@@ -60,9 +57,3 @@ ext.isCiServer = System.getenv().containsKey("CI")
|
2020-03-10 17:42:39 +08:00
|
|
|
apply from: '../gradle/compile.gradle'
|
|
|
|
|
apply from: '../gradle/dependencies.gradle'
|
|
|
|
|
apply from: '../gradle/classycle.gradle'
|
|
|
|
|
-
|
|
|
|
|
-if (!isCiServer || (isCiServer && Boolean.getBoolean('enableCodeQuality'))) {
|
|
|
|
|
- apply from: '../gradle/codeQuality.gradle'
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-apply from: "../gradle/ciReporting.gradle"
|
|
|
|
|
diff --git a/gradle/classycle.gradle b/gradle/classycle.gradle
|
|
|
|
|
index ba44bdfed3b..5396cf3c5ed 100644
|
|
|
|
|
--- a/gradle/classycle.gradle
|
|
|
|
|
+++ b/gradle/classycle.gradle
|
|
|
|
|
@@ -1,11 +1,4 @@
|
|
|
|
|
allprojects {
|
|
|
|
|
ext.useClassycle = { params = [:] ->
|
|
|
|
|
- def excludePatterns = params.exclude ?: []
|
|
|
|
|
-
|
|
|
|
|
- apply plugin: org.gradle.plugins.classycle.ClassyclePlugin
|
|
|
|
|
-
|
|
|
|
|
- tasks.withType(org.gradle.plugins.classycle.Classycle).all() {
|
|
|
|
|
- it.excludePatterns = excludePatterns
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
diff --git a/subprojects/distributions/distributions.gradle b/subprojects/distributions/distributions.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
index 2ff68e89277..1283e42c700 100644
|
2020-03-10 17:42:39 +08:00
|
|
|
--- a/subprojects/distributions/distributions.gradle
|
|
|
|
|
+++ b/subprojects/distributions/distributions.gradle
|
2020-09-04 14:41:37 +08:00
|
|
|
@@ -131,5 +131,3 @@ integTestTasks.all {
|
2020-03-10 17:42:39 +08:00
|
|
|
systemProperty 'org.gradle.public.api.includes', publicApiIncludes.join(':')
|
|
|
|
|
systemProperty 'org.gradle.public.api.excludes', publicApiExcludes.join(':')
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
-apply from: 'binary-compatibility.gradle'
|
|
|
|
|
--
|
2020-09-04 14:41:37 +08:00
|
|
|
2.17.2
|
2020-03-10 17:42:39 +08:00
|
|
|
|