Skip to content

Commit c4a7090

Browse files
ghillertghillert
committed
INTEXT-67 - Upgrade to Sonar-Runner
* Upgrade to Gradle 1.6 * Upgrade from Gradle plugin sonar to sonar-runner * Upgrade Gradle wrapper * Fix several Group Ids
1 parent 7d5ae68 commit c4a7090

File tree

26 files changed

+166
-278
lines changed

26 files changed

+166
-278
lines changed

‎spring-integration-aws/build.gradle

+16-32
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ ext {
4242

4343
idPrefix = 'aws'
4444

45+
linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
46+
linkCi = 'https://build.springsource.org/browse/INTEXT'
47+
linkIssue = 'https://jira.springsource.org/browse/INTEXT'
48+
linkScmUrl = 'https://github.com/SpringSource/spring-integration-extensions'
49+
linkScmConnection = 'https://github.com/SpringSource/spring-integration-extensions.git'
50+
linkScmDevConnection = '[email protected]:SpringSource/spring-integration-extensions.git'
4551
}
4652

4753
ext.javadocLinks = [
@@ -137,39 +143,17 @@ artifacts {
137143
archives javadocJar
138144
}
139145

140-
apply plugin: 'sonar'
141-
apply plugin: 'sonar-runner' //New for Gradle 1.5
146+
apply plugin: 'sonar-runner'
142147

143-
sonar {
144-
145-
if (rootProject.hasProperty('sonarHostUrl')) {
146-
server.url = rootProject.sonarHostUrl
147-
}
148-
149-
database {
150-
if (rootProject.hasProperty('sonarJdbcUrl')) {
151-
url = rootProject.sonarJdbcUrl
152-
}
153-
if (rootProject.hasProperty('sonarJdbcDriver')) {
154-
driverClassName = rootProject.sonarJdbcDriver
155-
}
156-
if (rootProject.hasProperty('sonarJdbcUsername')) {
157-
username = rootProject.sonarJdbcUsername
158-
}
159-
if (rootProject.hasProperty('sonarJdbcPassword')) {
160-
password = rootProject.sonarJdbcPassword
161-
}
162-
}
163-
164-
project {
165-
dynamicAnalysis = "reuseReports"
166-
withProjectProperties { props ->
167-
props["sonar.core.codeCoveragePlugin"] = "jacoco"
168-
props["sonar.jacoco.reportPath"] = "${buildDir.name}/jacoco.exec"
169-
}
148+
sonarRunner {
149+
sonarProperties {
150+
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
151+
property "sonar.links.homepage", linkHomepage
152+
property "sonar.links.ci", linkCi
153+
property "sonar.links.issue", linkIssue
154+
property "sonar.links.scm", linkScmUrl
155+
property "sonar.links.scm_dev", linkScmDevConnection
170156
}
171-
172-
logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
173157
}
174158

175159
task schemaZip(type: Zip) {
@@ -285,5 +269,5 @@ task dist(dependsOn: assemble) {
285269

286270
task wrapper(type: Wrapper) {
287271
description = 'Generates gradlew[.bat] scripts'
288-
gradleVersion = '1.5-rc-1'
272+
gradleVersion = '1.6'
289273
}

‎spring-integration-aws/gradle/wrapper/gradle-wrapper.jar

3.07 KB
Binary file not shown.

‎spring-integration-aws/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Mar 11 17:28:12 EDT 2013
1+
#Wed May 15 22:09:50 EDT 2013
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-rc-1-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

‎spring-integration-ip-extensions/build.gradle

+17-31
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ ext {
3434
mockitoVersion = '1.9.0'
3535
springVersion = '3.1.3.RELEASE'
3636
springIntegrationVersion = '3.0.0.M1'
37+
38+
linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
39+
linkCi = 'https://build.springsource.org/browse/INTEXT'
40+
linkIssue = 'https://jira.springsource.org/browse/INTEXT'
41+
linkScmUrl = 'https://github.com/SpringSource/spring-integration-extensions'
42+
linkScmConnection = 'https://github.com/SpringSource/spring-integration-extensions.git'
43+
linkScmDevConnection = '[email protected]:SpringSource/spring-integration-extensions.git'
3744
}
3845

3946
eclipse {
@@ -92,38 +99,17 @@ artifacts {
9299
archives javadocJar
93100
}
94101

95-
apply plugin: 'sonar'
102+
apply plugin: 'sonar-runner'
96103

97-
sonar {
98-
99-
if (rootProject.hasProperty('sonarHostUrl')) {
100-
server.url = rootProject.sonarHostUrl
101-
}
102-
103-
database {
104-
if (rootProject.hasProperty('sonarJdbcUrl')) {
105-
url = rootProject.sonarJdbcUrl
106-
}
107-
if (rootProject.hasProperty('sonarJdbcDriver')) {
108-
driverClassName = rootProject.sonarJdbcDriver
109-
}
110-
if (rootProject.hasProperty('sonarJdbcUsername')) {
111-
username = rootProject.sonarJdbcUsername
112-
}
113-
if (rootProject.hasProperty('sonarJdbcPassword')) {
114-
password = rootProject.sonarJdbcPassword
115-
}
116-
}
117-
118-
project {
119-
dynamicAnalysis = "reuseReports"
120-
withProjectProperties { props ->
121-
props["sonar.core.codeCoveragePlugin"] = "jacoco"
122-
props["sonar.jacoco.reportPath"] = "${buildDir.name}/jacoco.exec"
123-
}
104+
sonarRunner {
105+
sonarProperties {
106+
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
107+
property "sonar.links.homepage", linkHomepage
108+
property "sonar.links.ci", linkCi
109+
property "sonar.links.issue", linkIssue
110+
property "sonar.links.scm", linkScmUrl
111+
property "sonar.links.scm_dev", linkScmDevConnection
124112
}
125-
126-
logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
127113
}
128114

129115
task api(type: Javadoc) {
@@ -219,5 +205,5 @@ task dist(dependsOn: assemble) {
219205

220206
task wrapper(type: Wrapper) {
221207
description = 'Generates gradlew[.bat] scripts'
222-
gradleVersion = '1.3'
208+
gradleVersion = '1.6'
223209
}

‎spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.jar

3.13 KB
Binary file not shown.

‎spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jan 07 15:58:18 EST 2013
1+
#Wed May 15 22:10:16 EDT 2013
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

‎spring-integration-ip-extensions/gradlew

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
6161
fi
6262
done
6363
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/"
64+
cd "`dirname \"$PRG\"`/" >&-
6565
APP_HOME="`pwd -P`"
66-
cd "$SAVED"
66+
cd "$SAVED" >&-
6767

6868
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6969

‎spring-integration-mqtt/build.gradle

+17-31
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply from: "${rootProject.projectDir}/publish-maven.gradle"
1111
apply plugin: 'eclipse'
1212
apply plugin: 'idea'
1313

14-
group = 'org.springframework.integration.mqtt'
14+
group = 'org.springframework.integration'
1515

1616
repositories {
1717
maven { url 'http://repo.springsource.org/libs-snapshot' }
@@ -30,6 +30,13 @@ ext {
3030
springIntegrationVersion = '3.0.0.BUILD-SNAPSHOT'
3131

3232
idPrefix = 'mqttadapter'
33+
34+
linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
35+
linkCi = 'https://build.springsource.org/browse/INTEXT'
36+
linkIssue = 'https://jira.springsource.org/browse/INTEXT'
37+
linkScmUrl = 'https://github.com/SpringSource/spring-integration-extensions'
38+
linkScmConnection = 'https://github.com/SpringSource/spring-integration-extensions.git'
39+
linkScmDevConnection = '[email protected]:SpringSource/spring-integration-extensions.git'
3340
}
3441

3542
eclipse {
@@ -89,38 +96,17 @@ artifacts {
8996
archives javadocJar
9097
}
9198

92-
apply plugin: 'sonar'
99+
apply plugin: 'sonar-runner'
93100

94-
sonar {
95-
96-
if (rootProject.hasProperty('sonarHostUrl')) {
97-
server.url = rootProject.sonarHostUrl
98-
}
99-
100-
database {
101-
if (rootProject.hasProperty('sonarJdbcUrl')) {
102-
url = rootProject.sonarJdbcUrl
103-
}
104-
if (rootProject.hasProperty('sonarJdbcDriver')) {
105-
driverClassName = rootProject.sonarJdbcDriver
106-
}
107-
if (rootProject.hasProperty('sonarJdbcUsername')) {
108-
username = rootProject.sonarJdbcUsername
109-
}
110-
if (rootProject.hasProperty('sonarJdbcPassword')) {
111-
password = rootProject.sonarJdbcPassword
112-
}
113-
}
114-
115-
project {
116-
dynamicAnalysis = "reuseReports"
117-
withProjectProperties { props ->
118-
props["sonar.core.codeCoveragePlugin"] = "jacoco"
119-
props["sonar.jacoco.reportPath"] = "${buildDir.name}/jacoco.exec"
120-
}
101+
sonarRunner {
102+
sonarProperties {
103+
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
104+
property "sonar.links.homepage", linkHomepage
105+
property "sonar.links.ci", linkCi
106+
property "sonar.links.issue", linkIssue
107+
property "sonar.links.scm", linkScmUrl
108+
property "sonar.links.scm_dev", linkScmDevConnection
121109
}
122-
123-
logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
124110
}
125111

126112
task api(type: Javadoc) {

‎spring-integration-print/build.gradle

+18-32
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply from: "${rootProject.projectDir}/publish-maven.gradle"
1111
apply plugin: 'eclipse'
1212
apply plugin: 'idea'
1313

14-
group = 'org.springframework.integration.print'
14+
group = 'org.springframework.integration'
1515

1616
repositories {
1717
maven { url 'http://repo.springsource.org/libs-milestone' }
@@ -28,6 +28,13 @@ ext {
2828
mockitoVersion = '1.9.0'
2929
springVersion = '3.1.3.RELEASE'
3030
springIntegrationVersion = '2.2.0.RC2'
31+
32+
linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
33+
linkCi = 'https://build.springsource.org/browse/INTEXT'
34+
linkIssue = 'https://jira.springsource.org/browse/INTEXT'
35+
linkScmUrl = 'https://github.com/SpringSource/spring-integration-extensions'
36+
linkScmConnection = 'https://github.com/SpringSource/spring-integration-extensions.git'
37+
linkScmDevConnection = '[email protected]:SpringSource/spring-integration-extensions.git'
3138
}
3239

3340
eclipse {
@@ -89,38 +96,17 @@ artifacts {
8996
archives javadocJar
9097
}
9198

92-
apply plugin: 'sonar'
99+
apply plugin: 'sonar-runner'
93100

94-
sonar {
95-
96-
if (rootProject.hasProperty('sonarHostUrl')) {
97-
server.url = rootProject.sonarHostUrl
98-
}
99-
100-
database {
101-
if (rootProject.hasProperty('sonarJdbcUrl')) {
102-
url = rootProject.sonarJdbcUrl
103-
}
104-
if (rootProject.hasProperty('sonarJdbcDriver')) {
105-
driverClassName = rootProject.sonarJdbcDriver
106-
}
107-
if (rootProject.hasProperty('sonarJdbcUsername')) {
108-
username = rootProject.sonarJdbcUsername
109-
}
110-
if (rootProject.hasProperty('sonarJdbcPassword')) {
111-
password = rootProject.sonarJdbcPassword
112-
}
113-
}
114-
115-
project {
116-
dynamicAnalysis = "reuseReports"
117-
withProjectProperties { props ->
118-
props["sonar.core.codeCoveragePlugin"] = "jacoco"
119-
props["sonar.jacoco.reportPath"] = "${buildDir.name}/jacoco.exec"
120-
}
101+
sonarRunner {
102+
sonarProperties {
103+
property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
104+
property "sonar.links.homepage", linkHomepage
105+
property "sonar.links.ci", linkCi
106+
property "sonar.links.issue", linkIssue
107+
property "sonar.links.scm", linkScmUrl
108+
property "sonar.links.scm_dev", linkScmDevConnection
121109
}
122-
123-
logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
124110
}
125111

126112
task api(type: Javadoc) {
@@ -252,5 +238,5 @@ task dist(dependsOn: assemble) {
252238

253239
task wrapper(type: Wrapper) {
254240
description = 'Generates gradlew[.bat] scripts'
255-
gradleVersion = '1.2'
241+
gradleVersion = '1.6'
256242
}

‎spring-integration-print/gradle/wrapper/gradle-wrapper.jar

3.13 KB
Binary file not shown.

‎spring-integration-print/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 08 09:58:34 EST 2012
1+
#Wed May 15 22:11:45 EDT 2013
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

‎spring-integration-print/gradlew

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
6161
fi
6262
done
6363
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/"
64+
cd "`dirname \"$PRG\"`/" >&-
6565
APP_HOME="`pwd -P`"
66-
cd "$SAVED"
66+
cd "$SAVED" >&-
6767

6868
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6969

0 commit comments

Comments
 (0)