Skip to content

Commit 789bd72

Browse files
authored
Remove SonarQube configs
* Remove sonar scan scripts * Remove obsolete sonar data from gradle * Remove obsolete sonar properties * Remove sonarlint from gitignore * Remove gradle.properties The file contained obsoleted jvm properties and obsoleted sonar properties
1 parent b524b50 commit 789bd72

23 files changed

+2
-252
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ bin_test/
66
/.idea/inspectionProfiles/
77
/.idea/copyright/
88
/.idea/dictionaries/
9-
/.idea/sonarlint/
109
/.idea/libraries/
1110
/.idea/modules.xml
1211
**/*.iml

.travis.yml

-9
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ notifications:
1616

1717
services: docker
1818

19-
# Sonar token is encrypted via travis encrypt
20-
env:
21-
global:
22-
# SONAR_TOKEN
23-
secure: "aMWLDDcMN1uxvIHbYK5Tl8Rk7/QkbxSQ21K3S/ZSUIfTnHxZL0mcPbXOuqqwBxD1cTNXf2MeZK96+xzNbesNzWEe2iM0h5MWz8kgjOTAU0a+Hd0giMq+Gb9PWinJDjLTNryK88nG/MSaya9hwMPQJaNH1wwAaCMpfzLa5BxN0GxKBiIF5Kpk3qLpkwGRq6UPgsL8nZ65KYfh2O3uJ5vv4dtEIEEqzsXGTZHi1o0oEbn6dOnRg+8yE8cYgx4GUfHJ9bGNUMr4KCBejCOgMRxXvp5UUh9l0pZnCHqAorSGPr2CS1jq4JxVTrYP6p8Zj4K5w72VcXaEij6lbcPXoGzB+tOKgIEvlKMzXtIiIKCcyEir6/OCoK0U0CuzK1X76sK/JW3tgC9jQxaxqt6GymqicNUFm8dnGv6F2WtMexmViedLTLzsBmg2Uw8WqbsHW8vSUpH0kumvpnZ8pp4Vl9tXqiMOsQ7Z0FOuRHZIPY2eCGaBtpTe2ORUPrCVjB58iYGwfDjbdaZYtR6O+7a895+UEGlnIcpgN4rS1uihC4Nm3GBQFUnJBw7izSvkzqN2qJAjU3MrwJXawUB1bKtrRSPih9RNYyJxID1E7NW7TxNL78ZriKI8Zv/GVQgBo82Oq7UDypgMpK2HqN6utwgiq6tZ40JRpmBS8n2EsYrFAGd/GsE="
24-
25-
2619
# Avoid config duplication via yaml anchors
2720
_stf_setup_config: &stf_before_script
2821
if: type in (cron, api)
@@ -55,8 +48,6 @@ jobs:
5548
script:
5649
- docker run -td --name build -v $PWD:/home/ci/saros_src saros/ci_build:0.4 bash
5750
- docker exec -t build /home/ci/saros_src/travis/script/build/build_all.sh
58-
after_success:
59-
- docker exec -t build /home/ci/saros_src/travis/script/scan/scan_all.sh $SONAR_TOKEN $TRAVIS_PULL_REQUEST
6051

6152
- <<: *stf_before_script
6253
script: docker exec -t stf_master /home/ci/saros_src/travis/script/stf/master/start_stf_tests.sh

build.gradle

+1-14
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ buildscript
1111
plugins {
1212
id "de.monkeyworks.buildmonkey.mavenizer.MavenizerPlugin" version "0.4.2"
1313
id 'com.gradle.build-scan' version '2.0.2'
14-
id 'org.sonarqube' version '2.6.2'
1514
}
1615

1716
// avoid that the buildmonkey plugin triggers verbose ant logging
@@ -35,21 +34,9 @@ mavenize {
3534
}
3635
}
3736

38-
sonarqube {
39-
properties {
40-
property 'sonar.preview.excludePlugins', 'devcockpit, jira, pdfreport, views, report, buildstability, scmactivity, buildbreaker, scmstats'
41-
property 'sonar.projectName', 'Saros/Complete'
42-
property 'sonar.projectKey', 'saros_complete'
43-
property 'sonar.projectDescription', 'The whole Saros product family'
44-
property 'sonar.projectVersion', '14.11.28.DEVEL'
45-
property 'sonar.cpd.cross_project', 'true'
46-
}
47-
}
4837

49-
ext.projectsToConfigure = subprojects - project(':saros.ui.frontend') - project(':saros.picocontainer')
38+
ext.projectsToConfigure = subprojects - project(':saros.picocontainer')
5039
// Configurations that are specific to all subprojects
51-
// saros.ui.frontend is not a real subproject and contains
52-
// only a build.gradle in order to allow to scan the sources of this subproject
5340
configure(projectsToConfigure) { projectToConf ->
5441

5542
apply plugin: 'eclipse'

core/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,3 @@ task testJar(type: Jar) {
6262
artifacts {
6363
testing testJar
6464
}
65-
66-
sonarqube {
67-
properties {
68-
property 'sonar.projectName', 'Saros/Core'
69-
property 'sonar.projectDescription', 'Saros core business logic and utilities'
70-
property 'sonar.projectVersion', '0.1.0.DEVEL'
71-
}
72-
}

core/sonar-project.properties

-12
This file was deleted.

eclipse/build.gradle

-12
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,3 @@ compileJava.dependsOn rootProject.mavenizeP2Repository
112112
artifacts {
113113
testing testJar
114114
}
115-
116-
sonarqube {
117-
properties {
118-
property 'sonar.projectName', 'Saros/Eclipse'
119-
property 'sonar.projectDescription', 'Saros plugin for the Eclipse IDE'
120-
property 'sonar.projectVersion', '14.11.28.DEVEL'
121-
property 'sonar.exclusion', '**/Messages.java'
122-
// necessary to avoid the scanning of stf
123-
property 'sonar.sources', 'src'
124-
property 'sonar.tests', 'test/junit, test/stf'
125-
}
126-
}

eclipse/sonar-project.properties

-17
This file was deleted.

gradle.properties

-6
This file was deleted.

intellij/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,3 @@ afterEvaluate {
117117
artifacts {
118118
archives buildPlugin
119119
}
120-
121-
sonarqube {
122-
properties {
123-
property 'sonar.projectName', 'Saros/Intellij'
124-
property 'sonar.projectDescription', 'Saros plugin for IntelliJ IDEA'
125-
property 'sonar.projectVersion', '0.1.0.DEVEL'
126-
}
127-
}

intellij/sonar-project.properties

-17
This file was deleted.

server/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@ sourceSets {
99
test.java.srcDir 'test/junit'
1010
}
1111

12-
sonarqube {
13-
properties {
14-
property 'sonar.projectName', 'Saros/Server'
15-
property 'sonar.projectDescription', 'Standalone Saros Server'
16-
property 'sonar.projectVersion', '0.1.0.DEVEL'
17-
}
18-
}
19-
2012
jar {
2113
manifest {
2214
attributes 'Main-Class': 'saros.server.SarosServer'

server/sonar-project.properties

-15
This file was deleted.

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
String prefix = 'saros.'
2-
List projectDirs = ['core', 'ui', 'ui.frontend', 'eclipse', 'whiteboard', 'intellij', 'server', 'stf', 'stf.test'].each { dir ->
2+
List projectDirs = ['core', 'ui', 'eclipse', 'whiteboard', 'intellij', 'server', 'stf', 'stf.test'].each { dir ->
33
String projectName = prefix + dir
44
include projectName
55
project(":$projectName").projectDir = file(dir)

sonar-project.properties

-19
This file was deleted.

stf.test/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,3 @@ task stfTest (type: Test, dependsOn: [':saros.eclipse:build']) {
8383
exclude '**/stf/test/stf/**'
8484
exclude '**/whiteboard/**'
8585
}
86-
87-
sonarqube {
88-
properties {
89-
property 'sonar.projectName', 'Saros/STF.Test'
90-
property 'sonar.projectDescription', 'STF-Tests'
91-
property 'sonar.projectVersion', '0.1.0'
92-
}
93-
}

stf/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,3 @@ task testJar(type: Jar) {
9292
artifacts {
9393
testing testJar
9494
}
95-
96-
sonarqube {
97-
properties {
98-
property 'sonar.projectName', 'Saros/STF'
99-
property 'sonar.projectDescription', 'Saros Test Framework'
100-
property 'sonar.projectVersion', '0.1.0'
101-
}
102-
}

travis/script/scan/scan_all.sh

-25
This file was deleted.

ui.frontend/build.gradle

-9
This file was deleted.

ui.frontend/sonar-project.properties

-6
This file was deleted.

ui/build.gradle

-9
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,3 @@ task testJar(type: Jar) {
4949
artifacts {
5050
testing testJar
5151
}
52-
53-
sonarqube {
54-
properties {
55-
property 'sonar.projectName', 'Saros/UI'
56-
property 'sonar.projectDescription', 'Common Saros User Interface (Java part)'
57-
property 'sonar.projectVersion', '0.1.0.DEVEL'
58-
property 'sonar.exclusions', '**/HTMLUIStrings.java'
59-
}
60-
}

ui/sonar-project.properties

-15
This file was deleted.

whiteboard/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,3 @@ sourceSets {
5959
main.java.srcDirs = ['src', 'ext-src']
6060
test.java.srcDir 'test'
6161
}
62-
63-
sonarqube {
64-
properties {
65-
property 'sonar.projectName', 'Saros/Whiteboard'
66-
property 'sonar.projectDescription', 'Saros Whiteboard plugin for Eclipse IDE'
67-
property 'sonar.projectVersion', '14.11.28.DEVEL'
68-
}
69-
}

whiteboard/sonar-project.properties

-17
This file was deleted.

0 commit comments

Comments
 (0)