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 2023/04/27 14:55:03 UTC
[myfaces-tobago] branch tobago-5.x updated: Tobago 5.x prepare (#4000)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-5.x by this push:
new 9c740cc628 Tobago 5.x prepare (#4000)
9c740cc628 is described below
commit 9c740cc628a502df70e1aa4f326fa2030dbf7a5e
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Apr 27 16:54:58 2023 +0200
Tobago 5.x prepare (#4000)
* feat: Render a panel inside each row in a sheet
* mark as preliminary
issue: TOBAGO-2208
* build(release): prepare 5.7.0
---
package.json | 2 +-
.../internal/taglib/component/package-info.java | 4 +-
.../tobago-example-demo/package-lock.json | 4 +-
tobago-example/tobago-example-demo/package.json | 2 +-
.../myfaces/tobago/example/demo/ApiController.java | 2 +-
.../myfaces/tobago/example/demo/Release.java | 5 +-
.../90-release-checklist/Release_Checklist.xhtml | 67 ++--------------------
.../tobago-example-demo/test-scenarios-locally.sh | 4 ++
tobago-theme/package-lock.json | 4 +-
tobago-theme/package.json | 2 +-
10 files changed, 21 insertions(+), 75 deletions(-)
diff --git a/package.json b/package.json
index 8ea41df689..829260fa98 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "myfaces-tobago",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"description": "The goal of Tobago is to provide the community with a well designed set of user interface components based on JSF and run on MyFaces.",
"repository": {
"type": "git",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
index 2ce44e2c94..3777b7c8b7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/package-info.java
@@ -18,13 +18,13 @@
*/
/**
- * <b>Tobago Framework Component Tag Library 5.7.0-SNAPSHOT -
+ * <b>Tobago Framework Component Tag Library 5.7.0 -
* (C) Copyright 2005-2023 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tc",
uri = "http://myfaces.apache.org/tobago/component",
name = "tobago",
- displayName = "Tobago Components 5.7.0-SNAPSHOT")
+ displayName = "Tobago Components 5.7.0")
package org.apache.myfaces.tobago.internal.taglib.component;
diff --git a/tobago-example/tobago-example-demo/package-lock.json b/tobago-example/tobago-example-demo/package-lock.json
index 386d9d0191..340e219c53 100644
--- a/tobago-example/tobago-example-demo/package-lock.json
+++ b/tobago-example/tobago-example-demo/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tobago-example-demo",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tobago-example-demo",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"license": "Apache-2.0",
"dependencies": {
"font-awesome": "4.7.0",
diff --git a/tobago-example/tobago-example-demo/package.json b/tobago-example/tobago-example-demo/package.json
index d59f66bb47..3444636b6d 100644
--- a/tobago-example/tobago-example-demo/package.json
+++ b/tobago-example/tobago-example-demo/package.json
@@ -1,6 +1,6 @@
{
"name": "tobago-example-demo",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"description": "The demo for the Tobago framework",
"repository": {
"type": "git",
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 069578ffb9..af23a41130 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
@@ -97,7 +97,7 @@ public class ApiController implements Serializable {
}
}
LOG.error("No current release found!");
- return Release.v5_6_0.getVersion(); // should not happen
+ return Release.v5_7_0.getVersion(); // should not happen
}
public String getJiraUrl(final String version) {
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 2f262b69b7..3bc43abc03 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
@@ -157,8 +157,9 @@ public enum Release {
v5_4_0("12352274"),
v5_5_0("12352597"),
v5_6_0("12352743"),
- v5_6_1("12353083", true),
- v5_7_0("12352928", false, true),
+ v5_6_1("12353083"),
+ v5_7_0("12352928", true),
+ v5_8_0("12353182", false, true),
v6_0_0("12350675", false, true);
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
index 08258884cf..17affb8c4c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
@@ -105,81 +105,22 @@ ${content}
</tc:popup>
</li>
- <li>Install (or unpack) a jdk 1.4 on your computer (only for Tobago 1.0.x).
- </li>
-
- <li>Please switch to a jdk depending of the version to build:
- </li>
-
- <li>for Tobago 1.0.x:
- <ul>
- <li>use jdk 1.5 or 1.6 for build</li>
- <li>use jdk 1.7 for deployment</li>
- </ul>
- </li>
-
- <li>for Tobago 1.5.x use jdk 1.7.
- </li>
-
- <li>for Tobago 2.x and higher use jdk 1.8 or higher.
- </li>
+ <li>for Tobago 2.x and higher use jdk 1.8 or higher.</li>
<li>Perform basic checks on an unmodified checkout for all modules:
- <demo-highlight language="bash"># for Tobago 1.0.x
-$ mvn checkstyle:check rat:check -Pall-modules
-
-# for Tobago 1.5.x and higher
-$ mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check -Pall-modules
-
-# for Tobago 2.0.9 and higher
-$ mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
-
-# for Tobago 3.0.0 and higher
-$ mvn clean install -Pall-modules && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check -Pall-modules
-
-# for Tobago 4.2.0 and higher
+ <demo-highlight language="bash"># for Tobago 2.x, 4.x and higher
$ mvn clean install && mvn checkstyle:check apache-rat:check animal-sniffer:check dependency-check:check
-</demo-highlight>
- </li>
- </ul>
- </tc:section>
- <tc:section label="Building the Release (Tobago 1.0.x to 2.0.8)">
- <tc:badge value="Todo:" markup="warning"/> Migrate this docs to use git!
- <ul>
- <li>Prepare the release with:
-
- <demo-highlight language="bash">$ mvn release:prepare -Pall-modules</demo-highlight>
- </li>
-
- <li>Check out a fresh copy of the svn tag:
-
- <demo-highlight language="bash">cd ..
-svn co https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-<version>
-cd tobago-<version>
-</demo-highlight>
- </li>
-
- <li>Deploy the fresh copy to the Nexus repository with the apache-release profile (we are not using release:perform here, because of some different options):
-
- <demo-highlight language="bash"># for Tobago 1.0.x
-# "install" with Java 1.6 and Maven 2
-$ mvn install -Papache-release,jdk14retro,generate-assembly --no-plugin-updates -Dnon-default-modules -Djava14.home=\${java14.jre}
-# "deploy" with Java 1.7 and Maven 3 (hotfix: also comment out the maven-apt-plugin stuff)
-$ mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
-
-# for Tobago 1.5.x to 2.0.8
-$ mvn deploy -Papache-release,generate-assembly --no-plugin-updates -Dnon-default-modules
</demo-highlight>
</li>
</ul>
</tc:section>
- <tc:section label="Building the Release (Tobago 2.0.9 and higher)">
+ <tc:section label="Building the Release">
<ul>
<li>Commit: "chore(release): prepare"
<ul>
- <li>Check version info in these files manually:
+ <li>Check version info in these files manually (set to release version without SNAPSHOT suffix):
<demo-highlight>package.json</demo-highlight>
<demo-highlight>package-lock.json</demo-highlight>
<demo-highlight>package-info.java</demo-highlight>
diff --git a/tobago-example/tobago-example-demo/test-scenarios-locally.sh b/tobago-example/tobago-example-demo/test-scenarios-locally.sh
index 04b5fa16ff..277efa9b73 100755
--- a/tobago-example/tobago-example-demo/test-scenarios-locally.sh
+++ b/tobago-example/tobago-example-demo/test-scenarios-locally.sh
@@ -23,6 +23,10 @@
WORK=test-scenarios-locally/$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+JAVA_HOME_8=/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home
+JAVA_HOME_11=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
+JAVA_HOME_17=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home
+
${JAVA_HOME_8}/bin/java -version
if [ $? != 0 ]; then
echo "Java 8 (LTS) not found!"
diff --git a/tobago-theme/package-lock.json b/tobago-theme/package-lock.json
index fe8176a518..7e06e358fe 100644
--- a/tobago-theme/package-lock.json
+++ b/tobago-theme/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tobago-theme",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tobago-theme",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"license": "Apache-2.0",
"dependencies": {
"@trevoreyre/autocomplete-js": "^2.4.1",
diff --git a/tobago-theme/package.json b/tobago-theme/package.json
index 40f17e3613..8473964c06 100644
--- a/tobago-theme/package.json
+++ b/tobago-theme/package.json
@@ -1,6 +1,6 @@
{
"name": "tobago-theme",
- "version": "5.7.0-SNAPSHOT",
+ "version": "5.7.0",
"description": "The themes of the Tobago framework",
"repository": {
"type": "git",