diff options
| author | Evgeny Mandrikov <138671+Godin@users.noreply.github.com> | 2020-04-16 18:17:55 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2020-04-16 20:03:49 +0000 |
| commit | 302447df107c0d961daa2fe44f48cab7424f526c (patch) | |
| tree | 5cd548ce0cc9a4157ecd4c4a9cc849008c7bb958 | |
| parent | 47bdeede2e968ec828a231fe5679ea37fbe00a4d (diff) | |
| download | sonarqube-302447df107c0d961daa2fe44f48cab7424f526c.tar.gz sonarqube-302447df107c0d961daa2fe44f48cab7424f526c.zip | |
Upgrade Gradle to 6.3
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | sonar-application/build.gradle | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index b126bcb099c..a00c098422c 100644 --- a/build.gradle +++ b/build.gradle @@ -476,6 +476,10 @@ subprojects { includes(['**/*.java', '**/*.js', '**/*.ts', '**/*.tsx', '**/*.css']) } + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + publishing { publications { mavenJava(MavenPublication) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 70b991a98de..4c699f5aeb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle index 09d4a813a76..63f620882f6 100644 --- a/sonar-application/build.gradle +++ b/sonar-application/build.gradle @@ -148,7 +148,7 @@ task zip(type: Zip, dependsOn: [configurations.compile]) { from(tasks.getByPath(':server:sonar-web:yarn_run').outputs) { a -> if (official) { project(':private:branding').fileTree('src').visit { b -> - if (!b.isDirectory) { + if (!b.isDirectory()) { a.exclude b.relativePath.toString() } } |