You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/04 19:06:30 UTC
[camel] branch master updated (b40290f -> 513de69)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b40290f Regen
new e0fb0bb Upgrade roaster
new 513de69 CAMEL-15478: Remove roaster workaround as a new release is out, super fast thanks George Gastaldi.
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:
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../main/java/org/apache/camel/maven/JavaSourceParser.java | 14 +-------------
3 files changed, 3 insertions(+), 15 deletions(-)
[camel] 01/02: Upgrade roaster
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e0fb0bbba138da5c8705b7c43e46b6c5ff34a3e1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 4 21:02:06 2020 +0200
Upgrade roaster
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 06ed6a3..5fb2004 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -500,7 +500,7 @@
<rhino-js-version>1.7R2</rhino-js-version>
<rhino-version>1.7.7.1</rhino-version>
<ribbon-version>2.3.0</ribbon-version>
- <roaster-version>2.21.2.Final</roaster-version>
+ <roaster-version>2.21.3.Final</roaster-version>
<robotframework-version>3.2.1</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index ef2ca8e..a69f579 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -488,7 +488,7 @@
<rhino-version>1.7.7.1</rhino-version>
<rhino-js-version>1.7R2</rhino-js-version>
<ribbon-version>2.3.0</ribbon-version>
- <roaster-version>2.21.2.Final</roaster-version>
+ <roaster-version>2.21.3.Final</roaster-version>
<robotframework-version>3.2.1</robotframework-version>
<rome-version>1.15.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
[camel] 02/02: CAMEL-15478: Remove roaster workaround as a new
release is out, super fast thanks George Gastaldi.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 513de6958988f520ec684b097113cedb0f6b4528
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 4 21:04:00 2020 +0200
CAMEL-15478: Remove roaster workaround as a new release is out, super fast thanks
George Gastaldi.
---
.../main/java/org/apache/camel/maven/JavaSourceParser.java | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
index e88a5ad..5c46a7f 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceParser.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import org.jboss.forge.roaster.Roaster;
-import org.jboss.forge.roaster._shade.org.eclipse.jdt.core.dom.TagElement;
import org.jboss.forge.roaster.model.JavaDocTag;
import org.jboss.forge.roaster.model.source.JavaClassSource;
import org.jboss.forge.roaster.model.source.MethodSource;
@@ -106,7 +105,7 @@ public class JavaSourceParser {
private static String getJavadocValue(List<JavaDocTag> params, String name) {
for (JavaDocTag tag : params) {
- String key = getRoasterJavadocFixed(tag);
+ String key = tag.getValue();
if (key.startsWith(name)) {
String desc = key.substring(name.length());
desc = sanitizeJavaDocValue(desc);
@@ -116,17 +115,6 @@ public class JavaSourceParser {
return "";
}
- private static String getRoasterJavadocFixed(JavaDocTag tag) {
- TagElement te = (TagElement) tag.getInternal();
- StringBuilder sb = new StringBuilder();
- for (Object fragment : te.fragments()) {
- sb.append(fragment);
- sb.append(" ");
- }
- return sb.toString().trim();
-
- }
-
private static String sanitizeJavaDocValue(String desc) {
// remove leading - and whitespaces
while (desc.startsWith("-")) {