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/01/08 16:27:17 UTC
[myfaces-tobago] branch tobago-2.x updated (91a26de -> c9b4bdd)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 91a26de Use Logback for logging backend.
new 4c63ce6 checkstyle
new 41d84e9 Update dependency-check-maven plugin
new d0be261 update CVE suppression
new c9b4bdd update year
The 4 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:
pom.xml | 4 ++--
tobago-assembly/src/main/resources/NOTICE.txt | 2 +-
.../tobago/internal/taglib/component/package-info.java | 2 +-
.../tobago/internal/taglib/extension/package-info.java | 2 +-
.../src/main/resources/NOTICE.txt | 2 +-
.../tobago/internal/taglib/sandbox/package-info.java | 2 +-
.../src/main/resources/META-INF/NOTICE.txt | 2 +-
.../myfaces/tobago/apt/generate/ComponentInfo.java | 3 +++
.../org/apache/myfaces/tobago/apt/generate/Imports.java | 15 ++++++++-------
.../apache/myfaces/tobago/apt/generate/PropertyInfo.java | 8 ++++----
.../myfaces/tobago/apt/processor/TaglibGenerator.java | 16 ++++++++--------
11 files changed, 31 insertions(+), 27 deletions(-)
[myfaces-tobago] 04/04: update year
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit c9b4bdd611d98d299325f2d10569125a17ce8c63
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Jan 8 17:19:50 2021 +0100
update year
---
tobago-assembly/src/main/resources/NOTICE.txt | 2 +-
.../apache/myfaces/tobago/internal/taglib/component/package-info.java | 2 +-
.../apache/myfaces/tobago/internal/taglib/extension/package-info.java | 2 +-
tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt | 2 +-
.../org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java | 2 +-
tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tobago-assembly/src/main/resources/NOTICE.txt b/tobago-assembly/src/main/resources/NOTICE.txt
index e413bf3..b3b952a 100644
--- a/tobago-assembly/src/main/resources/NOTICE.txt
+++ b/tobago-assembly/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2020 The Apache Software Foundation
+Copyright 2005-2021 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
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 3b7a95c..84de4b8 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
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Component Tag Library 2.4.x -
- * (C) Copyright 2005-2020 The Apache Software Foundation</b>
+ * (C) Copyright 2005-2021 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tc",
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
index 2d5a1ee..75cb6bb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Extension Tag Library 2.4.x -
- * (C) Copyright 2005-2020 The Apache Software Foundation</b>
+ * (C) Copyright 2005-2021 The Apache Software Foundation</b>
*/
@org.apache.myfaces.tobago.apt.annotation.Taglib(
shortName = "tx",
diff --git a/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt b/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
index e413bf3..b3b952a 100644
--- a/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
+++ b/tobago-example/tobago-example-assembly/src/main/resources/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2020 The Apache Software Foundation
+Copyright 2005-2021 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
index 5f5bce2..ed0f555 100644
--- a/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
+++ b/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/package-info.java
@@ -19,7 +19,7 @@
/**
* <b>Tobago Framework Sandbox Tag Library 2.4.x -
- * (C) Copyright 2002-2020 The Apache Software Foundation</b>
+ * (C) Copyright 2002-2021 The Apache Software Foundation</b>
*
* <b>Warning: The sandbox tag library contains unstable components.
* Everything is subject to change without prior notice.</b>
diff --git a/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt b/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt
index 5acf59c..ececb8f 100644
--- a/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt
+++ b/tobago-tool/tobago-theme-plugin/src/main/resources/META-INF/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2020 The Apache Software Foundation
+Copyright 2005-2021 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
[myfaces-tobago] 02/04: Update dependency-check-maven plugin
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 41d84e901f192598ca3dff12b8cd9c95ebf2295d
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Jan 8 14:59:31 2021 +0100
Update dependency-check-maven plugin
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22e3e8f..5e96b9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1050,7 +1050,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
- <version>5.2.4</version>
+ <version>6.0.5</version>
<configuration>
<failBuildOnCVSS>0</failBuildOnCVSS>
<suppressionFile>tobago/dependency-check-suppression-for-tobago-2.x.xml</suppressionFile>
[myfaces-tobago] 03/04: update CVE suppression
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit d0be261f19c33f18a6da2a3de3375debe820fe41
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Jan 8 17:16:03 2021 +0100
update CVE suppression
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5e96b9d..9d678aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>2.0</jsf.target>
<required.maven.version>2.2.1</required.maven.version>
- <checkstyle-rules.version>12</checkstyle-rules.version>
+ <checkstyle-rules.version>13</checkstyle-rules.version>
<tobago.basedir>${project.basedir}</tobago.basedir>
</properties>
[myfaces-tobago] 01/04: checkstyle
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 4c63ce653b99d12d7caacd1196846ad408ec93c1
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Jan 8 14:51:00 2021 +0100
checkstyle
---
.../myfaces/tobago/apt/generate/ComponentInfo.java | 3 +++
.../org/apache/myfaces/tobago/apt/generate/Imports.java | 15 ++++++++-------
.../apache/myfaces/tobago/apt/generate/PropertyInfo.java | 8 ++++----
.../myfaces/tobago/apt/processor/TaglibGenerator.java | 16 ++++++++--------
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
index 844f952..a21a683 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
@@ -43,6 +43,9 @@ public class ComponentInfo extends TagInfo {
setComponentClassName(componentTag.uiComponent());
}
+ /**
+ * @deprecated don't use
+ */
@Deprecated
public ComponentInfo(final String sourceClass, final String qualifiedName, final String rendererType) {
super(sourceClass, qualifiedName, rendererType);
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
index a0af6ac..4b1acde 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/Imports.java
@@ -36,15 +36,16 @@ public class Imports {
this.packageName = packageName;
}
- public void addImport(String qualifiedName) {
- if (!ClassUtils.isSystemClass(qualifiedName) && !ClassUtils.isPrimitive(qualifiedName)) {
- if (!(packageName != null && packageName.equals(ClassUtils.getPackageName(qualifiedName)))) {
- final int index = qualifiedName.lastIndexOf('$');
+ public void addImport(final String qualifiedName) {
+ String qName = qualifiedName;
+ if (!ClassUtils.isSystemClass(qName) && !ClassUtils.isPrimitive(qName)) {
+ if (!(packageName != null && packageName.equals(ClassUtils.getPackageName(qName)))) {
+ final int index = qName.lastIndexOf('$');
if (index != -1) {
- qualifiedName = qualifiedName.substring(0, index);
+ qName = qName.substring(0, index);
}
- if (!imports.contains(qualifiedName)) {
- imports.add(qualifiedName);
+ if (!imports.contains(qName)) {
+ imports.add(qName);
}
}
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
index 2e1635c..57ba1d3 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/PropertyInfo.java
@@ -109,12 +109,12 @@ public class PropertyInfo {
}
public String getShortTypeProperty() {
- final String type = getShortType();
- final int index = type.lastIndexOf('.');
+ final String shortType = getShortType();
+ final int index = shortType.lastIndexOf('.');
if (index != -1) {
- return type.substring(type.lastIndexOf('.') + 1, type.length());
+ return shortType.substring(shortType.lastIndexOf('.') + 1, shortType.length());
}
- return type;
+ return shortType;
}
public String getUpperCamelCaseName() {
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
index 7e629a2..864e471 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
@@ -309,19 +309,19 @@ public class TaglibGenerator extends AbstractGenerator {
}
}
- private String deprecationComment(String string) {
+ private String deprecationComment(final String string) {
if (string == null) {
return null;
}
final String deprecated = "@deprecated";
final int begin = string.indexOf(deprecated);
if (begin > -1) {
- string = string.substring(begin + deprecated.length());
+ String comment = string.substring(begin + deprecated.length());
final int end = string.indexOf("@");
if (end > -1) {
- string = string.substring(0, end);
+ comment = string.substring(0, end);
}
- return string.trim();
+ return comment.trim();
} else {
return null;
}
@@ -445,13 +445,13 @@ public class TaglibGenerator extends AbstractGenerator {
JSP,
FACELETS;
- public String filename(String target, final String path, final String name) {
- target = StringUtils.isNotBlank(target) ? target + '/' : "";
+ public String filename(final String target, final String path, final String name) {
+ final String string = StringUtils.isNotBlank(target) ? target + '/' : "";
switch (this) {
case JSP:
- return target + path.replace('.', '/') + '/' + name + ".tld";
+ return string + path.replace('.', '/') + '/' + name + ".tld";
case FACELETS:
- return target + name + ".taglib.xml";
+ return string + name + ".taglib.xml";
default:
throw new IllegalArgumentException("Program error");
}