Automatic merge from branch-5.6

* origin/branch-5.6:
  prepare for next development iteration on release branch
  reverse deploy exclusion cause they fails QA
  re-enable tests on release
  release 5.6-RC2
  handle release distribution from travis
This commit is contained in:
Jenkins CI 2016-05-30 08:08:30 +02:00
commit 23c7f3afc2
2 changed files with 6 additions and 4 deletions

View File

@ -1113,7 +1113,7 @@
</properties>
</profile>
<profile>
<id>release</id>
<id>release</id>
<build>
<plugins>
<plugin>
@ -1504,7 +1504,7 @@
<module>it</module>
<module>tests</module>
</modules>
</profile>
</profile>
</profiles>
</project>

View File

@ -37,16 +37,18 @@ CI)
if [[ $CURRENT_VERSION =~ "-SNAPSHOT" ]]; then
echo "======= Found SNAPSHOT version ======="
# Do not deploy a SNAPSHOT version but the release version related to this build
set_maven_build_version $TRAVIS_BUILD_NUMBER
set_maven_build_version $TRAVIS_BUILD_NUMBER
else
echo "======= Found RELEASE version ======="
fi
# analysis is currently executed by SonarSource internal infrastructure
mvn deploy \
-Pdeploy-sonarsource,release \
-Pdeploy-sonarsource \
-B -e -V
elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN:-}" ]; then
strongEcho 'Build and analyze pull request, no deploy'