Skip to content

Commit f912749

Browse files
revert: restore original plugins block in build.gradle
Reverts the conditional buildscript/skipCodeAnalysis changes now that the daily-ci pipeline uses the managed Gradle@4 ADO task instead. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 463a4a6 commit f912749

1 file changed

Lines changed: 22 additions & 42 deletions

File tree

‎build.gradle‎

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
1-
buildscript {
2-
repositories {
3-
gradlePluginPortal()
4-
mavenCentral()
5-
}
6-
if (System.getProperty('skipCodeAnalysis') == null) {
7-
dependencies {
8-
classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.4'
9-
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.3.0.8198'
10-
}
11-
}
12-
}
13-
141
plugins {
152
// Apply the java-library plugin to add support for Java Library
163
id 'java-library'
174
id 'eclipse'
185
id 'maven-publish'
196
id 'signing'
207
id 'jacoco'
8+
id 'com.github.spotbugs' version '6.5.4'
9+
id "org.sonarqube" version "7.3.0.8198"
2110

2211
}
2312

24-
if (System.getProperty('skipCodeAnalysis') == null) {
25-
apply plugin: 'com.github.spotbugs'
26-
apply plugin: 'org.sonarqube'
27-
}
28-
2913
java {
3014
modularity.inferModulePath = true
3115
withSourcesJar()
@@ -45,26 +29,24 @@ jacoco {
4529
toolVersion = "0.8.12"
4630
}
4731

48-
if (System.getProperty('skipCodeAnalysis') == null) {
49-
spotbugsMain {
50-
excludeFilter = file("spotBugsExcludeFilter.xml")
51-
reports {
52-
html {
53-
required
54-
outputLocation = file("$buildDir/reports/spotbugs/main/spotbugs.html")
55-
stylesheet = 'fancy-hist.xsl'
56-
}
32+
spotbugsMain {
33+
excludeFilter = file("spotBugsExcludeFilter.xml")
34+
reports {
35+
html {
36+
required
37+
outputLocation = file("$buildDir/reports/spotbugs/main/spotbugs.html")
38+
stylesheet = 'fancy-hist.xsl'
5739
}
5840
}
41+
}
5942

60-
spotbugsTest {
61-
excludeFilter = file("spotBugsExcludeFilter.xml")
62-
reports {
63-
html {
64-
required
65-
outputLocation = file("$buildDir/reports/spotbugs/test/spotbugs.html")
66-
stylesheet = 'fancy-hist.xsl'
67-
}
43+
spotbugsTest {
44+
excludeFilter = file("spotBugsExcludeFilter.xml")
45+
reports {
46+
html {
47+
required
48+
outputLocation = file("$buildDir/reports/spotbugs/test/spotbugs.html")
49+
stylesheet = 'fancy-hist.xsl'
6850
}
6951
}
7052
}
@@ -101,13 +83,11 @@ def pomConfig = {
10183
}
10284
}
10385

104-
if (System.getProperty('skipCodeAnalysis') == null) {
105-
sonarqube {
106-
properties {
107-
property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"
108-
property "sonar.organization", "microsoftgraph2"
109-
property "sonar.host.url", "https://sonarcloud.io"
110-
}
86+
sonarqube {
87+
properties {
88+
property "sonar.projectKey", "microsoftgraph_msgraph-sdk-java-core"
89+
property "sonar.organization", "microsoftgraph2"
90+
property "sonar.host.url", "https://sonarcloud.io"
11191
}
11292
}
11393

0 commit comments

Comments
 (0)