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 2017/03/09 08:38:59 UTC
camel git commit: CAMEL-10973: Deprecate some languages that are
either EOL or can expose security issues or other issues and there is better
alternatives like javascript, groovy etc.
Repository: camel
Updated Branches:
refs/heads/master 89cae5c34 -> 62e569632
CAMEL-10973: Deprecate some languages that are either EOL or can expose security issues or other issues and there is better alternatives like javascript, groovy etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/62e56963
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/62e56963
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/62e56963
Branch: refs/heads/master
Commit: 62e569632b8ff83c488e97b601c7882fc3ab118c
Parents: 89cae5c
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 09:38:42 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 09:38:50 2017 +0100
----------------------------------------------------------------------
.../camel/builder/ExpressionClauseSupport.java | 7 +++++++
components/camel-josql/pom.xml | 2 +-
.../main/java/org/apache/camel/builder/sql/SQL.java | 1 +
components/camel-juel/pom.xml | 2 +-
.../main/java/org/apache/camel/language/juel/EL.java | 1 +
components/camel-jxpath/pom.xml | 2 +-
.../org/apache/camel/language/jxpath/JXPath.java | 1 +
.../java/org/apache/camel/builder/script/PHP.java | 1 +
.../java/org/apache/camel/builder/script/Python.java | 1 +
.../java/org/apache/camel/builder/script/Ruby.java | 1 +
components/readme.adoc | 14 +++++++-------
.../camel/maven/packaging/PackageDataFormatMojo.java | 15 +++++++++++++++
.../camel/maven/packaging/PackageLanguageMojo.java | 14 ++++++++++++++
13 files changed, 52 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 811caa4..910645f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -307,6 +307,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T el(String text) {
return expression(new ELExpression(text));
}
@@ -432,6 +433,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T jxpath(String text) {
return jxpath(text, false);
}
@@ -443,6 +445,7 @@ public class ExpressionClauseSupport<T> {
* @param lenient to configure whether lenient is in use or not
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T jxpath(String text, boolean lenient) {
JXPathExpression answer = new JXPathExpression(text);
answer.setLenient(lenient);
@@ -478,6 +481,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T php(String text) {
return expression(new PhpExpression(text));
}
@@ -489,6 +493,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T python(String text) {
return expression(new PythonExpression(text));
}
@@ -511,6 +516,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T ruby(String text) {
return expression(new RubyExpression(text));
}
@@ -533,6 +539,7 @@ public class ExpressionClauseSupport<T> {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T sql(String text) {
return expression(new SqlExpression(text));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-josql/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 0838496..7118269 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -26,7 +26,7 @@
<artifactId>camel-josql</artifactId>
<packaging>jar</packaging>
- <name>Camel :: JoSQL</name>
+ <name>Camel :: JoSQL (deprecated)</name>
<description>Camel JoSQL support</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
----------------------------------------------------------------------
diff --git a/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java b/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
index df3671d..659b8db 100644
--- a/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
+++ b/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
@@ -33,6 +33,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "sql")
+@Deprecated
public @interface SQL {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-juel/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index 71c46f0..dded927 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -26,7 +26,7 @@
<artifactId>camel-juel</artifactId>
<packaging>jar</packaging>
- <name>Camel :: JUEL</name>
+ <name>Camel :: JUEL (deprecated)</name>
<description>Camel JUEL support</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
----------------------------------------------------------------------
diff --git a/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java b/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
index 808f35c..630e861 100644
--- a/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
+++ b/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
@@ -33,6 +33,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "el")
+@Deprecated
public @interface EL {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-jxpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index c1f69ce..37f0bae 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -26,7 +26,7 @@
<artifactId>camel-jxpath</artifactId>
<packaging>jar</packaging>
- <name>Camel :: JXPath</name>
+ <name>Camel :: JXPath (deprecated)</name>
<description>Camel JXPath support</description>
<properties>
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
----------------------------------------------------------------------
diff --git a/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
index bd47df6..c431216 100644
--- a/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
+++ b/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
@@ -35,6 +35,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = "jxpath")
+@Deprecated
public @interface JXPath {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java b/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
index 1f4f9a6..41f85c3 100644
--- a/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
+++ b/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
@@ -34,6 +34,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "php")
+@Deprecated
public @interface PHP {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java b/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
index f754bf5..c455ca4 100644
--- a/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
+++ b/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
@@ -34,6 +34,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "python")
+@Deprecated
public @interface Python {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java b/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
index 340b4a8..88b21a7 100644
--- a/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
+++ b/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
@@ -34,6 +34,7 @@ import org.apache.camel.language.LanguageAnnotation;
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "jruby")
+@Deprecated
public @interface Ruby {
String value();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 0a305b3..0d26279 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -782,7 +782,7 @@ Expression Languages
^^^^^^^^^^^^^^^^^^^^
// languages: START
-Number of Languages: 24 in 12 JAR artifacts (0 deprecated)
+Number of Languages: 24 in 12 JAR artifacts (6 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -792,7 +792,7 @@ Number of Languages: 24 in 12 JAR artifacts (0 deprecated)
| link:src/main/docs/constant-language.adoc[Constant] (camel-core) | 1.5 | For expressions and predicates using a constant
-| link:camel-juel/src/main/docs/el-language.adoc[EL] (camel-juel) | 1.1 | For EL expressions and predicates
+| link:camel-juel/src/main/docs/el-language.adoc[EL] (camel-juel) | 1.1 | *deprecated* For EL expressions and predicates
| link:src/main/docs/exchangeProperty-language.adoc[ExchangeProperty] (camel-core) | 2.0 | An expression which extracts the named exchange property
@@ -808,25 +808,25 @@ Number of Languages: 24 in 12 JAR artifacts (0 deprecated)
| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JSonPath] (camel-jsonpath) | 2.13 | For JSonPath expressions and predicates
-| link:camel-jxpath/src/main/docs/jxpath-language.adoc[JXPath] (camel-jxpath) | 1.3 | For JXPath expressions and predicates
+| link:camel-jxpath/src/main/docs/jxpath-language.adoc[JXPath] (camel-jxpath) | 1.3 | *deprecated* For JXPath expressions and predicates
| link:camel-mvel/src/main/docs/mvel-language.adoc[MVEL] (camel-mvel) | 2.0 | For MVEL expressions and predicates
| link:camel-ognl/src/main/docs/ognl-language.adoc[OGNL] (camel-ognl) | 1.1 | For OGNL expressions and predicates
-| link:camel-script/src/main/docs/php-language.adoc[PHP] (camel-script) | 1.0 | For PHP expressions and predicates
+| link:camel-script/src/main/docs/php-language.adoc[PHP] (camel-script) | 1.0 | *deprecated* For PHP expressions and predicates
-| link:camel-script/src/main/docs/python-language.adoc[Python] (camel-script) | 1.0 | For Python expressions and predicates
+| link:camel-script/src/main/docs/python-language.adoc[Python] (camel-script) | 1.0 | *deprecated* For Python expressions and predicates
| link:src/main/docs/ref-language.adoc[Ref] (camel-core) | 2.8 | For using a custom expression or predicate
-| link:camel-script/src/main/docs/ruby-language.adoc[Ruby] (camel-script) | 1.0 | For Ruby expressions and predicates
+| link:camel-script/src/main/docs/ruby-language.adoc[Ruby] (camel-script) | 1.0 | *deprecated* For Ruby expressions and predicates
| link:src/main/docs/simple-language.adoc[Simple] (camel-core) | 1.1 | For expressions and predicates using the simple language
| link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | For Spring Expression Language (SpEL) expressions and predicates
-| link:camel-josql/src/main/docs/sql-language.adoc[SQL] (camel-josql) | 1.0 | For SQL expressions and predicates
+| link:camel-josql/src/main/docs/sql-language.adoc[SQL] (camel-josql) | 1.0 | *deprecated* For SQL expressions and predicates
| link:src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | 2.0 | For expressions and predicates using a body or header tokenizer
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index ead42e5..3509ac0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -185,6 +185,9 @@ public class PackageDataFormatMojo extends AbstractMojo {
if (row.containsKey("label")) {
dataFormatModel.setLabel(row.get("label"));
}
+ if (row.containsKey("deprecated")) {
+ dataFormatModel.setDeprecated(row.get("deprecated"));
+ }
if (row.containsKey("javaType")) {
dataFormatModel.setModelJavaType(row.get("javaType"));
}
@@ -441,6 +444,8 @@ public class PackageDataFormatMojo extends AbstractMojo {
if (dataFormatModel.getDescription() != null) {
buffer.append("\n \"description\": \"").append(dataFormatModel.getDescription()).append("\",");
}
+ boolean deprecated = "true".equals(dataFormatModel.getDeprecated());
+ buffer.append("\n \"deprecated\": ").append(deprecated).append(",");
if (dataFormatModel.getFirstVersion() != null) {
buffer.append("\n \"firstVersion\": \"").append(dataFormatModel.getFirstVersion()).append("\",");
}
@@ -466,6 +471,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
private String description;
private String firstVersion;
private String label;
+ private String deprecated;
private String javaType;
private String modelJavaType;
private String groupId;
@@ -528,6 +534,14 @@ public class PackageDataFormatMojo extends AbstractMojo {
this.label = label;
}
+ public String getDeprecated() {
+ return deprecated;
+ }
+
+ public void setDeprecated(String deprecated) {
+ this.deprecated = deprecated;
+ }
+
public String getJavaType() {
return javaType;
}
@@ -568,6 +582,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
+ ", modelName='" + modelName + '\''
+ ", description='" + description + '\''
+ ", label='" + label + '\''
+ + ", deprecated='" + deprecated + '\''
+ ", javaType='" + javaType + '\''
+ ", modelJavaType='" + modelJavaType + '\''
+ ", groupId='" + groupId + '\''
http://git-wip-us.apache.org/repos/asf/camel/blob/62e56963/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 2cd443d..9dc618d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -191,6 +191,9 @@ public class PackageLanguageMojo extends AbstractMojo {
if (row.containsKey("label")) {
languageModel.setLabel(row.get("label"));
}
+ if (row.containsKey("deprecated")) {
+ languageModel.setDeprecated(row.get("deprecated"));
+ }
if (row.containsKey("javaType")) {
languageModel.setModelJavaType(row.get("javaType"));
}
@@ -369,6 +372,8 @@ public class PackageLanguageMojo extends AbstractMojo {
if (languageModel.getDescription() != null) {
buffer.append("\n \"description\": \"").append(languageModel.getDescription()).append("\",");
}
+ boolean deprecated = "true".equals(languageModel.getDeprecated());
+ buffer.append("\n \"deprecated\": ").append(deprecated).append(",");
if (languageModel.getFirstVersion() != null) {
buffer.append("\n \"firstVersion\": \"").append(languageModel.getFirstVersion()).append("\",");
}
@@ -394,6 +399,7 @@ public class PackageLanguageMojo extends AbstractMojo {
private String description;
private String firstVersion;
private String label;
+ private String deprecated;
private String javaType;
private String modelJavaType;
private String groupId;
@@ -456,6 +462,14 @@ public class PackageLanguageMojo extends AbstractMojo {
this.label = label;
}
+ public String getDeprecated() {
+ return deprecated;
+ }
+
+ public void setDeprecated(String deprecated) {
+ this.deprecated = deprecated;
+ }
+
public String getJavaType() {
return javaType;
}