You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/09/20 03:43:55 UTC
[myfaces-tobago] branch master updated: release 3.0.6
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 54350ab release 3.0.6
54350ab is described below
commit 54350ab9b6d7e8b899a6fcf5242b9b0ad0177df9
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Sep 20 05:41:14 2017 +0200
release 3.0.6
---
.../main/tobago-vm/docker/apache-proxy/index.html | 15 +++++++++------
.../src/main/tobago-vm/docker/docker-compose.yml | 22 +++++++++++-----------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index bbcbd0c..d1cc831 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -63,15 +63,18 @@
<div class="masthead-followup row m-0 border border-white">
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
<h3>Tobago 3</h3>
- <h5>3.0.5</h5>
+ <h5>3.0.6</h5>
<p>Last released version.</p>
<a class="btn btn-success" href="/demo-3-release/">Demo</a>
</div>
- <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
+ <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
+ <h3 class="na">Currently no voting active.</h3>
+<!--
<h3>Tobago 3</h3>
- <h5>3.0.6 (unreleased)</h5>
+ <h5>3.0.6 (coming soon)</h5>
<p>Voting in progress.</p>
<a class="btn btn-warning" href="/demo-3-staging/">Demo</a>
+-->
</div>
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
<h3>Tobago 3</h3>
@@ -92,13 +95,13 @@
<h3 class="na">Currently no voting active.</h3>
<!--
<h3>Tobago 2</h3>
- <h5>2.1.1 (unreleased)</h5>
+ <h5>2.1.1 (coming soon)</h5>
<p>Voting in progress.</p>
- <a class="btn btn-warning" aria-disabled="true" href="/demo-2-staging/">Demo</a>
+ <a class="btn btn-warning" href="/demo-2-staging/">Demo</a>
-->
</div>
<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
- <h3>Tobago 3</h3>
+ <h3>Tobago 2</h3>
<h5>2.1.1-SNAPSHOT</h5>
<p>Next version in development.</p>
<a class="btn btn-danger" href="/demo-2-snapshot/">Demo</a>
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
index 5ab0d09..5f59892 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
links:
- demo-4-snapshot
- demo-3-snapshot
- - demo-3-staging
+# - demo-3-staging
- demo-3-release
- demo-2-snapshot
# - demo-2-staging
@@ -33,7 +33,7 @@ services:
depends_on:
- demo-4-snapshot
- demo-3-snapshot
- - demo-3-staging
+# - demo-3-staging
- demo-3-release
- demo-2-snapshot
# - demo-2-staging
@@ -54,18 +54,18 @@ services:
- CONTEXT_PATH=demo-3-snapshot
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
- demo-3-staging:
- image: tobago/tomcat:latest
- environment:
- - TOBAGO_VERSION=3.0.6
- - STAGING_NUMBER=1118
- - CONTEXT_PATH=demo-3-staging
- volumes:
- - /opt/docker/artifacts:/opt/docker/artifacts
+# demo-3-staging:
+# image: tobago/tomcat:latest
+# environment:
+# - TOBAGO_VERSION=3.0.6
+# - STAGING_NUMBER=1118
+# - CONTEXT_PATH=demo-3-staging
+# volumes:
+# - /opt/docker/artifacts:/opt/docker/artifacts
demo-3-release:
image: tobago/tomcat:latest
environment:
- - TOBAGO_VERSION=3.0.5
+ - TOBAGO_VERSION=3.0.6
- CONTEXT_PATH=demo-3-release
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].