diff options
| -rw-r--r-- | pom.xml | 30 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/apps/about/components/AboutScanners.js | 4 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 18 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 1 | ||||
| -rwxr-xr-x | travis.sh | 4 |
5 files changed, 8 insertions, 49 deletions
@@ -46,13 +46,6 @@ <url>http://jira.sonarsource.com/browse/SONAR</url> </issueManagement> - <distributionManagement> - <repository> - <id>bintray</id> - <url>https://api.bintray.com/maven/sonarsource/SonarQube/${project.groupId}/;publish=1</url> - </repository> - </distributionManagement> - <properties> <sonarUpdateCenter.version>1.17</sonarUpdateCenter.version> <sonarJava.version>4.0</sonarJava.version> @@ -87,6 +80,8 @@ <!-- used for deployment to SonarSource Artifactory --> <gitRepositoryName>sonarqube</gitRepositoryName> + <!-- Release: enable publication to Bintray --> + <artifactsToPublish>${project.groupId}:sonar-application:zip</artifactsToPublish> </properties> <build> @@ -1156,27 +1151,6 @@ </profile> <profile> - <id>javadoc</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <excludePackageNames> - net.*:org.sonar.application:org.sonar.server:org.sonar.graph:org.sonar.batch:org.sonar.channel:org.sonar.java:org.sonar.maven*:org.sonar.plugins.*:org.sonar.colorizer:org.sonar.core:org.sonar.duplications:org.sonar.markdown:com.* - </excludePackageNames> - <author>false</author> - <linksource>true</linksource> - <reportOutputDirectory>${project.reporting.outputDirectory}/${project.version}/apidocs - </reportOutputDirectory> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> <id>protobuf-compile</id> <activation> <file> diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js index 764f63876a7..627996d1945 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js +++ b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.js @@ -47,7 +47,7 @@ export default class AboutScanners extends React.Component { render () { return ( <div className="boxed-group"> - <h2>Start analyzing your projects with a SonarQube Scanner</h2> + <h2>{translate('about_page.scanners')}</h2> <div className="boxed-group-inner"> <div className="about-page-analyzers"> {scanners.map(scanner => ( @@ -56,7 +56,7 @@ export default class AboutScanners extends React.Component { <img src={`${window.baseUrl}/images/scanner-logos/${scanner.key}.svg`} height={80} alt={translate('about_page.scanners', scanner.key)}/> </div> - <p className="about-page-text">{translate('about_page.scanners.sonarqube.text')}</p> + <p className="about-page-text">{translate('about_page.scanners', scanner.key, 'text')}</p> <ReadMore link={scanner.link}/> </div> ))} diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 27e9000110f..c5f6fe98360 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -208,24 +208,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <configuration> - <failOnError>${checksum.failOnError}</failOnError> - <target> - <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="md5" /> - <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="sha" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 7126eeb049c..928258d86ba 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2713,6 +2713,7 @@ about_page.quality_gates.text=Your project's quality gate is the set of conditio about_page.standards=Conform to recognized standards about_page.standards.text=SonarAnalyzers offer rules that support industry standards. Configure your Quality Profile with standard-related rules to ensure adherence. +about_page.scanners=Start analyzing your projects with a SonarQube Scanner about_page.scanners.sonarqube=SonarQube Scanner about_page.scanners.sonarqube.text=The SonarQube Scanner is a Java-based command-line tool that can analyze any language SonarQube supports. about_page.scanners.msbuild=SonarQube Scanner for MSBuild diff --git a/travis.sh b/travis.sh index 8bac388b870..e5472131437 100755 --- a/travis.sh +++ b/travis.sh @@ -59,9 +59,11 @@ CI) elif [[ "$TRAVIS_BRANCH" == "branch-"* ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo 'release branch: trigger QA, no analysis' + export PROJECT_VERSION=`maven_expression "project.version"` + mvn deploy \ $MAVEN_OPTIONS \ - -Pdeploy-sonarsource + -Pdeploy-sonarsource,release elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN:-}" ]; then echo 'Internal pull request: trigger QA and analysis' |