summaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle10
1 files changed, 3 insertions, 7 deletions
diff --git a/build.gradle b/build.gradle
index 3057c480198..1e4502d2448 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,7 +170,7 @@ subprojects {
exclude 'xerces:xmlParserAPIs'
exclude 'xerces:xercesImpl'
}
- dependencySet(group: 'org.eclipse.jetty', version: '9.4.8.v20171121') {
+ dependencySet(group: 'org.eclipse.jetty', version: '9.3.6.v20151106') {
entry 'jetty-proxy'
entry 'jetty-server'
entry 'jetty-servlet'
@@ -224,10 +224,6 @@ subprojects {
from sourceSets.main.allSource
}
- javadoc {
- options.encoding = 'UTF-8'
- }
-
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
@@ -291,7 +287,7 @@ artifactory {
}
defaults {
properties = [
- 'build.name': 'sonarqube',
+ 'build.name': 'sonar-enterprise',
'build.number': (System.getenv('BUILD_ID') ?: System.getenv('BUILD_NUMBER')),
'pr.branch.target': System.getenv('PULL_REQUEST_BRANCH_TARGET'),
'pr.number': System.getenv('PULL_REQUEST_NUMBER'),
@@ -306,7 +302,7 @@ artifactory {
}
clientConfig.info.setBuildNumber(System.getenv('BUILD_NUMBER'))
// Define the artifacts to be deployed to https://sonarsource.bintray.com on releases
- clientConfig.info.addEnvironmentProperty('ARTIFACTS_TO_PUBLISH', "${project.group}:sonar-application:zip")
+ clientConfig.info.addEnvironmentProperty('ARTIFACTS_TO_PUBLISH', "${project.group}:sonar-application:zip,com.sonarsource.governance:sonar-governance-plugin:jar,com.sonarsource.developer:sonar-developer-plugin:jar,com.sonarsource.ha:sonar-ha-plugin:jar,com.sonarsource.branch:sonar-branch-plugin:jar")
// The name of this variable is important because it's used by the delivery process when extracting version from Artifactory build info.
clientConfig.info.addEnvironmentProperty('PROJECT_VERSION', "${version}")
}