Switched development to master branch (dropped gitflow).

.travis.yml

@@ -106,24 +106,12 @@ before_deploy:
     - "chmod 600 .travis/id_rsa"
     - "ssh-add .travis/id_rsa"
     - "echo -e \"Host github.com\\n    StrictHostKeyChecking no\\n\" >> ~/.ssh/config"
+    # this actually does the job, but we need it to produce artifacts for "releases" provider
+    # entire "before_deploy" will not be executed if there is no deploy to be processed
+    - "./.travis/release.sh"
+    - "export TRAVIS_TAG=$(git describe --abbrev=0)"
 
 deploy:
-    -
-        provider: "script"
-        skip_cleanup: true
-        # unfortunately deploy script must be single command
-        script: "./.travis/release.sh"
-        on:
-            branch: "develop"
-            condition: "${TRAVIS_EVENT_TYPE} == push"
-            jdk: "oraclejdk8"
-    -
-        provider: "script"
-        skip_cleanup: true
-        script: "mvn -e deploy site-deploy -P deploy --settings .travis/settings.xml"
-        on:
-            branch: "master"
-            jdk: "oraclejdk8"
     -
         provider: "releases"
         skip_cleanup: true
@@ -132,6 +120,7 @@ deploy:
         file: "*/target/*.jar"
         on:
             branch: "master"
+            condition: "${TRAVIS_EVENT_TYPE} == push"
             jdk: "oraclejdk8"
 
 cache:

.travis/release.sh

@@ -12,11 +12,6 @@ set -ex
 REPO=$(git config remote.origin.url)
 SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
 
-# prevent looping
-if [[ "${TRAVIS_COMMIT_MESSAGE:0:6}" == "[auto]" ]] ; then
-    exit
-fi
-
 # change origin URL to SSH to allow uploading with SSH key
 git remote rm origin
 git remote add origin ${SSH_REPO}
@@ -28,9 +23,12 @@ git checkout ${TRAVIS_BRANCH}
 mvn versions:set versions:commit \
     -DremoveSnapshot=true
 git add -u
-git commit -m "[auto] Automated release release."
+git commit -m "[skip ci] Automated release release."
 git push origin ${TRAVIS_BRANCH}:master
 
+# perform a release
+mvn -e clean deploy site-deploy -P deploy --settings .travis/settings.xml -Dmessage="${TRAVIS_COMMIT_MESSAGE}"
+
 # now create a new version commit
 mvn build-helper:parse-version versions:set versions:commit \
     -DnewVersion="\${semver.majorVersion}.\${semver.minorVersion}.\${semver.nextIncrementalVersion}-SNAPSHOT"

CONTRIBUTING.md

@@ -11,7 +11,7 @@ This project is published under [MIT license](https://github.com/rafalwrzeszcz-w
 
 # How to send a pull request
 
-When you publish your pull request make sure your branch is rebased on top of latest upstream state. Please also make sure you target `develop` branch as this is our development branch (please read our [Git workflow](http://rafalwrzeszcz-wrzasqpl.github.io/pl.wrzasq.lambda/gitflow.html) guide for details).
+When you publish your pull request make sure your branch is rebased on top of latest upstream state.
 
 Feel free to also add yourself to list of authors of the project.
 

README.md

@@ -10,7 +10,7 @@
 **WrzasqPl-Lambda** is a set of generic **AWS Lambda**s.
 
 [![Build Status](https://travis-ci.com/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda.svg)](https://travis-ci.com/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda)
-[![Coverage Status](https://coveralls.io/repos/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/badge.svg?branch=develop)](https://coveralls.io/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/badge.svg)](https://coveralls.io/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda)
 [![Known Vulnerabilities](https://snyk.io/test/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/badge.svg)](https://snyk.io/test/github/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda)
 
@@ -62,7 +62,7 @@ resource.
 # Resources
 
 -   [GitHub page with API documentation](https://rafalwrzeszcz-wrzasqpl.github.io/pl.wrzasq.lambda)
--   [Contribution guide](https://github.com/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/blob/develop/CONTRIBUTING.md)
+-   [Contribution guide](https://github.com/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/blob/master/CONTRIBUTING.md)
 -   [Issues tracker](https://github.com/rafalwrzeszcz-wrzasqpl/pl.wrzasq.lambda/issues)
 -   [Maven packages](https://search.maven.org/search?q=g:pl.wrzasq.lambda)
 -   [Wrzasq.pl @ GitHub](https://github.com/rafalwrzeszcz-wrzasqpl)

src/site/site.xml

@@ -53,10 +53,6 @@
 
         <menu ref="modules"/>
 
-        <menu name="Contribution guide">
-            <item name="Git workflow" href="gitflow.html"/>
-        </menu>
-
         <menu name="Usage guide">
             <item name="S3 upload" href="guide/upload.html"/>
         </menu>