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 2020/10/21 12:09:40 UTC
[myfaces-tobago] branch tobago-4.x updated (4b67792 -> 2346e8f)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch tobago-4.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 4b67792 logging
new be8e0bf Jenkins properties has been renamed on ci-builds.apache.org
new 2346e8f declaring some deprecations
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 8 ++++----
.../java/org/apache/myfaces/tobago/component/RendererTypes.java | 8 ++++++++
.../src/main/java/org/apache/myfaces/tobago/component/Tags.java | 8 ++++++++
.../internal/taglib/component/ColumnNodeTagDeclaration.java | 4 +++-
.../tobago/internal/taglib/component/TreeNodeTagDeclaration.java | 2 +-
.../java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java | 4 ++++
6 files changed, 28 insertions(+), 6 deletions(-)
[myfaces-tobago] 02/02: declaring some deprecations
Posted by lo...@apache.org.
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
commit 2346e8fc960d3d552dee5714ccfeb3c511f0e16a
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 21 14:09:27 2020 +0200
declaring some deprecations
---
.../java/org/apache/myfaces/tobago/component/RendererTypes.java | 8 ++++++++
.../src/main/java/org/apache/myfaces/tobago/component/Tags.java | 8 ++++++++
.../internal/taglib/component/ColumnNodeTagDeclaration.java | 4 +++-
.../tobago/internal/taglib/component/TreeNodeTagDeclaration.java | 2 +-
.../java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java | 4 ++++
5 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
index 31abbcb..72d408d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/RendererTypes.java
@@ -102,6 +102,10 @@ public enum RendererTypes {
*/
@Deprecated
TreeData,
+ /**
+ * @deprecated since 4.0.0, please use {@link #Link}
+ */
+ @Deprecated
TreeCommand,
TreeIcon,
TreeIndent,
@@ -193,6 +197,10 @@ public enum RendererTypes {
*/
@Deprecated
public static final String TREE_DATA = "TreeData";
+ /**
+ * @deprecated since 4.0.0, please use {@link #LINK}
+ */
+ @Deprecated
public static final String TREE_COMMAND = "TreeCommand";
public static final String TREE_ICON = "TreeIcon";
public static final String TREE_INDENT = "TreeIndent";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
index caadd37..9c2f775 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/Tags.java
@@ -90,6 +90,10 @@ public enum Tags {
tabGroup,
toolBar,
tree,
+ /**
+ * @deprecated since 4.0.0, please use {@link #link}
+ */
+ @Deprecated
treeCommand,
treeIcon,
treeIndent,
@@ -166,6 +170,10 @@ public enum Tags {
public static final String TAB_GROUP = "tabGroup";
public static final String TOOL_BAR = "toolBar";
public static final String TREE = "tree";
+ /**
+ * @deprecated since 4.0.0, please use {@link #LINK}
+ */
+ @Deprecated
public static final String TREE_COMMAND = "treeCommand";
public static final String TREE_ICON = "treeIcon";
public static final String TREE_INDENT = "treeIndent";
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
index f5b3174..cbd3ec8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ColumnNodeTagDeclaration.java
@@ -39,7 +39,8 @@ import javax.faces.component.UIColumn;
*/
@SuppressWarnings("ALL")
@Tag(name = "columnNode")
-@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:treeCommand>")
+@BodyContentDescription(
+ anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:link>|<tc:treeCommand>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIColumnNode",
uiComponentFacesClass = "javax.faces.component.UIColumn",
@@ -54,6 +55,7 @@ import javax.faces.component.UIColumn;
"org.apache.myfaces.tobago.TreeIcon",
"org.apache.myfaces.tobago.TreeSelect",
"org.apache.myfaces.tobago.TreeLabel",
+ "org.apache.myfaces.tobago.Link",
"org.apache.myfaces.tobago.TreeCommand"
})
public interface ColumnNodeTagDeclaration
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
index 94cf07f..7a4fa53 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeNodeTagDeclaration.java
@@ -38,7 +38,7 @@ import javax.faces.component.UIColumn;
*/
@SuppressWarnings("ALL")
@Tag(name = "treeNode")
-@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:treeCommand>")
+@BodyContentDescription(anyTagOf = "<tc:treeIndent>|<tc:treeIcon>|<tc:treeSelect>|<tc:treeLabel>|<tc:link>|<tc:treeCommand>")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNode",
uiComponentFacesClass = "javax.faces.component.UIColumn",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
index fafc34d..d9ca2e8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/TobagoClass.java
@@ -224,6 +224,10 @@ public enum TobagoClass implements CssItem {
TREE("tobago-tree"),
TREE__EXPANDED("tobago-tree-expanded"),
TREE__SELECTED("tobago-tree-selected"),
+ /**
+ * @deprecated since 4.0.0, please use {@link #LINK}
+ */
+ @Deprecated
TREE_COMMAND("tobago-treeCommand"),
TREE_LABEL("tobago-treeLabel"),
TREE_LISTBOX("tobago-treeListbox"),
[myfaces-tobago] 01/02: Jenkins properties has been renamed on
ci-builds.apache.org
Posted by lo...@apache.org.
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
commit be8e0bf77a4191b654c988b6a68d594d2fd4f9f9
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 21 12:00:04 2020 +0200
Jenkins properties has been renamed on ci-builds.apache.org
(cherry picked from commit b0c2e5a893d13ee95dd0ed73179220d0989d4e1f)
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bc0f80b..5b08072 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,12 +43,12 @@ pipeline {
axes {
axis {
name 'JAVA_VERSION'
- values 'JDK 1.8 (latest)', 'JDK 11 (latest)', 'JDK 14 (latest)'
+ values 'jdk_1.8_latest', 'jdk_11_latest', 'jdk_14_latest'
}
}
tools {
- maven "Maven (latest)"
+ maven "maven_latest"
jdk "${JAVA_VERSION}"
}
@@ -70,8 +70,8 @@ pipeline {
}
stage('Deploy') {
tools {
- maven "Maven (latest)"
- jdk "JDK 11 (latest)"
+ maven "maven_latest"
+ jdk "jdk_11_latest"
}
steps {
sh "mvn clean deploy -Pgenerate-assembly"