diff --git a/docs/_config.yml b/docs/_config.yml index 8a721063e6920d6b1e8953bf9f32b5175f614684..333f11bdefa5f333b4c61049662bc824b87d965f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -26,9 +26,9 @@ # to reference a specific Flink version, because this is the only place where # we change the version for the complete docs when forking of a release branch # etc. -version: "1.1-SNAPSHOT" -version_hadoop1: "1.1-hadoop1-SNAPSHOT" -version_short: "1.1" # Used for the top navbar w/o snapshot suffix +version: "1.2-SNAPSHOT" +version_hadoop1: "1.2-hadoop1-SNAPSHOT" +version_short: "1.2" # Used for the top navbar w/o snapshot suffix # This suffix is appended to the Scala-dependent Maven artifact names scala_version_suffix: "_2.10" @@ -41,9 +41,9 @@ github_url: "https://github.com/apache/flink" download_url: "http://flink.apache.org/downloads.html" # Setup quickstart uses this => to be changed -FLINK_DOWNLOAD_URL_HADOOP1_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.1/flink-0.9.1-bin-hadoop1.tgz" -FLINK_DOWNLOAD_URL_HADOOP2_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.1/flink-0.9.1-bin-hadoop2.tgz" -FLINK_DOWNLOAD_URL_YARN_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-0.9.1/flink-0.9.1-bin-hadoop2-yarn.tgz" +FLINK_DOWNLOAD_URL_HADOOP1_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-1.1.0/flink-1.1.0-bin-hadoop1.tgz" +FLINK_DOWNLOAD_URL_HADOOP2_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-1.1.0/flink-1.1.0-bin-hadoop2.tgz" +FLINK_DOWNLOAD_URL_YARN_STABLE: "http://www.apache.org/dyn/closer.cgi/flink/flink-1.1.0/flink-1.1.0-bin-hadoop2-yarn.tgz" #------------------------------------------------------------------------------ # BUILD CONFIG diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh index 8514d8d07903c16e46f0d3af5b2bbe818c924f48..04c246c810a046596eb43ec39eeaa6161625b7ac 100755 --- a/tools/create_release_files.sh +++ b/tools/create_release_files.sh @@ -37,9 +37,9 @@ # Can be called like this: # # sonatype_user=APACHEID sonatype_pw=APACHEIDPASSWORD \ -# NEW_VERSION=0.9.0 \ -# RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-0.9.0 -# OLD_VERSION=0.9-SNAPSHOT \ +# NEW_VERSION=1.2.0 \ +# RELEASE_CANDIDATE="rc1" RELEASE_BRANCH=release-1.2.0 +# OLD_VERSION=1.1-SNAPSHOT \ # USER_NAME=APACHEID \ # GPG_PASSPHRASE=XXX GPG_KEY=KEYID \ # GIT_AUTHOR="`git config --get user.name` <`git config --get user.email`>" \ @@ -66,7 +66,7 @@ fi GPG_PASSPHRASE=${GPG_PASSPHRASE:-XXX} GPG_KEY=${GPG_KEY:-XXX} GIT_AUTHOR=${GIT_AUTHOR:-"Your name "} -OLD_VERSION=${OLD_VERSION:-0.10-SNAPSHOT} +OLD_VERSION=${OLD_VERSION:-1.1-SNAPSHOT} RELEASE_VERSION=${NEW_VERSION} RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-rc1} RELEASE_BRANCH=${RELEASE_BRANCH:-master}