diff --git a/.travis.yml b/.travis.yml
index d6e87ac..3948206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_install:
- if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust; fi
script:
- - ./mvnw --batch-mode cobertura:cobertura -DperformRelease=true -Dlogging.level.=ERROR
+ - ./mvnw --batch-mode cobertura:cobertura -Dlogging.level.=ERROR
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git a/.travis/release.sh b/.travis/release.sh
index 0738b5d..a327ee3 100755
--- a/.travis/release.sh
+++ b/.travis/release.sh
@@ -12,23 +12,24 @@ github_changelog_generator -t ${GITHUB_ACCESS_TOKEN}
git config --global user.email "builds@travis-ci.com"
git config --global user.name "Travis CI"
git remote rm origin
-git remote add origin https://${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN}@github.com/${GITHUB_USERNAME}/spring-cloud-deployer-openshift.git
+git remote add origin https://${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN}@github.com/${GITHUB_USERNAME}/spring-cloud-dataflow-server-openshift.git
git add CHANGELOG.md
git commit -m "Add CHANGELOG [ci skip]" && git push origin HEAD:master
# Get latest (soon to be previous) release
previous_release_tag=$(curl -s \
-u ${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN} \
- https://api.github.com/repos/${GITHUB_USERNAME}/spring-cloud-deployer-openshift/releases/latest | \
+ https://api.github.com/repos/${GITHUB_USERNAME}/spring-cloud-dataflow-server-openshift/releases/latest | \
jq -r .tag_name)
# Create GitHub release
echo -e "\033[0;32mCreating GitHub release...\033[0m"
release_name="${TRAVIS_TAG:1}"
github_changelog_generator -t ${GITHUB_ACCESS_TOKEN} -o /tmp/CHANGELOG.md --since-tag ${previous_release_tag}
-cat <(sed -e '$ d' /tmp/CHANGELOG.md) <(echo "Bintray artifacts: https://bintray.com/${GITHUB_USERNAME}/switchbit-public/spring-cloud-deployer-openshift/${release_name}") > /tmp/CHANGELOG.md.release
+cat <(sed -e '$ d' /tmp/CHANGELOG.md) <(echo "Bintray artifacts: https://bintray.com/${GITHUB_USERNAME}/switchbit-public/spring-cloud-dataflow-server-openshift/${release_name}") > /tmp/CHANGELOG.md.release
+printf "\n\nDocker Image: https://hub.docker.com/r/donovanmuller/spring-cloud-dataflow-server-openshift" >> /tmp/CHANGELOG.md.release
release_changelog=$(< /tmp/CHANGELOG.md.release)
-jq -n \
+release_id=$(jq -n \
--arg tag_name "$TRAVIS_TAG" \
--arg release_name "$release_name" \
--arg release_changelog "$release_changelog" \
@@ -39,10 +40,17 @@ jq -n \
"draft": false,
"prerelease": false
}' |
- curl -i \
+ curl -s \
-u ${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN} \
-d@- \
- https://api.github.com/repos/${GITHUB_USERNAME}/spring-cloud-deployer-openshift/releases
+ https://api.github.com/repos/${GITHUB_USERNAME}/spring-cloud-dataflow-server-openshift/releases | jq -r .id)
+
+# Upload the scdf-templates.zip as a release asset
+curl -i \
+ -H "Content-Type: application/zip" \
+ -u donovanmuller:${GITHUB_ACCESS_TOKEN} \
+ --upload-file src/etc/openshift/scdf-openshift-templates.zip \
+ https://uploads.github.com/repos/donovanmuller/spring-cloud-dataflow-server-openshift/releases/${release_id}/assets?name=scdf-openshift-templates.zip
# mvn deploy to Bintray
echo -e "\033[0;32mDeploying to Bintray...\033[0m"
@@ -53,13 +61,17 @@ echo -e "\033[0;32mDeploying to Bintray...\033[0m"
./mvnw --settings .travis/settings.xml -DskipTests=true -DperformRelease=true deploy
# Add documentation to donovanmuller.github.io
-./mvnw -Pfull clean install -DskipTests
-git clone git@github.com:donovanmuller/donovanmuller.github.io.git /tmp/donovanmuller.github.io
+echo -e "\033[0;32mGenerating and pushing documentation...\033[0m"
+./mvnw -Pfull install -DskipTests
+git clone https://${GITHUB_USERNAME}:${GITHUB_ACCESS_TOKEN}@github.com/${GITHUB_USERNAME}/donovanmuller.github.io.git /tmp/donovanmuller.github.io
mkdir -p /tmp/donovanmuller.github.io/spring-cloud-dataflow-server-openshift/docs/${release_name}
unzip spring-cloud-dataflow-server-openshift-docs/target/spring-cloud-dataflow-server-openshift-docs-${release_name}.zip -d /tmp/donovanmuller.github.io/spring-cloud-dataflow-server-openshift/docs/${release_name}
-git commit --all --message "Added spring-cloud-dataflow-server-openshift ${release_name} reference documentation" && git push origin master
+git --git-dir=/tmp/donovanmuller.github.io/.git/ --work-tree=/tmp/donovanmuller.github.io add . && \
+ git --git-dir=/tmp/donovanmuller.github.io/.git/ --work-tree=/tmp/donovanmuller.github.io commit --message "Added spring-cloud-dataflow-server-openshift ${release_name} reference documentation" && \
+ git --git-dir=/tmp/donovanmuller.github.io/.git/ --work-tree=/tmp/donovanmuller.github.io push origin master
# Build and push Docker image
+echo -e "\033[0;32mBuilding and pushing Docker image...\033[0m"
./mvnw package docker:build -pl :spring-cloud-dataflow-server-openshift -DskipTests
docker tag donovanmuller/spring-cloud-dataflow-server-openshift:latest donovanmuller/spring-cloud-dataflow-server-openshift:${release_name}
docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6487ea..8ef3629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
# Change Log
+## [v1.2.1.RELEASE](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/tree/v1.2.1.RELEASE) (2017-11-07)
+[Full Changelog](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/compare/v1.2.0.RELEASE...v1.2.1.RELEASE)
+
+**Implemented enhancements:**
+
+- Add 'tags' to Templates [\#13](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/13)
+
+**Fixed bugs:**
+
+- Can not deploy SCDF on openshift with the template [\#24](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/24)
+
+**Closed issues:**
+
+- SCDF route naming uses '.' rather than '-' as a separator [\#26](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/26)
+- Sample stream pods deployed on SCDF do not start up on Openshift [\#25](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/25)
+- Setting the deployment properties in the gui [\#23](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/23)
+- Cant deploy templates from Openshift web console [\#22](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/22)
+- Error during installing the OpenShift templates [\#21](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/21)
+- Error in Openshift when deploying custom stream app [\#20](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/20)
+- Update OpenShift Templates for new 1.2 releases [\#19](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/19)
+- Add RBAC to OpenShift Templates [\#18](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/18)
+- Roadmap 1.2.0 Milestone [\#16](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/16)
+- Build error [\#14](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/14)
+- Add CI configuration [\#4](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/issues/4)
+
## [v1.2.0.RELEASE](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/tree/v1.2.0.RELEASE) (2017-07-09)
[Full Changelog](https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift/compare/v1.1.0.RELEASE...v1.2.0.RELEASE)
diff --git a/pom.xml b/pom.xml
index f6e9cda..97789cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,14 @@
false
+
+ bintray-donovanmuller-switchbit-public
+ bintray
+ https://dl.bintray.com/donovanmuller/switchbit-public
+
+ false
+
+
@@ -151,24 +159,6 @@
true
-
-
- bintray-donovanmuller-switchbit-public
- bintray
- https://dl.bintray.com/donovanmuller/switchbit-public
-
- false
-
-
-
- spring-releases
- Spring Releases
- http://repo.spring.io/release
-
- false
-
-
-
@@ -200,6 +190,16 @@
+
+
+ bintray-donovanmuller-switchbit-public
+ bintray
+ https://dl.bintray.com/donovanmuller/switchbit-public
+
+ false
+
+
+