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 2021/03/22 18:25:49 UTC
[myfaces-tobago] branch tobago-4.x updated: chore(demo): cleanup
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-4.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-4.x by this push:
new 268a435 chore(demo): cleanup
268a435 is described below
commit 268a43584109a4b7a3cd60f3f956ce04cbef2491
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Mar 22 19:04:37 2021 +0100
chore(demo): cleanup
---
.../org/apache/myfaces/tobago/example/demo/ApiController.java | 4 ----
.../main/java/org/apache/myfaces/tobago/example/demo/Release.java | 8 ++++----
.../src/main/webapp/content/10-intro/70-faq/faq.xhtml | 2 +-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
index 3a9304e..d79a23c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -74,10 +74,6 @@ public class ApiController implements Serializable {
this.onlyCurrent = onlyCurrent;
}
- public String getVersion430() {
- return Release.v4_3_0.getVersion();
- }
-
public String getVersion500() {
return Release.v5_0_0.getVersion();
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
index cad5096..8b72868 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
@@ -128,15 +128,15 @@ public enum Release {
v3_0_4("12340258"),
v3_0_5("12340325"),
v3_0_6("12341574"),
- v3_1_0("12342388"),*/
- v3_1_1("12343478", true),
+ v3_1_0("12342388"),
+ v3_1_1("12343478"),
/*v4_0_0("12338728"),
v4_1_0("12339443"),
v4_2_0("12342739"),
- v4_2_1("12342849"),*/
+ v4_2_1("12342849"),
v4_3_0("12342850"),
- /*v4_3_1("12343951"),
+ v4_3_1("12343951"),
v4_3_2("12344394"),
v4_4_0("12344541"),
v4_4_1("12345061"),
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
index 496832b..b92117d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/faq.xhtml
@@ -326,7 +326,7 @@ mvn verify -Pqunit-integration-tests</code></pre>
</tc:section>
<tc:section id="integrationTestTobago4" label="Tobago 4">
- <p>Since Tobago #{apiController.version430} the integration tests are reimplemented with docker.</p>
+ <p>Since Tobago 4.3.0 the integration tests are reimplemented with docker.</p>
<p>To run the integration tests:</p>
<pre><code class="language-markup">cd tobago-example/tobago-example-demo
mvn -Pdocker-qunit-tests</code></pre>