mvn-jgitflow:merging 'release/1.1.0' into 'master'

.build/remove-snapshot-artifacts.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+echo "--------------------------------------------------------------------------------"
+echo ".... remove git tags"
+git fetch --tags
+tags=$(git tag | grep SNAPSHOT)
+echo $tags | xargs -n1 echo
+
+if [[ "$1" == "-y" ]]; then
+    CONT="y"
+else
+    echo "remove remote git tags?"
+    read -p "Continue (y/n)?" CONT
+fi
+
+if [ "$CONT" = "y" ]; then
+   echo $tags | xargs -n 1 git tag -d
+   echo $tags | xargs -n 1 git push --delete origin
+else
+  exit 0
+fi
+echo "--------------------------------------------------------------------------------"
+echo "... remove old SNAPSHOT zip and installer files?"
+
+ssh [email protected] -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip'
+ssh [email protected] -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar'
+
+if [[ "$1" == "-y" ]]; then
+    CONT="y"
+else
+    echo "remove files?"
+    read -p "Continue (y/n)?" CONT
+fi
+
+if [ "$CONT" = "y" ]; then
+    ssh [email protected] -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip' || echo "do not fail if nothing have changed"
+    ssh [email protected] -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar' || echo "do not fail if nothing have changed"
+fi
+

docs/development/set-build-env-vars.sh → .build/set-build-env-vars.sh

@@ -18,5 +18,12 @@ echo "VERSION_SURFIX=$VERSION_SURFIX" >> $WORKSPACE/myjob.properties
 
 echo "SAKULI_FEATURE_VERSION=$SAKULI_VERSION-$FEATURE_NAME" >> $WORKSPACE/myjob.properties
 
+if [[ $SAKULI_BRANCH == dev ]] || [[ $SAKULI_BRANCH == feature* ]] ; then
+    SAKULI_DOC_BRANCH=$SAKULI_BRANCH
+else
+    SAKULI_DOC_BRANCH=master
+fi
+echo "SAKULI_DOC_BRANCH=$SAKULI_DOC_BRANCH" >> $WORKSPACE/myjob.properties
+
 # jenkins will use the myjob.properties as environment vars
 cat $WORKSPACE/myjob.properties

.build/update_sakuli_version.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# usage: `update_sakuli_version --new-version v0.x`
+# the script will update the new version
+
+set -e
+
+new_version=""
+version_only=""
+
+arguments=($@)
+let lastindex=${#arguments[@]}
+i=0
+while [ $i -le $lastindex ]; do
+#    echo "i $i, last $lastindex"
+	case ${arguments[$i]} in
+        "--new-version")
+			let "j=$i+1"
+			new_version=${arguments[$j]}
+			let "i=$i+2"
+			;;
+        "--version-only")
+			let "j=$i+1"
+			version_only="true"
+			let "i=$i+2"
+			;;
+        *)
+            let "i=$i+1"
+            ;;
+	esac
+done
+
+echo "=== START: update Sakuli version to new_version: $new_version ==="
+
+basedir=$(dirname $(realpath $0)/)/..
+echo "script basedir: $basedir"
+
+exit_error() {
+    echo "please parameterize the script like e.g. 'update_sakuli_version.sh --new-version 1.0.0 [--version-only]'!"
+    exit 1
+}
+
+updateDockerfiles() {
+    echo "update Dockerfiles to new_version: $new_version"
+
+    searchdir=$basedir/docker
+    refreshDate=$(date +%Y-%m-%d)
+
+    find $searchdir -type f -name Dockerfile* | while read file ; do
+        sed -i -e "s/^ARG SAKULI_VERSION.*/ARG SAKULI_VERSION=$new_version/" $file
+        echo -e "replace SAKULI_VERSION with '$new_version' in file $file"
+        if [[ ! $version_only ]]; then
+            sed -i -e "s/^ENV REFRESHED_AT.*/ENV REFRESHED_AT $refreshDate/" $file
+            echo -e "replace ENV REFRESHED_AT with '$refreshDate' in file $file"
+        fi
+        done
+}
+
+updateREADME() {
+    echo "update README to new_version: $new_version"
+
+    file=$basedir/README.adoc
+    sed -i -e "s/^:sakuli-latest-version:.*/:sakuli-latest-version: v$new_version/" $file \
+        && echo -e "replace :sakuli-latest-version: with '$new_version' in file $file"
+}
+
+if [[ ! $new_version ]]; then
+	exit_error
+fi
+
+updateDockerfiles
+updateREADME
+
+echo "=== FINISHED: update Sakuli version to new_version: $new_version ==="

.gitattributes

@@ -17,3 +17,4 @@
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary
+*.pdf binary

.gitignore

@@ -4,7 +4,7 @@ target
 **/_logs
 /*sahi*/
 firefox
-.idea
+.idea/
 *.iml
 *.log
 *.cache

README.adoc

@@ -0,0 +1,60 @@
+image:./docs/images/sakuli_logo_small.png[sakuli-logo]
+
+:sakuli-latest-version: v1.1.0
+:sakuli-doc-base-url: http://consol.github.io/sakuli
+:sakuli-doc-url: {sakuli-doc-base-url}/{sakuli-latest-version}
+
+_An end-to-end testing tool for web sites and common UIs with multiple monitoring integrations_
+
+= About the project
+image:./docs/images/sakuli_concept.png[sakuli concept]
+
+*Sakuli simulates user actions* on graphical user interfaces (web, fat client, citrix, …), and provides the obtained information (runtime, result, screenshots) to third party (e.g. Nagios compatible monitoring) systems.
+
+*Sakuli* is written in Java and runs on many platforms:
+
+* {sakuli-doc-url}/#windows[Windows]
+* {sakuli-doc-url}/#linux[Linux]
+* {sakuli-doc-url}/#containerized-execution[Docker containers]
+* MacOS
+
+The *Sakuli* project brings together two Open-Source end-to-end testing tools which perfectly fit together: http://www.sahi.co.in/[Sahi] for *web-based tests* (by injecting JavaScript code into the browser), as well as the screenshot-based testing tool http://sikulix.com/[Sikuli], which allows the execution of *keyboard and mouse actions* on screen areas that have been defined by previously recorded screenshots and are recognized using the OpenCV engine.
+
+= Key Features
+
+* Platform-independent UI testing tool
+* End-2-End monitoring of application functionality and quality
+* Combines two automation technologies:
+** DOM based web testing
+** Image pattern based UI automation (for non-web content)
+* Scalable from single-client up to multi-node container setup for parallel execution
+* Integration of test results into
+** Monitoring systems (e.g. Nagios/Icinga)
+** CI builds (e.g. Jenkins)
+
+
+= Documentation
+The complete versions of our documentation you can find under:
+
+*{sakuli-doc-base-url}[consol.github.io/sakuli]*
+
+** *_Dev version:_* latest `vX.X.X-SNAPSHOT` version
+
+** *_Stable/Latest version:_* *{sakuli-doc-url}[{sakuli-latest-version}]*
+
+
+= Quick links
+
+*{sakuli-doc-url}/#download[Download]*
+
+*{sakuli-doc-url}/#examples[Sakuli Examples]*
+
+*{sakuli-doc-url}/#publications[Publications]*
+
+*{sakuli-doc-url}/#events[Events]*
+
+*{sakuli-doc-url}/#media[Media]*
+
+*{sakuli-doc-url}/#changelog[Change Log]*
+
+*{sakuli-doc-url}/#support[Support]*