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 2018/05/09 17:05:46 UTC

[myfaces-tobago] 02/02: next release

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

commit 0184ab3760d79d7926a2d513a119bdb1c9167d71
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed May 9 19:05:34 2018 +0200

    next release
---
 .../main/tobago-vm/docker/apache-proxy/index.html  |  4 ++--
 .../src/main/tobago-vm/docker/docker-compose.yml   | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 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 32eff26..34c3d5b 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
@@ -27,8 +27,8 @@
       var versions = [
         {
           major: "4",
-          release: "4.2.0",
-          staging: "4.2.1",
+          release: "4.2.1",
+          staging: "",
           snapshot: "4.2.2-SNAPSHOT",
           link: "4",
           archived: false
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 09d3921..4d15f7a 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
@@ -22,7 +22,7 @@ services:
 # todo     - "443:443"
     links:
       - demo-4-release
-      - demo-4-staging
+#      - demo-4-staging
       - demo-4-snapshot
       - demo-3-release
 #      - demo-3-staging
@@ -38,7 +38,7 @@ services:
 #      - demo-1-0-snapshot
     depends_on:
       - demo-4-release
-      - demo-4-staging
+#      - demo-4-staging
       - demo-4-snapshot
       - demo-3-release
 #      - demo-3-staging
@@ -55,22 +55,22 @@ services:
   demo-4-release:
     build: tomcat
     environment:
-      - TOBAGO_VERSION=4.2.0
-      - CONTEXT_PATH=demo-4-release
-    volumes:
-      - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-4-staging:
-    build: tomcat
-    environment:
       - TOBAGO_VERSION=4.2.1
-      - STAGING_NUMBER=1134
-      - CONTEXT_PATH=demo-4-staging
+      - CONTEXT_PATH=demo-4-release
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
+#  demo-4-staging:
+#    build: tomcat
+#    environment:
+#      - TOBAGO_VERSION=4.2.1
+#      - STAGING_NUMBER=1134
+#      - CONTEXT_PATH=demo-4-staging
+#    volumes:
+#      - /opt/docker/artifacts:/opt/docker/artifacts
   demo-4-snapshot:
     build: tomcat
     environment:
-      - TOBAGO_VERSION=4.2.1-SNAPSHOT
+      - TOBAGO_VERSION=4.2.2-SNAPSHOT
       - CONTEXT_PATH=demo-4-snapshot
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts

-- 
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.