Merge branch 'master' of https://github.com/OpenIdentityPlatform/OpenICF.git

vharseko · vharseko · commit 3d462bd84555 · 2019-06-30T12:56:44.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ matrix:
       - git config --local user.name "Open Identity Platform Community" && git config --local user.email "open-identity-platform-openidm@googlegroups.com"
       - git checkout -f $TRAVIS_BRANCH
       - git tag -f $git_version && git tag -d $git_version
+      - git tag -f $git_version
       - #mvn -q -B -DreleaseVersion="$git_version" -DtagNameFormat="@{project.version}" -DignoreSnapshots=true  -DpushChanges=false -DscmCommentPrefix="[ci skip] $TRAVIS_REPO_SLUG " -DskipTests -Darguments=-DskipTests -Dresume=false clean release:prepare 
       - #git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
       - git push --quiet --force https://$GITHUBKEY@github.com/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1

-Original file line number
+Diff line change
       - git config --local user.name "Open Identity Platform Community" && git config --local user.email "[email protected]"
       - git checkout -f $TRAVIS_BRANCH
       - git tag -f $git_version && git tag -d $git_version
 +      - git tag -f $git_version
       - #mvn -q -B -DreleaseVersion="$git_version" -DtagNameFormat="@{project.version}" -DignoreSnapshots=true  -DpushChanges=false -DscmCommentPrefix="[ci skip] $TRAVIS_REPO_SLUG " -DskipTests -Darguments=-DskipTests -Dresume=false clean release:prepare
       - #git push --quiet --force https://[email protected]/$TRAVIS_REPO_SLUG.git >/dev/null 2>&1
       - git push --quiet --force https://[email protected]/$TRAVIS_REPO_SLUG.git $git_version >/dev/null 2>&1