diff options
| -rw-r--r-- | pom.xml | 30 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 18 | ||||
| -rwxr-xr-x | travis.sh | 4 |
3 files changed, 5 insertions, 47 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/sonar-application/pom.xml b/sonar-application/pom.xml index 153d6aaa74c..d2f68c7820e 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/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' |